am 512382e4: Reconcile with jb-mr2-release - do not merge

* commit '512382e404eb125d61725b25210c02abc73f6d62':