Merge: #25916: fix a few 'string of bytes' references.