am 2b479c79: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2b479c79a60c142eb0dd112572d96f496bdcc93b':