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