Merge pull request #24101 from eileenmcnaughton/msg