am 642b0b71: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '642b0b71a3557915687c1bed1a57ac326a308507':