am 7d62220a: Reconcile with jb-mr2-release - do not merge

* commit '7d62220a92be123ae207aa123ce6a01d597688f9':