Merge pull request #23929 from eileenmcnaughton/recur