Merge "Refinement of AttributionSource handling." into sc-dev