Avoid Ty to String conversions
#100012
+4
−5
Merged