Merge "Tokenize MB optimized"