Merge pull request #12642 from eileenmcnaughton/recur