Merge "Use context AttributionSource as the identity source-of-truth for connection" into main