am 0160b3bd: Reconcile with jb-mr0-release

* commit '0160b3bd9eb2de45f56bcac3a5c27e4e5b183feb':