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

* commit 'f28901e79bbc65193adb5e3bce641d8ce94228fe':