string-only change for #3906. UI implementation pending.
Merge pull request #3935 from adobe/jasonsanjose/issue-3906

string-only change for #3906. UI implementation pending.