am 4cdfb578: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4cdfb578e5032b37fe61e4580a55f6f39e369e87':