am 9de1633b: Reconcile with jb-mr2-release - do not merge

* commit '9de1633b6bc8ed8bc324b0741209bdb73944048c':