diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc
index 8f7aea2d66ea..a546c0bafad0 100644
--- a/src/google/protobuf/descriptor.pb.cc
+++ b/src/google/protobuf/descriptor.pb.cc
@@ -1796,7 +1796,7 @@ const char descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto[] AB
     "\001(\t\022\023\n\013output_type\030\003 \001(\t\022/\n\007options\030\004 \001("
     "\0132\036.google.protobuf.MethodOptions\022\037\n\020cli"
     "ent_streaming\030\005 \001(\010:\005false\022\037\n\020server_str"
-    "eaming\030\006 \001(\010:\005false\"\265\006\n\013FileOptions\022\024\n\014j"
+    "eaming\030\006 \001(\010:\005false\"\313\006\n\013FileOptions\022\024\n\014j"
     "ava_package\030\001 \001(\t\022\034\n\024java_outer_classnam"
     "e\030\010 \001(\t\022\"\n\023java_multiple_files\030\n \001(\010:\005fa"
     "lse\022)\n\035java_generate_equals_and_hash\030\024 \001"
@@ -1817,157 +1817,158 @@ const char descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto[] AB
     "(\0132$.google.protobuf.UninterpretedOption"
     "\":\n\014OptimizeMode\022\t\n\005SPEED\020\001\022\r\n\tCODE_SIZE"
     "\020\002\022\020\n\014LITE_RUNTIME\020\003*\t\010\350\007\020\200\200\200\200\002J\004\010*\020+J\004\010"
