Merge pull request #12899 from eileenmcnaughton/recur_tpl