Groups cleanup
Merge branch 'master' into fix_groups