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

* commit 'd2cd0f05a2ba440d0d55cb15ca8c575b25ecb377':