Merge pull request #4300 from jjd-uk/strings