Merge pull request #19059 from eileenmcnaughton/2199_ufgroup_pre_post_hook