Reconcile with jb-mr2-release - do not merge

Change-Id: Ib4728c3dd9e0c91c67a086ca229831495d5fef4c