Flow for group management
Fixed flow
Merge branch 'group-management'