am 6bd90a3c: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6bd90a3ce2d6d9f013a8606477093f59bddf3650':