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