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

* commit 'bdd47e503cf336cce34ac941c07726377396826d':
  "JWR08"
  JWR04C
  JWR04B
  "JWR04"
  JWR03B