Merge changes in the English version (1.27 -> 1.37).
Keep syncronization of space/tab between English version.