am 9d53a1d6: am b6c2e6b6: Merge commit \'3359ffe4\' into jb-mr2-dev

* commit '9d53a1d6094b8981c27dd500b4679c469eb166aa':