Merge "Include provider tag in complete attribution tag list" into sc-dev