Fix translator bug.
Merge branch '4.0'