Reconcile with jb-mr2-release - do not merge

Change-Id: Ie54fe3ebcdc869fdd6a2682d4e5379cd939ce9cd