am 526a09b3: Reconcile with jb-mr2-release - do not merge

* commit '526a09b39f2c4d80731bdb8352f00dd022fee3ad':