Reconcile with ics-mr1-release