Merge pull request #17070 from eileenmcnaughton/msg_template