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

* commit 'da69f1c26bff1729331456db7e9c933bf82663d0':