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

* commit 'a3103f9fe060e91fd6de0975ebe31ddeed88a9e4':