Revise discriminateTypeByDiscriminableItems function
#53709
Merged
discriminateTypeByDiscriminableItems function
#53709