am c23f3863: Reconcile with jb-mr1-release

* commit 'c23f3863ccd5dfbba5a0339a17a21ac35d3efead':