Add cherry-pick CM commit to address #7463

Submitted against release this time. @redmunds