Merge pull request #17556 from eileenmcnaughton/renewline