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

Signed-off-by: Paul Beeler <sparksco@gmail.com>