am 2e1c9443: Reconcile with ics-mr1-release

* commit '2e1c94436c634c1b4a7ab6a75a98a14f8ddc1077':