gh-94518: Rename group*
to extra_group*
to avoid confusion
#101054
Merged
group*
to extra_group*
to avoid confusion
#101054