Merge "Fix comment"