-    "&\020\'\"\347\002\n\016MessageOptions\022&\n\027message_set_wi"
-    "re_format\030\001 \001(\010:\005false\022.\n\037no_standard_de"
-    "scriptor_accessor\030\002 \001(\010:\005false\022\031\n\ndeprec"
-    "ated\030\003 \001(\010:\005false\022\021\n\tmap_entry\030\007 \001(\010\0222\n&"
-    "deprecated_legacy_json_field_conflicts\030\013"
-    " \001(\010B\002\030\001\022-\n\010features\030\014 \001(\0132\033.google.prot"
-    "obuf.FeatureSet\022C\n\024uninterpreted_option\030"
-    "\347\007 \003(\0132$.google.protobuf.UninterpretedOp"
-    "tion*\t\010\350\007\020\200\200\200\200\002J\004\010\004\020\005J\004\010\005\020\006J\004\010\006\020\007J\004\010\010\020\tJ"
-    "\004\010\t\020\n\"\243\013\n\014FieldOptions\022:\n\005ctype\030\001 \001(\0162#."
-    "google.protobuf.FieldOptions.CType:\006STRI"
-    "NG\022\016\n\006packed\030\002 \001(\010\022\?\n\006jstype\030\006 \001(\0162$.goo"
-    "gle.protobuf.FieldOptions.JSType:\tJS_NOR"
-    "MAL\022\023\n\004lazy\030\005 \001(\010:\005false\022\036\n\017unverified_l"
-    "azy\030\017 \001(\010:\005false\022\031\n\ndeprecated\030\003 \001(\010:\005fa"
-    "lse\022\023\n\004weak\030\n \001(\010:\005false\022\033\n\014debug_redact"
-    "\030\020 \001(\010:\005false\022@\n\tretention\030\021 \001(\0162-.googl"
-    "e.protobuf.FieldOptions.OptionRetention\022"
-    "\?\n\007targets\030\023 \003(\0162..google.protobuf.Field"
-    "Options.OptionTargetType\022F\n\020edition_defa"
-    "ults\030\024 \003(\0132,.google.protobuf.FieldOption"
-    "s.EditionDefault\022-\n\010features\030\025 \001(\0132\033.goo"
-    "gle.protobuf.FeatureSet\022E\n\017feature_suppo"
-    "rt\030\026 \001(\0132,.google.protobuf.FieldOptions."
-    "FeatureSupport\022C\n\024uninterpreted_option\030\347"
-    "\007 \003(\0132$.google.protobuf.UninterpretedOpt"
-    "ion\032J\n\016EditionDefault\022)\n\007edition\030\003 \001(\0162\030"
-    ".google.protobuf.Edition\022\r\n\005value\030\002 \001(\t\032"
-    "\314\001\n\016FeatureSupport\0224\n\022edition_introduced"
-    "\030\001 \001(\0162\030.google.protobuf.Edition\0224\n\022edit"
-    "ion_deprecated\030\002 \001(\0162\030.google.protobuf.E"
-    "dition\022\033\n\023deprecation_warning\030\003 \001(\t\0221\n\017e"
-    "dition_removed\030\004 \001(\0162\030.google.protobuf.E"
-    "dition\"/\n\005CType\022\n\n\006STRING\020\000\022\010\n\004CORD\020\001\022\020\n"
-    "\014STRING_PIECE\020\002\"5\n\006JSType\022\r\n\tJS_NORMAL\020\000"
-    "\022\r\n\tJS_STRING\020\001\022\r\n\tJS_NUMBER\020\002\"U\n\017Option"
-    "Retention\022\025\n\021RETENTION_UNKNOWN\020\000\022\025\n\021RETE"
-    "NTION_RUNTIME\020\001\022\024\n\020RETENTION_SOURCE\020\002\"\214\002"
-    "\n\020OptionTargetType\022\027\n\023TARGET_TYPE_UNKNOW"
-    "N\020\000\022\024\n\020TARGET_TYPE_FILE\020\001\022\037\n\033TARGET_TYPE"
-    "_EXTENSION_RANGE\020\002\022\027\n\023TARGET_TYPE_MESSAG"
-    "E\020\003\022\025\n\021TARGET_TYPE_FIELD\020\004\022\025\n\021TARGET_TYP"
-    "E_ONEOF\020\005\022\024\n\020TARGET_TYPE_ENUM\020\006\022\032\n\026TARGE"
-    "T_TYPE_ENUM_ENTRY\020\007\022\027\n\023TARGET_TYPE_SERVI"
-    "CE\020\010\022\026\n\022TARGET_TYPE_METHOD\020\t*\t\010\350\007\020\200\200\200\200\002J"
-    "\004\010\004\020\005J\004\010\022\020\023\"\215\001\n\014OneofOptions\022-\n\010features"
-    "\030\001 \001(\0132\033.google.protobuf.FeatureSet\022C\n\024u"
-    "ninterpreted_option\030\347\007 \003(\0132$.google.prot"
-    "obuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\366\001\n\013"
-    "EnumOptions\022\023\n\013allow_alias\030\002 \001(\010\022\031\n\ndepr"
-    "ecated\030\003 \001(\010:\005false\0222\n&deprecated_legacy"
-    "_json_field_conflicts\030\006 \001(\010B\002\030\001\022-\n\010featu"
-    "res\030\007 \001(\0132\033.google.protobuf.FeatureSet\022C"
-    "\n\024uninterpreted_option\030\347\007 \003(\0132$.google.p"
-    "rotobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002J\004"
-    "\010\005\020\006\"\311\001\n\020EnumValueOptions\022\031\n\ndeprecated\030"
-    "\001 \001(\010:\005false\022-\n\010features\030\002 \001(\0132\033.google."
-    "protobuf.FeatureSet\022\033\n\014debug_redact\030\003 \001("
-    "\010:\005false\022C\n\024uninterpreted_option\030\347\007 \003(\0132"
-    "$.google.protobuf.UninterpretedOption*\t\010"
-    "\350\007\020\200\200\200\200\002\"\252\001\n\016ServiceOptions\022-\n\010features\030"
-    "\" \001(\0132\033.google.protobuf.FeatureSet\022\031\n\nde"
-    "precated\030! \001(\010:\005false\022C\n\024uninterpreted_o"
-    "ption\030\347\007 \003(\0132$.google.protobuf.Uninterpr"
-    "etedOption*\t\010\350\007\020\200\200\200\200\002\"\334\002\n\rMethodOptions\022"
-    "\031\n\ndeprecated\030! \001(\010:\005false\022_\n\021idempotenc"
-    "y_level\030\" \001(\0162/.google.protobuf.MethodOp"
-    "tions.IdempotencyLevel:\023IDEMPOTENCY_UNKN"
-    "OWN\022-\n\010features\030# \001(\0132\033.google.protobuf."
-    "FeatureSet\022C\n\024uninterpreted_option\030\347\007 \003("
-    "\0132$.google.protobuf.UninterpretedOption\""
-    "P\n\020IdempotencyLevel\022\027\n\023IDEMPOTENCY_UNKNO"
-    "WN\020\000\022\023\n\017NO_SIDE_EFFECTS\020\001\022\016\n\nIDEMPOTENT\020"
-    "\002*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023UninterpretedOption\022;\n\004"
-    "name\030\002 \003(\0132-.google.protobuf.Uninterpret"
-    "edOption.NamePart\022\030\n\020identifier_value\030\003 "
-    "\001(\t\022\032\n\022positive_int_value\030\004 \001(\004\022\032\n\022negat"
-    "ive_int_value\030\005 \001(\003\022\024\n\014double_value\030\006 \001("
-    "\001\022\024\n\014string_value\030\007 \001(\014\022\027\n\017aggregate_val"
-    "ue\030\010 \001(\t\0323\n\010NamePart\022\021\n\tname_part\030\001 \002(\t\022"
-    "\024\n\014is_extension\030\002 \002(\010\"\303\t\n\nFeatureSet\022\202\001\n"
-    "\016field_presence\030\001 \001(\0162).google.protobuf."
-    "FeatureSet.FieldPresenceB\?\210\001\001\230\001\004\230\001\001\242\001\r\022\010"
-    "EXPLICIT\030\346\007\242\001\r\022\010IMPLICIT\030\347\007\242\001\r\022\010EXPLICIT"
-    "\030\350\007\262\001\003\010\350\007\022b\n\tenum_type\030\002 \001(\0162$.google.pr"
-    "otobuf.FeatureSet.EnumTypeB)\210\001\001\230\001\006\230\001\001\242\001\013"
-    "\022\006CLOSED\030\346\007\242\001\t\022\004OPEN\030\347\007\262\001\003\010\350\007\022\201\001\n\027repeat"
-    "ed_field_encoding\030\003 \001(\01621.google.protobu"
-    "f.FeatureSet.RepeatedFieldEncodingB-\210\001\001\230"
-    "\001\004\230\001\001\242\001\r\022\010EXPANDED\030\346\007\242\001\013\022\006PACKED\030\347\007\262\001\003\010\350"
-    "\007\022n\n\017utf8_validation\030\004 \001(\0162*.google.prot"
-    "obuf.FeatureSet.Utf8ValidationB)\210\001\001\230\001\004\230\001"
-    "\001\242\001\t\022\004NONE\030\346\007\242\001\013\022\006VERIFY\030\347\007\262\001\003\010\350\007\022m\n\020mes"
-    "sage_encoding\030\005 \001(\0162+.google.protobuf.Fe"
-    "atureSet.MessageEncodingB&\210\001\001\230\001\004\230\001\001\242\001\024\022\017"
-    "LENGTH_PREFIXED\030\346\007\262\001\003\010\350\007\022v\n\013json_format\030"
-    "\006 \001(\0162&.google.protobuf.FeatureSet.JsonF"
-    "ormatB9\210\001\001\230\001\003\230\001\006\230\001\001\242\001\027\022\022LEGACY_BEST_EFFO"
-    "RT\030\346\007\242\001\n\022\005ALLOW\030\347\007\262\001\003\010\350\007\"\\\n\rFieldPresenc"
-    "e\022\032\n\026FIELD_PRESENCE_UNKNOWN\020\000\022\014\n\010EXPLICI"
-    "T\020\001\022\014\n\010IMPLICIT\020\002\022\023\n\017LEGACY_REQUIRED\020\003\"7"
-    "\n\010EnumType\022\025\n\021ENUM_TYPE_UNKNOWN\020\000\022\010\n\004OPE"
-    "N\020\001\022\n\n\006CLOSED\020\002\"V\n\025RepeatedFieldEncoding"
-    "\022#\n\037REPEATED_FIELD_ENCODING_UNKNOWN\020\000\022\n\n"
-    "\006PACKED\020\001\022\014\n\010EXPANDED\020\002\"C\n\016Utf8Validatio"
-    "n\022\033\n\027UTF8_VALIDATION_UNKNOWN\020\000\022\n\n\006VERIFY"
-    "\020\002\022\010\n\004NONE\020\003\"S\n\017MessageEncoding\022\034\n\030MESSA"
-    "GE_ENCODING_UNKNOWN\020\000\022\023\n\017LENGTH_PREFIXED"
-    "\020\001\022\r\n\tDELIMITED\020\002\"H\n\nJsonFormat\022\027\n\023JSON_"
-    "FORMAT_UNKNOWN\020\000\022\t\n\005ALLOW\020\001\022\026\n\022LEGACY_BE"
-    "ST_EFFORT\020\002*\006\010\350\007\020\213N*\006\010\213N\020\220N*\006\010\220N\020\221NJ\006\010\347\007"
-    "\020\350\007\"\202\003\n\022FeatureSetDefaults\022N\n\010defaults\030\001"
-    " \003(\0132<.google.protobuf.FeatureSetDefault"
-    "s.FeatureSetEditionDefault\0221\n\017minimum_ed"
-    "ition\030\004 \001(\0162\030.google.protobuf.Edition\0221\n"
-    "\017maximum_edition\030\005 \001(\0162\030.google.protobuf"
-    ".Edition\032\265\001\n\030FeatureSetEditionDefault\022)\n"
-    "\007edition\030\003 \001(\0162\030.google.protobuf.Edition"
-    "\0229\n\024overridable_features\030\004 \001(\0132\033.google."
-    "protobuf.FeatureSet\0223\n\016fixed_features\030\005 "
-    "\001(\0132\033.google.protobuf.FeatureSet\"\325\001\n\016Sou"
-    "rceCodeInfo\022:\n\010location\030\001 \003(\0132(.google.p"
-    "rotobuf.SourceCodeInfo.Location\032\206\001\n\010Loca"
-    "tion\022\020\n\004path\030\001 \003(\005B\002\020\001\022\020\n\004span\030\002 \003(\005B\002\020\001"
-    "\022\030\n\020leading_comments\030\003 \001(\t\022\031\n\021trailing_c"
-    "omments\030\004 \001(\t\022!\n\031leading_detached_commen"
-    "ts\030\006 \003(\t\"\234\002\n\021GeneratedCodeInfo\022A\n\nannota"
-    "tion\030\001 \003(\0132-.google.protobuf.GeneratedCo"
-    "deInfo.Annotation\032\303\001\n\nAnnotation\022\020\n\004path"
-    "\030\001 \003(\005B\002\020\001\022\023\n\013source_file\030\002 \001(\t\022\r\n\005begin"
-    "\030\003 \001(\005\022\013\n\003end\030\004 \001(\005\022H\n\010semantic\030\005 \001(\01626."
-    "google.protobuf.GeneratedCodeInfo.Annota"
-    "tion.Semantic\"(\n\010Semantic\022\010\n\004NONE\020\000\022\007\n\003S"
-    "ET\020\001\022\t\n\005ALIAS\020\002*\247\002\n\007Edition\022\023\n\017EDITION_U"
-    "NKNOWN\020\000\022\023\n\016EDITION_LEGACY\020\204\007\022\023\n\016EDITION"
-    "_PROTO2\020\346\007\022\023\n\016EDITION_PROTO3\020\347\007\022\021\n\014EDITI"
-    "ON_2023\020\350\007\022\021\n\014EDITION_2024\020\351\007\022\027\n\023EDITION"
-    "_1_TEST_ONLY\020\001\022\027\n\023EDITION_2_TEST_ONLY\020\002\022"
-    "\035\n\027EDITION_99997_TEST_ONLY\020\235\215\006\022\035\n\027EDITIO"
-    "N_99998_TEST_ONLY\020\236\215\006\022\035\n\027EDITION_99999_T"
-    "EST_ONLY\020\237\215\006\022\023\n\013EDITION_MAX\020\377\377\377\377\007B~\n\023com"
-    ".google.protobufB\020DescriptorProtosH\001Z-go"
-    "ogle.golang.org/protobuf/types/descripto"
-    "rpb\370\001\001\242\002\003GPB\252\002\032Google.Protobuf.Reflectio"
-    "n"
+    "&\020\'R\024php_generic_services\"\347\002\n\016MessageOpt"
+    "ions\022&\n\027message_set_wire_format\030\001 \001(\010:\005f"
+    "alse\022.\n\037no_standard_descriptor_accessor\030"
+    "\002 \001(\010:\005false\022\031\n\ndeprecated\030\003 \001(\010:\005false\022"
+    "\021\n\tmap_entry\030\007 \001(\010\0222\n&deprecated_legacy_"
+    "json_field_conflicts\030\013 \001(\010B\002\030\001\022-\n\010featur"
+    "es\030\014 \001(\0132\033.google.protobuf.FeatureSet\022C\n"
+    "\024uninterpreted_option\030\347\007 \003(\0132$.google.pr"
+    "otobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002J\004\010"
+    "\004\020\005J\004\010\005\020\006J\004\010\006\020\007J\004\010\010\020\tJ\004\010\t\020\n\"\243\013\n\014FieldOpt"
+    "ions\022:\n\005ctype\030\001 \001(\0162#.google.protobuf.Fi"
+    "eldOptions.CType:\006STRING\022\016\n\006packed\030\002 \001(\010"
+    "\022\?\n\006jstype\030\006 \001(\0162$.google.protobuf.Field"
+    "Options.JSType:\tJS_NORMAL\022\023\n\004lazy\030\005 \001(\010:"
+    "\005false\022\036\n\017unverified_lazy\030\017 \001(\010:\005false\022\031"
+    "\n\ndeprecated\030\003 \001(\010:\005false\022\023\n\004weak\030\n \001(\010:"
+    "\005false\022\033\n\014debug_redact\030\020 \001(\010:\005false\022@\n\tr"
+    "etention\030\021 \001(\0162-.google.protobuf.FieldOp"
+    "tions.OptionRetention\022\?\n\007targets\030\023 \003(\0162."
+    ".google.protobuf.FieldOptions.OptionTarg"
+    "etType\022F\n\020edition_defaults\030\024 \003(\0132,.googl"
+    "e.protobuf.FieldOptions.EditionDefault\022-"
+    "\n\010features\030\025 \001(\0132\033.google.protobuf.Featu"
+    "reSet\022E\n\017feature_support\030\026 \001(\0132,.google."
+    "protobuf.FieldOptions.FeatureSupport\022C\n\024"
+    "uninterpreted_option\030\347\007 \003(\0132$.google.pro"
+    "tobuf.UninterpretedOption\032J\n\016EditionDefa"
+    "ult\022)\n\007edition\030\003 \001(\0162\030.google.protobuf.E"
+    "dition\022\r\n\005value\030\002 \001(\t\032\314\001\n\016FeatureSupport"
+    "\0224\n\022edition_introduced\030\001 \001(\0162\030.google.pr"
+    "otobuf.Edition\0224\n\022edition_deprecated\030\002 \001"
+    "(\0162\030.google.protobuf.Edition\022\033\n\023deprecat"
+    "ion_warning\030\003 \001(\t\0221\n\017edition_removed\030\004 \001"
+    "(\0162\030.google.protobuf.Edition\"/\n\005CType\022\n\n"
+    "\006STRING\020\000\022\010\n\004CORD\020\001\022\020\n\014STRING_PIECE\020\002\"5\n"
+    "\006JSType\022\r\n\tJS_NORMAL\020\000\022\r\n\tJS_STRING\020\001\022\r\n"
+    "\tJS_NUMBER\020\002\"U\n\017OptionRetention\022\025\n\021RETEN"
+    "TION_UNKNOWN\020\000\022\025\n\021RETENTION_RUNTIME\020\001\022\024\n"
+    "\020RETENTION_SOURCE\020\002\"\214\002\n\020OptionTargetType"
+    "\022\027\n\023TARGET_TYPE_UNKNOWN\020\000\022\024\n\020TARGET_TYPE"
+    "_FILE\020\001\022\037\n\033TARGET_TYPE_EXTENSION_RANGE\020\002"
+    "\022\027\n\023TARGET_TYPE_MESSAGE\020\003\022\025\n\021TARGET_TYPE"
+    "_FIELD\020\004\022\025\n\021TARGET_TYPE_ONEOF\020\005\022\024\n\020TARGE"
+    "T_TYPE_ENUM\020\006\022\032\n\026TARGET_TYPE_ENUM_ENTRY\020"
+    "\007\022\027\n\023TARGET_TYPE_SERVICE\020\010\022\026\n\022TARGET_TYP"
+    "E_METHOD\020\t*\t\010\350\007\020\200\200\200\200\002J\004\010\004\020\005J\004\010\022\020\023\"\215\001\n\014On"
+    "eofOptions\022-\n\010features\030\001 \001(\0132\033.google.pr"
+    "otobuf.FeatureSet\022C\n\024uninterpreted_optio"
+    "n\030\347\007 \003(\0132$.google.protobuf.Uninterpreted"
+    "Option*\t\010\350\007\020\200\200\200\200\002\"\366\001\n\013EnumOptions\022\023\n\013all"
+    "ow_alias\030\002 \001(\010\022\031\n\ndeprecated\030\003 \001(\010:\005fals"
+    "e\0222\n&deprecated_legacy_json_field_confli"
+    "cts\030\006 \001(\010B\002\030\001\022-\n\010features\030\007 \001(\0132\033.google"
+    ".protobuf.FeatureSet\022C\n\024uninterpreted_op"
+    "tion\030\347\007 \003(\0132$.google.protobuf.Uninterpre"
+    "tedOption*\t\010\350\007\020\200\200\200\200\002J\004\010\005\020\006\"\311\001\n\020EnumValue"
+    "Options\022\031\n\ndeprecated\030\001 \001(\010:\005false\022-\n\010fe"
+    "atures\030\002 \001(\0132\033.google.protobuf.FeatureSe"
+    "t\022\033\n\014debug_redact\030\003 \001(\010:\005false\022C\n\024uninte"
+    "rpreted_option\030\347\007 \003(\0132$.google.protobuf."
+    "UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\252\001\n\016Servi"
+    "ceOptions\022-\n\010features\030\" \001(\0132\033.google.pro"
+    "tobuf.FeatureSet\022\031\n\ndeprecated\030! \001(\010:\005fa"
+    "lse\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.goo"
+    "gle.protobuf.UninterpretedOption*\t\010\350\007\020\200\200"
+    "\200\200\002\"\334\002\n\rMethodOptions\022\031\n\ndeprecated\030! \001("
+    "\010:\005false\022_\n\021idempotency_level\030\" \001(\0162/.go"
+    "ogle.protobuf.MethodOptions.IdempotencyL"
+    "evel:\023IDEMPOTENCY_UNKNOWN\022-\n\010features\030# "
+    "\001(\0132\033.google.protobuf.FeatureSet\022C\n\024unin"
+    "terpreted_option\030\347\007 \003(\0132$.google.protobu"
+    "f.UninterpretedOption\"P\n\020IdempotencyLeve"
+    "l\022\027\n\023IDEMPOTENCY_UNKNOWN\020\000\022\023\n\017NO_SIDE_EF"
+    "FECTS\020\001\022\016\n\nIDEMPOTENT\020\002*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023U"
+    "ninterpretedOption\022;\n\004name\030\002 \003(\0132-.googl"
+    "e.protobuf.UninterpretedOption.NamePart\022"
+    "\030\n\020identifier_value\030\003 \001(\t\022\032\n\022positive_in"
+    "t_value\030\004 \001(\004\022\032\n\022negative_int_value\030\005 \001("
+    "\003\022\024\n\014double_value\030\006 \001(\001\022\024\n\014string_value\030"
+    "\007 \001(\014\022\027\n\017aggregate_value\030\010 \001(\t\0323\n\010NamePa"
+    "rt\022\021\n\tname_part\030\001 \002(\t\022\024\n\014is_extension\030\002 "
+    "\002(\010\"\311\t\n\nFeatureSet\022\202\001\n\016field_presence\030\001 "
+    "\001(\0162).google.protobuf.FeatureSet.FieldPr"
+    "esenceB\?\210\001\001\230\001\004\230\001\001\242\001\r\022\010EXPLICIT\030\346\007\242\001\r\022\010IM"
+    "PLICIT\030\347\007\242\001\r\022\010EXPLICIT\030\350\007\262\001\003\010\350\007\022b\n\tenum_"
+    "type\030\002 \001(\0162$.google.protobuf.FeatureSet."
+    "EnumTypeB)\210\001\001\230\001\006\230\001\001\242\001\013\022\006CLOSED\030\346\007\242\001\t\022\004OP"
+    "EN\030\347\007\262\001\003\010\350\007\022\201\001\n\027repeated_field_encoding\030"
+    "\003 \001(\01621.google.protobuf.FeatureSet.Repea"
+    "tedFieldEncodingB-\210\001\001\230\001\004\230\001\001\242\001\r\022\010EXPANDED"
+    "\030\346\007\242\001\013\022\006PACKED\030\347\007\262\001\003\010\350\007\022n\n\017utf8_validati"
+    "on\030\004 \001(\0162*.google.protobuf.FeatureSet.Ut"
+    "f8ValidationB)\210\001\001\230\001\004\230\001\001\242\001\t\022\004NONE\030\346\007\242\001\013\022\006"
+    "VERIFY\030\347\007\262\001\003\010\350\007\022m\n\020message_encoding\030\005 \001("
+    "\0162+.google.protobuf.FeatureSet.MessageEn"
+    "codingB&\210\001\001\230\001\004\230\001\001\242\001\024\022\017LENGTH_PREFIXED\030\346\007"
+    "\262\001\003\010\350\007\022v\n\013json_format\030\006 \001(\0162&.google.pro"
+    "tobuf.FeatureSet.JsonFormatB9\210\001\001\230\001\003\230\001\006\230\001"
+    "\001\242\001\027\022\022LEGACY_BEST_EFFORT\030\346\007\242\001\n\022\005ALLOW\030\347\007"
+    "\262\001\003\010\350\007\"\\\n\rFieldPresence\022\032\n\026FIELD_PRESENC"
+    "E_UNKNOWN\020\000\022\014\n\010EXPLICIT\020\001\022\014\n\010IMPLICIT\020\002\022"
+    "\023\n\017LEGACY_REQUIRED\020\003\"7\n\010EnumType\022\025\n\021ENUM"
+    "_TYPE_UNKNOWN\020\000\022\010\n\004OPEN\020\001\022\n\n\006CLOSED\020\002\"V\n"
+    "\025RepeatedFieldEncoding\022#\n\037REPEATED_FIELD"
+    "_ENCODING_UNKNOWN\020\000\022\n\n\006PACKED\020\001\022\014\n\010EXPAN"
+    "DED\020\002\"I\n\016Utf8Validation\022\033\n\027UTF8_VALIDATI"
+    "ON_UNKNOWN\020\000\022\n\n\006VERIFY\020\002\022\010\n\004NONE\020\003\"\004\010\001\020\001"
+    "\"S\n\017MessageEncoding\022\034\n\030MESSAGE_ENCODING_"
+    "UNKNOWN\020\000\022\023\n\017LENGTH_PREFIXED\020\001\022\r\n\tDELIMI"
+    "TED\020\002\"H\n\nJsonFormat\022\027\n\023JSON_FORMAT_UNKNO"
+    "WN\020\000\022\t\n\005ALLOW\020\001\022\026\n\022LEGACY_BEST_EFFORT\020\002*"
+    "\006\010\350\007\020\213N*\006\010\213N\020\220N*\006\010\220N\020\221NJ\006\010\347\007\020\350\007\"\230\003\n\022Feat"
+    "ureSetDefaults\022N\n\010defaults\030\001 \003(\0132<.googl"
+    "e.protobuf.FeatureSetDefaults.FeatureSet"
+    "EditionDefault\0221\n\017minimum_edition\030\004 \001(\0162"
+    "\030.google.protobuf.Edition\0221\n\017maximum_edi"
+    "tion\030\005 \001(\0162\030.google.protobuf.Edition\032\313\001\n"
+    "\030FeatureSetEditionDefault\022)\n\007edition\030\003 \001"
+    "(\0162\030.google.protobuf.Edition\0229\n\024overrida"
+    "ble_features\030\004 \001(\0132\033.google.protobuf.Fea"
+    "tureSet\0223\n\016fixed_features\030\005 \001(\0132\033.google"
+    ".protobuf.FeatureSetJ\004\010\001\020\002J\004\010\002\020\003R\010featur"
+    "es\"\325\001\n\016SourceCodeInfo\022:\n\010location\030\001 \003(\0132"
+    "(.google.protobuf.SourceCodeInfo.Locatio"
+    "n\032\206\001\n\010Location\022\020\n\004path\030\001 \003(\005B\002\020\001\022\020\n\004span"
+    "\030\002 \003(\005B\002\020\001\022\030\n\020leading_comments\030\003 \001(\t\022\031\n\021"
+    "trailing_comments\030\004 \001(\t\022!\n\031leading_detac"
+    "hed_comments\030\006 \003(\t\"\234\002\n\021GeneratedCodeInfo"
+    "\022A\n\nannotation\030\001 \003(\0132-.google.protobuf.G"
+    "eneratedCodeInfo.Annotation\032\303\001\n\nAnnotati"
+    "on\022\020\n\004path\030\001 \003(\005B\002\020\001\022\023\n\013source_file\030\002 \001("
+    "\t\022\r\n\005begin\030\003 \001(\005\022\013\n\003end\030\004 \001(\005\022H\n\010semanti"
+    "c\030\005 \001(\01626.google.protobuf.GeneratedCodeI"
+    "nfo.Annotation.Semantic\"(\n\010Semantic\022\010\n\004N"
+    "ONE\020\000\022\007\n\003SET\020\001\022\t\n\005ALIAS\020\002*\247\002\n\007Edition\022\023\n"
+    "\017EDITION_UNKNOWN\020\000\022\023\n\016EDITION_LEGACY\020\204\007\022"
+    "\023\n\016EDITION_PROTO2\020\346\007\022\023\n\016EDITION_PROTO3\020\347"
+    "\007\022\021\n\014EDITION_2023\020\350\007\022\021\n\014EDITION_2024\020\351\007\022"
+    "\027\n\023EDITION_1_TEST_ONLY\020\001\022\027\n\023EDITION_2_TE"
+    "ST_ONLY\020\002\022\035\n\027EDITION_99997_TEST_ONLY\020\235\215\006"
+    "\022\035\n\027EDITION_99998_TEST_ONLY\020\236\215\006\022\035\n\027EDITI"
+    "ON_99999_TEST_ONLY\020\237\215\006\022\023\n\013EDITION_MAX\020\377\377"
+    "\377\377\007B~\n\023com.google.protobufB\020DescriptorPr"
+    "otosH\001Z-google.golang.org/protobuf/types"
+    "/descriptorpb\370\001\001\242\002\003GPB\252\002\032Google.Protobuf"
+    ".Reflection"
 };
 static ::absl::once_flag descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once;
 PROTOBUF_CONSTINIT const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fdescriptor_2eproto = {
     false,
     false,
-    9961,
+    10011,
     descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto,
     "google/protobuf/descriptor.proto",
     &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto
index b4a62d3efa0e..b55570bdc242 100644
--- a/src/google/protobuf/descriptor.proto
+++ b/src/google/protobuf/descriptor.proto
@@ -494,6 +494,7 @@ message FileOptions {
   optional bool java_generic_services = 17 [default = false];
   optional bool py_generic_services = 18 [default = false];
   reserved 42;  // removed php_generic_services
+  reserved "php_generic_services";
 
   // Is this file deprecated?
   // Depending on the target platform, this can emit Deprecated annotations
@@ -1017,6 +1018,7 @@ message FeatureSet {
     UTF8_VALIDATION_UNKNOWN = 0;
     VERIFY = 2;
     NONE = 3;
+    reserved 1;
   }
   optional Utf8Validation utf8_validation = 4 [
     retention = RETENTION_RUNTIME,
@@ -1106,6 +1108,9 @@ message FeatureSetDefaults {
 
     // Defaults of features that can't be overridden in this edition.
     optional FeatureSet fixed_features = 5;
+
+    reserved 1, 2;
+    reserved "features";
   }
   repeated FeatureSetEditionDefault defaults = 1;