am cc91c517: Reconcile with jb-mr2-release - do not merge

* commit 'cc91c517bf00431f098b7ca371113dc108071a45':