Reconcile with jb-mr2-release - do not merge

Change-Id: Ib28265f84583e4c1c8860f359145f38737817e99