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

* commit 'b6c2e6b60cd9c01b853b31c29ad1c7ebbcfe2f5a':