Merge pull request #23488 from colemanw/afformGetHook