Merge "Type confusion due to race condition on tag type change" into sc-dev