Merge pull request #17921 from eileenmcnaughton/format