Merge pull request #22990 from eileenmcnaughton/init