Merge "fix a typo in comment"