Reconcile with jb-mr1.1-release - do not merge

Change-Id: I487fc4f0fc8050e6f59985a25ad7add411a97a78