Merge "fix typo in a comment"