Merge pull request #18109 from eileenmcnaughton/format