am 79ab2553: Reconcile with jb-mr1-release - do not merge

* commit '79ab2553a77c0f111e990e3aec342ce0cde87fc9':
  JOP39B