SONAR-4725 Complete integration with groups