Merge "Fix for Duplicate class in TextClassifier" into main