Merge "Fix misleading comments"