am cb66f08b: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'cb66f08ba5dfcaf1554c8289d7f1e92e3f2f2a45':
  "JWR50"
  "JWR49"
  JWR46C