am d84f0294: Reconcile with jb-mr1-release - do not merge

* commit 'd84f02944f78595c3f72eb7e8bc422c63bd6ce89':
  JOP38C
  JOP38B