fixed group permission dialog
cleanup
Merge branch 'release/1.5.24' into develop