Backport Group API code that was added in EE only

Group API code that was added in EE only. /cc @vsizov

See merge request !7205