Merge "Revert^2 "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-dev