Merge pull request #18110 from grokability/#18107-normalize-to-strings

Merge pull request #18110 from grokability/#18107-normalize-to-strings #2524