Merge pull request #19510 from eileenmcnaughton/msg_tpl