Merge "fix spelling typo in comment"