am 10b8e684: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '10b8e684e1945edfb60ec4391ac4c7f3d8bf4172':