Merge pull request #19670 from eileenmcnaughton/aff