Switch to EarlyBinder for type_of query
#107753
+443
−334
Merged