MPS-20592 - checking for the param being ClassifierType
Merge remote-tracking branch 'origin/master' into 3.2/vaclavFix