Update cm scripts
Merge remote-tracking branch 'jfbs/master'
Update cm scripts