Merge "Revert "Do not create word breaker for optimization"" into main