Remove structural match from TypeId
#103291
+26
−8
Merged
TypeId
#103291