am 160a22b8: Reconcile with jb-mr2-release - do not merge

* commit '160a22b8fbc2c25cb893e92fcad2db8fc26e24b2':