Reconcile with jb-mr2-release - do not merge

Change-Id: Idda6bd6033cfd90ecd4a54ccd3e286940ad12d5a