am 2e939805: Reconcile with jb-mr1-release - do not merge

* commit '2e939805afafebced02bc3ed027807291ddd5dc4':
  JOP40C
  JOP40B