merge in ics-mr1-release history after reset to ics-mr1