Cherry pick MR 267

Add service groups for dataset service.

See merge request !267 (merged)

Merge request reports

Loading