Merge pull request #18852 from eileenmcnaughton/aip