am 11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '11ff695d526735306e1868b596212aac9f3239f4':