am 3401c2e9: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '3401c2e9e1343c964eb9495cbf8568172c14ac82':