fix basic group overrides
Merge branch 'master' into feature/one-point-oh