am 605d6acb: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '605d6acbd8eb654f15d3253027e6745aeb1bf67c':
  JDP45