Merge branch 'master' into group-manager