Merge pull request #20785 from eileenmcnaughton/baseipn