Merge "Correct mispell words in comments"