Update upstream CM v4
Merge remote-tracking branch 'origin/cmv4' into randy/issue-6718