Factor group forms
Merge pull request #8113 from cirosantilli/factor-group-forms

Factor group forms