Update upstream CM v4
Merge branch 'cmv4' into nj/cmv4-editor-multiselect