Reconcile with jb-mr2-release - do not merge

Change-Id: Ifc3c604d1683fa9fb3b661438b8ddbc266e0657e