Closes gh-17741
Merge some string lines that were previously split because of the 90 chars wide formatting.
See gh-17393