Backport of "group: Use proper group constructor" into 1.18
Backport of !232 (merged) "group: Use proper group constructor".
Commits:
- cebdfad9 group: Use proper group constructor
Backport of !232 (merged) "group: Use proper group constructor".
Commits: