Avoid direct type comparisons (#7085) Avoid direct type comparisons. (cherry picked from commit a8809401ee)
a8809401ee