re #6197 clear warning
Merge branch 'feature/6197_group_handling' into develop