Merge "Optimize AttributionSource tokens - base" into sc-dev