Factor group tips
Merge pull request #8112 from cirosantilli/factor-group-tips

Factor group tips