Reconcile with jb-mr2-release - do not merge

Change-Id: Ida4facf661f6aeb4f78582a9a00fb746347b02a7