Merge pull request #17995 from colemanw/updateHook