Merge "Fix incorrect comments"