am 06fca997: Reconcile with jb-mr2-release - do not merge

* commit '06fca9977dffadc5621c1c940634b19e95b7b319':