Merge pull request #18460 from eileenmcnaughton/comment