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

* commit '545c8eed678101a836972c5f68941078f7fb0863':
  JDQ39E
  JDQ39D
  JDQ39C