re #6197 get missing default usages
Merge branch 'feature/6197_group_handling' into develop