Merge "Correct the spelling of words"