Merge pull request #19550 from eileenmcnaughton/msg_tpl_convert