Merge "Update comments related to valid_tag"