am c1213473: Reconcile with jb-mr2-release - do not merge

* commit 'c1213473de0890856341bed09ef08b14603ddb30':
  "JWR11"
  JWR10C