Merge "Improve space substitution error correction."