Reconcile with jb-mr2-release - do not merge

Change-Id: Id3816eec8bf8ceef1883fab3f81803177588eed1