am 1cd0e202: Reconcile with jb-mr2-release - do not merge

* commit '1cd0e20269fb5faf6cd85e338b7370648a95f8ef':