Merge pull request #22404 from eileenmcnaughton/hooky