There are no groups anymore
Merge branch 'master' into dev