Merge "Fix double adding of special attribution usage" into sc-dev