am 084753ee: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '084753eedba485673fd070c44bc4a7feb63af483':