merge in ics-release history after reset to master