Merge pull request #14825 from eileenmcnaughton/recur