Merge pull request #22468 from eileenmcnaughton/ab