Reconcile with jb-mr2-release - do not merge

Change-Id: Id502924260eb89508aa4e926328ef6b6d97b4b5b