Merge "Use TagType constants" into sc-dev