Merge pull request #19806 from eileenmcnaughton/msg_compat