Add cherry-pick CM commit to address #7463
Merge pull request #7473 from adobe/nj/issue-7463

Add cherry-pick CM commit to address #7463