Merge remote-tracking branch 'origin/jb-mr1-dev' into cm-10.1