fix group deletion
Merge branch 'develop'