Merge "Fix a code comment"