Merge "Introduce AttributionLabelledGroupUsage" into sc-dev