Reconcile with jb-mr2-release - do not merge

Change-Id: Ia0eaeb088ba74ba025573ac25315bc8d426a6a5b