am 041fd816: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '041fd81699448ff4fbcabeebe15bb7dedade9dfb':
  "JWR60"
  JWR59C
  JWR59B