am 841ce670: Merge commit \'81af21e67cd842d16d4b45e8a2d1ec56ff8d764f\' into jb-mr1-dev

* commit '841ce670b29180a157a084a9c0e803b13e92020c':