am 5b23e648: Reconcile with jb-mr1-release

* commit '5b23e648d98ba44fe283569be20202ff38f78f0f':