Merge pull request #22301 from eileenmcnaughton/recur_data