Merge "Remove ASSOCIATED_DATA tag" into sc-dev