Updated to latest v4
Merge branch 'cmv4' into nj/cmv4-editor-multiselect
Merge branch 'nj/cmv4-editor-multiselect' into nj/cmv4-editops-multiselect