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

* commit 'd503fa85deaf4c14d27f45c1408ed13f302f36f4':
  "JWR03"
  JWR02B
  "JWR02"