Merge "Fix performance regression in textclassifier"