Reconcile with jb-mr2-release - do not merge

Change-Id: Ib4adc6b9ad37713ec04b6cacce5279e12395e3a6