Merge "Use the text classifier in the right user" into sc-dev