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

* commit '8e1a87533521ac5918855256dbb92727eda1c953':
  JOO40B
  JOO40
  JOO39B