Merge "Fix a comment issue"