merge in ics-factoryrom-2-release history after reset to ics-mr0