Merge "Correct comments"