Merge pull request #19995 from demeritcowboy/ufgroup-active