Merge pull request #19579 from totten/master-aff-test