Merge "Fix typo in comment message"