am 02c99918: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '02c9991834eecb161a90475b2a2076e44628c9f9':