Reconcile with jb-mr2-release - do not merge

Change-Id: Id8977deab29bcfaf875ff4431c398e245f61dfc5