diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc
index bfec171c41..c8f7327ccc 100644
--- a/src/google/protobuf/descriptor.pb.cc
+++ b/src/google/protobuf/descriptor.pb.cc
@@ -1695,218 +1695,218 @@ const char descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto[] AB
     "\r\n\005start\030\001 \001(\005\022\013\n\003end\030\002 \001(\005\0227\n\007options\030\003"
     " \001(\0132&.google.protobuf.ExtensionRangeOpt"
     "ions\032+\n\rReservedRange\022\r\n\005start\030\001 \001(\005\022\013\n\003"
-    "end\030\002 \001(\005\"\340\003\n\025ExtensionRangeOptions\022C\n\024u"
+    "end\030\002 \001(\005\"\345\003\n\025ExtensionRangeOptions\022C\n\024u"
     "ninterpreted_option\030\347\007 \003(\0132$.google.prot"
     "obuf.UninterpretedOption\022L\n\013declaration\030"
     "\002 \003(\01322.google.protobuf.ExtensionRangeOp"
     "tions.DeclarationB\003\210\001\002\022-\n\010features\0302 \001(\013"
-    "2\033.google.protobuf.FeatureSet\022Z\n\014verific"
+    "2\033.google.protobuf.FeatureSet\022_\n\014verific"
     "ation\030\003 \001(\01628.google.protobuf.ExtensionR"
     "angeOptions.VerificationState:\nUNVERIFIE"
-    "D\032h\n\013Declaration\022\016\n\006number\030\001 \001(\005\022\021\n\tfull"
-    "_name\030\002 \001(\t\022\014\n\004type\030\003 \001(\t\022\020\n\010reserved\030\005 "
-    "\001(\010\022\020\n\010repeated\030\006 \001(\010J\004\010\004\020\005\"4\n\021Verificat"
-    "ionState\022\017\n\013DECLARATION\020\000\022\016\n\nUNVERIFIED\020"
-    "\001*\t\010\350\007\020\200\200\200\200\002\"\325\005\n\024FieldDescriptorProto\022\014\n"
-    "\004name\030\001 \001(\t\022\016\n\006number\030\003 \001(\005\022:\n\005label\030\004 \001"
-    "(\0162+.google.protobuf.FieldDescriptorProt"
-    "o.Label\0228\n\004type\030\005 \001(\0162*.google.protobuf."
-    "FieldDescriptorProto.Type\022\021\n\ttype_name\030\006"
-    " \001(\t\022\020\n\010extendee\030\002 \001(\t\022\025\n\rdefault_value\030"
-    "\007 \001(\t\022\023\n\013oneof_index\030\t \001(\005\022\021\n\tjson_name\030"
-    "\n \001(\t\022.\n\007options\030\010 \001(\0132\035.google.protobuf"
-    ".FieldOptions\022\027\n\017proto3_optional\030\021 \001(\010\"\266"
-    "\002\n\004Type\022\017\n\013TYPE_DOUBLE\020\001\022\016\n\nTYPE_FLOAT\020\002"
-    "\022\016\n\nTYPE_INT64\020\003\022\017\n\013TYPE_UINT64\020\004\022\016\n\nTYP"
-    "E_INT32\020\005\022\020\n\014TYPE_FIXED64\020\006\022\020\n\014TYPE_FIXE"
-    "D32\020\007\022\r\n\tTYPE_BOOL\020\010\022\017\n\013TYPE_STRING\020\t\022\016\n"
-    "\nTYPE_GROUP\020\n\022\020\n\014TYPE_MESSAGE\020\013\022\016\n\nTYPE_"
-    "BYTES\020\014\022\017\n\013TYPE_UINT32\020\r\022\r\n\tTYPE_ENUM\020\016\022"
-    "\021\n\rTYPE_SFIXED32\020\017\022\021\n\rTYPE_SFIXED64\020\020\022\017\n"
-    "\013TYPE_SINT32\020\021\022\017\n\013TYPE_SINT64\020\022\"C\n\005Label"
-    "\022\022\n\016LABEL_OPTIONAL\020\001\022\022\n\016LABEL_REPEATED\020\003"
-    "\022\022\n\016LABEL_REQUIRED\020\002\"T\n\024OneofDescriptorP"
-    "roto\022\014\n\004name\030\001 \001(\t\022.\n\007options\030\002 \001(\0132\035.go"
-    "ogle.protobuf.OneofOptions\"\244\002\n\023EnumDescr"
-    "iptorProto\022\014\n\004name\030\001 \001(\t\0228\n\005value\030\002 \003(\0132"
-    ").google.protobuf.EnumValueDescriptorPro"
-    "to\022-\n\007options\030\003 \001(\0132\034.google.protobuf.En"
-    "umOptions\022N\n\016reserved_range\030\004 \003(\01326.goog"
-    "le.protobuf.EnumDescriptorProto.EnumRese"
-    "rvedRange\022\025\n\rreserved_name\030\005 \003(\t\032/\n\021Enum"
-    "ReservedRange\022\r\n\005start\030\001 \001(\005\022\013\n\003end\030\002 \001("
-    "\005\"l\n\030EnumValueDescriptorProto\022\014\n\004name\030\001 "
-    "\001(\t\022\016\n\006number\030\002 \001(\005\0222\n\007options\030\003 \001(\0132!.g"
-    "oogle.protobuf.EnumValueOptions\"\220\001\n\026Serv"
-    "iceDescriptorProto\022\014\n\004name\030\001 \001(\t\0226\n\006meth"
-    "od\030\002 \003(\0132&.google.protobuf.MethodDescrip"
-    "torProto\0220\n\007options\030\003 \001(\0132\037.google.proto"
-    "buf.ServiceOptions\"\301\001\n\025MethodDescriptorP"
-    "roto\022\014\n\004name\030\001 \001(\t\022\022\n\ninput_type\030\002 \001(\t\022\023"
-    "\n\013output_type\030\003 \001(\t\022/\n\007options\030\004 \001(\0132\036.g"
-    "oogle.protobuf.MethodOptions\022\037\n\020client_s"
-    "treaming\030\005 \001(\010:\005false\022\037\n\020server_streamin"
-    "g\030\006 \001(\010:\005false\"\324\006\n\013FileOptions\022\024\n\014java_p"
-    "ackage\030\001 \001(\t\022\034\n\024java_outer_classname\030\010 \001"
-    "(\t\022\"\n\023java_multiple_files\030\n \001(\010:\005false\022)"
-    "\n\035java_generate_equals_and_hash\030\024 \001(\010B\002\030"
-    "\001\022%\n\026java_string_check_utf8\030\033 \001(\010:\005false"
-    "\022F\n\014optimize_for\030\t \001(\0162).google.protobuf"
-    ".FileOptions.OptimizeMode:\005SPEED\022\022\n\ngo_p"
-    "ackage\030\013 \001(\t\022\"\n\023cc_generic_services\030\020 \001("
-    "\010:\005false\022$\n\025java_generic_services\030\021 \001(\010:"
-    "\005false\022\"\n\023py_generic_services\030\022 \001(\010:\005fal"
-    "se\022#\n\024php_generic_services\030* \001(\010:\005false\022"
-    "\031\n\ndeprecated\030\027 \001(\010:\005false\022\036\n\020cc_enable_"
-    "arenas\030\037 \001(\010:\004true\022\031\n\021objc_class_prefix\030"
-    "$ \001(\t\022\030\n\020csharp_namespace\030% \001(\t\022\024\n\014swift"
-    "_prefix\030\' \001(\t\022\030\n\020php_class_prefix\030( \001(\t\022"
-    "\025\n\rphp_namespace\030) \001(\t\022\036\n\026php_metadata_n"
-    "amespace\030, \001(\t\022\024\n\014ruby_package\030- \001(\t\022-\n\010"
-    "features\0302 \001(\0132\033.google.protobuf.Feature"
-    "Set\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.goo"
-    "gle.protobuf.UninterpretedOption\":\n\014Opti"
-    "mizeMode\022\t\n\005SPEED\020\001\022\r\n\tCODE_SIZE\020\002\022\020\n\014LI"
-    "TE_RUNTIME\020\003*\t\010\350\007\020\200\200\200\200\002J\004\010&\020\'\"\347\002\n\016Messag"
-    "eOptions\022&\n\027message_set_wire_format\030\001 \001("
-    "\010:\005false\022.\n\037no_standard_descriptor_acces"
-    "sor\030\002 \001(\010:\005false\022\031\n\ndeprecated\030\003 \001(\010:\005fa"
-    "lse\022\021\n\tmap_entry\030\007 \001(\010\0222\n&deprecated_leg"
-    "acy_json_field_conflicts\030\013 \001(\010B\002\030\001\022-\n\010fe"
-    "atures\030\014 \001(\0132\033.google.protobuf.FeatureSe"
-    "t\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.googl"
+    "DB\003\210\001\002\032h\n\013Declaration\022\016\n\006number\030\001 \001(\005\022\021\n"
+    "\tfull_name\030\002 \001(\t\022\014\n\004type\030\003 \001(\t\022\020\n\010reserv"
+    "ed\030\005 \001(\010\022\020\n\010repeated\030\006 \001(\010J\004\010\004\020\005\"4\n\021Veri"
+    "ficationState\022\017\n\013DECLARATION\020\000\022\016\n\nUNVERI"
+    "FIED\020\001*\t\010\350\007\020\200\200\200\200\002\"\325\005\n\024FieldDescriptorPro"
+    "to\022\014\n\004name\030\001 \001(\t\022\016\n\006number\030\003 \001(\005\022:\n\005labe"
+    "l\030\004 \001(\0162+.google.protobuf.FieldDescripto"
+    "rProto.Label\0228\n\004type\030\005 \001(\0162*.google.prot"
+    "obuf.FieldDescriptorProto.Type\022\021\n\ttype_n"
+    "ame\030\006 \001(\t\022\020\n\010extendee\030\002 \001(\t\022\025\n\rdefault_v"
+    "alue\030\007 \001(\t\022\023\n\013oneof_index\030\t \001(\005\022\021\n\tjson_"
+    "name\030\n \001(\t\022.\n\007options\030\010 \001(\0132\035.google.pro"
+    "tobuf.FieldOptions\022\027\n\017proto3_optional\030\021 "
+    "\001(\010\"\266\002\n\004Type\022\017\n\013TYPE_DOUBLE\020\001\022\016\n\nTYPE_FL"
+    "OAT\020\002\022\016\n\nTYPE_INT64\020\003\022\017\n\013TYPE_UINT64\020\004\022\016"
+    "\n\nTYPE_INT32\020\005\022\020\n\014TYPE_FIXED64\020\006\022\020\n\014TYPE"
+    "_FIXED32\020\007\022\r\n\tTYPE_BOOL\020\010\022\017\n\013TYPE_STRING"
+    "\020\t\022\016\n\nTYPE_GROUP\020\n\022\020\n\014TYPE_MESSAGE\020\013\022\016\n\n"
+    "TYPE_BYTES\020\014\022\017\n\013TYPE_UINT32\020\r\022\r\n\tTYPE_EN"
+    "UM\020\016\022\021\n\rTYPE_SFIXED32\020\017\022\021\n\rTYPE_SFIXED64"
+    "\020\020\022\017\n\013TYPE_SINT32\020\021\022\017\n\013TYPE_SINT64\020\022\"C\n\005"
+    "Label\022\022\n\016LABEL_OPTIONAL\020\001\022\022\n\016LABEL_REPEA"
+    "TED\020\003\022\022\n\016LABEL_REQUIRED\020\002\"T\n\024OneofDescri"
+    "ptorProto\022\014\n\004name\030\001 \001(\t\022.\n\007options\030\002 \001(\013"
+    "2\035.google.protobuf.OneofOptions\"\244\002\n\023Enum"
+    "DescriptorProto\022\014\n\004name\030\001 \001(\t\0228\n\005value\030\002"
+    " \003(\0132).google.protobuf.EnumValueDescript"
+    "orProto\022-\n\007options\030\003 \001(\0132\034.google.protob"
+    "uf.EnumOptions\022N\n\016reserved_range\030\004 \003(\01326"
+    ".google.protobuf.EnumDescriptorProto.Enu"
+    "mReservedRange\022\025\n\rreserved_name\030\005 \003(\t\032/\n"
+    "\021EnumReservedRange\022\r\n\005start\030\001 \001(\005\022\013\n\003end"
+    "\030\002 \001(\005\"l\n\030EnumValueDescriptorProto\022\014\n\004na"
+    "me\030\001 \001(\t\022\016\n\006number\030\002 \001(\005\0222\n\007options\030\003 \001("
+    "\0132!.google.protobuf.EnumValueOptions\"\220\001\n"
+    "\026ServiceDescriptorProto\022\014\n\004name\030\001 \001(\t\0226\n"
+    "\006method\030\002 \003(\0132&.google.protobuf.MethodDe"
+    "scriptorProto\0220\n\007options\030\003 \001(\0132\037.google."
+    "protobuf.ServiceOptions\"\301\001\n\025MethodDescri"
+    "ptorProto\022\014\n\004name\030\001 \001(\t\022\022\n\ninput_type\030\002 "
+    "\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\"\324\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"
+    "(\010B\002\030\001\022%\n\026java_string_check_utf8\030\033 \001(\010:\005"
+    "false\022F\n\014optimize_for\030\t \001(\0162).google.pro"
+    "tobuf.FileOptions.OptimizeMode:\005SPEED\022\022\n"
+    "\ngo_package\030\013 \001(\t\022\"\n\023cc_generic_services"
+    "\030\020 \001(\010:\005false\022$\n\025java_generic_services\030\021"
+    " \001(\010:\005false\022\"\n\023py_generic_services\030\022 \001(\010"
+    ":\005false\022#\n\024php_generic_services\030* \001(\010:\005f"
+    "alse\022\031\n\ndeprecated\030\027 \001(\010:\005false\022\036\n\020cc_en"
+    "able_arenas\030\037 \001(\010:\004true\022\031\n\021objc_class_pr"
+    "efix\030$ \001(\t\022\030\n\020csharp_namespace\030% \001(\t\022\024\n\014"
+    "swift_prefix\030\' \001(\t\022\030\n\020php_class_prefix\030("
+    " \001(\t\022\025\n\rphp_namespace\030) \001(\t\022\036\n\026php_metad"
+    "ata_namespace\030, \001(\t\022\024\n\014ruby_package\030- \001("
+    "\t\022-\n\010features\0302 \001(\0132\033.google.protobuf.Fe"
+    "atureSet\022C\n\024uninterpreted_option\030\347\007 \003(\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\'\"\347\002\n\016M"
+    "essageOptions\022&\n\027message_set_wire_format"
+    "\030\001 \001(\010:\005false\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&deprecate"
+    "d_legacy_json_field_conflicts\030\013 \001(\010B\002\030\001\022"
+    "-\n\010features\030\014 \001(\0132\033.google.protobuf.Feat"
+    "ureSet\022C\n\024uninterpreted_option\030\347\007 \003(\0132$."
+    "google.protobuf.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\"\215\t\n"
+    "\014FieldOptions\022:\n\005ctype\030\001 \001(\0162#.google.pr"
+    "otobuf.FieldOptions.CType:\006STRING\022\016\n\006pac"
+    "ked\030\002 \001(\010\022\?\n\006jstype\030\006 \001(\0162$.google.proto"
+    "buf.FieldOptions.JSType:\tJS_NORMAL\022\023\n\004la"
+    "zy\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\004we"
+    "ak\030\n \001(\010:\005false\022\033\n\014debug_redact\030\020 \001(\010:\005f"
+    "alse\022@\n\tretention\030\021 \001(\0162-.google.protobu"
+    "f.FieldOptions.OptionRetention\022\?\n\007target"
+    "s\030\023 \003(\0162..google.protobuf.FieldOptions.O"
+    "ptionTargetType\022F\n\020edition_defaults\030\024 \003("
+    "\0132,.google.protobuf.FieldOptions.Edition"
+    "Default\022-\n\010features\030\025 \001(\0132\033.google.proto"
+    "buf.FeatureSet\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\""
+    "/\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\017OptionRetenti"
+    "on\022\025\n\021RETENTION_UNKNOWN\020\000\022\025\n\021RETENTION_R"
+    "UNTIME\020\001\022\024\n\020RETENTION_SOURCE\020\002\"\214\002\n\020Optio"
+    "nTargetType\022\027\n\023TARGET_TYPE_UNKNOWN\020\000\022\024\n\020"
+    "TARGET_TYPE_FILE\020\001\022\037\n\033TARGET_TYPE_EXTENS"
+    "ION_RANGE\020\002\022\027\n\023TARGET_TYPE_MESSAGE\020\003\022\025\n\021"
+    "TARGET_TYPE_FIELD\020\004\022\025\n\021TARGET_TYPE_ONEOF"
+    "\020\005\022\024\n\020TARGET_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_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\024uninterp"
+    "reted_option\030\347\007 \003(\0132$.google.protobuf.Un"
+    "interpretedOption*\t\010\350\007\020\200\200\200\200\002\"\366\001\n\013EnumOpt"
+    "ions\022\023\n\013allow_alias\030\002 \001(\010\022\031\n\ndeprecated\030"
+    "\003 \001(\010:\005false\0222\n&deprecated_legacy_json_f"
+    "ield_conflicts\030\006 \001(\010B\002\030\001\022-\n\010features\030\007 \001"
+    "(\0132\033.google.protobuf.FeatureSet\022C\n\024unint"
+    "erpreted_option\030\347\007 \003(\0132$.google.protobuf"
+    ".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:\005"
+    "false\022-\n\010features\030\002 \001(\0132\033.google.protobu"
+    "f.FeatureSet\022\033\n\014debug_redact\030\003 \001(\010:\005fals"
+    "e\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.googl"
     "e.protobuf.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\"\215\t\n\014Fiel"
-    "dOptions\022:\n\005ctype\030\001 \001(\0162#.google.protobu"
-    "f.FieldOptions.CType:\006STRING\022\016\n\006packed\030\002"
-    " \001(\010\022\?\n\006jstype\030\006 \001(\0162$.google.protobuf.F"
-    "ieldOptions.JSType:\tJS_NORMAL\022\023\n\004lazy\030\005 "
-    "\001(\010:\005false\022\036\n\017unverified_lazy\030\017 \001(\010:\005fal"
-    "se\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\tretention\030\021 \001(\0162-.google.protobuf.Fie"
-    "ldOptions.OptionRetention\022\?\n\007targets\030\023 \003"
-    "(\0162..google.protobuf.FieldOptions.Option"
-    "TargetType\022F\n\020edition_defaults\030\024 \003(\0132,.g"
-    "oogle.protobuf.FieldOptions.EditionDefau"
-    "lt\022-\n\010features\030\025 \001(\0132\033.google.protobuf.F"
-    "eatureSet\022C\n\024uninterpreted_option\030\347\007 \003(\013"
-    "2$.google.protobuf.UninterpretedOption\032J"
-    "\n\016EditionDefault\022)\n\007edition\030\003 \001(\0162\030.goog"
-    "le.protobuf.Edition\022\r\n\005value\030\002 \001(\t\"/\n\005CT"
-    "ype\022\n\n\006STRING\020\000\022\010\n\004CORD\020\001\022\020\n\014STRING_PIEC"
-    "E\020\002\"5\n\006JSType\022\r\n\tJS_NORMAL\020\000\022\r\n\tJS_STRIN"
-    "G\020\001\022\r\n\tJS_NUMBER\020\002\"U\n\017OptionRetention\022\025\n"
-    "\021RETENTION_UNKNOWN\020\000\022\025\n\021RETENTION_RUNTIM"
-    "E\020\001\022\024\n\020RETENTION_SOURCE\020\002\"\214\002\n\020OptionTarg"
-    "etType\022\027\n\023TARGET_TYPE_UNKNOWN\020\000\022\024\n\020TARGE"
-    "T_TYPE_FILE\020\001\022\037\n\033TARGET_TYPE_EXTENSION_R"
-    "ANGE\020\002\022\027\n\023TARGET_TYPE_MESSAGE\020\003\022\025\n\021TARGE"
-    "T_TYPE_FIELD\020\004\022\025\n\021TARGET_TYPE_ONEOF\020\005\022\024\n"
-    "\020TARGET_TYPE_ENUM\020\006\022\032\n\026TARGET_TYPE_ENUM_"
-    "ENTRY\020\007\022\027\n\023TARGET_TYPE_SERVICE\020\010\022\026\n\022TARG"
-    "ET_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.goo"
-    "gle.protobuf.FeatureSet\022C\n\024uninterpreted"
-    "_option\030\347\007 \003(\0132$.google.protobuf.Uninter"
-    "pretedOption*\t\010\350\007\020\200\200\200\200\002\"\366\001\n\013EnumOptions\022"
-    "\023\n\013allow_alias\030\002 \001(\010\022\031\n\ndeprecated\030\003 \001(\010"
-    ":\005false\0222\n&deprecated_legacy_json_field_"
-    "conflicts\030\006 \001(\010B\002\030\001\022-\n\010features\030\007 \001(\0132\033."
-    "google.protobuf.FeatureSet\022C\n\024uninterpre"
-    "ted_option\030\347\007 \003(\0132$.google.protobuf.Unin"
-    "terpretedOption*\t\010\350\007\020\200\200\200\200\002J\004\010\005\020\006\"\311\001\n\020Enu"
-    "mValueOptions\022\031\n\ndeprecated\030\001 \001(\010:\005false"
-    "\022-\n\010features\030\002 \001(\0132\033.google.protobuf.Fea"
-    "tureSet\022\033\n\014debug_redact\030\003 \001(\010:\005false\022C\n\024"
-    "uninterpreted_option\030\347\007 \003(\0132$.google.pro"
-    "tobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\252\001\n"
-    "\016ServiceOptions\022-\n\010features\030\" \001(\0132\033.goog"
-    "le.protobuf.FeatureSet\022\031\n\ndeprecated\030! \001"
-    "(\010:\005false\022C\n\024uninterpreted_option\030\347\007 \003(\013"
-    "2$.google.protobuf.UninterpretedOption*\t"
-    "\010\350\007\020\200\200\200\200\002\"\334\002\n\rMethodOptions\022\031\n\ndeprecate"
-    "d\030! \001(\010:\005false\022_\n\021idempotency_level\030\" \001("
-    "\0162/.google.protobuf.MethodOptions.Idempo"
-    "tencyLevel:\023IDEMPOTENCY_UNKNOWN\022-\n\010featu"
-    "res\030# \001(\0132\033.google.protobuf.FeatureSet\022C"
-    "\n\024uninterpreted_option\030\347\007 \003(\0132$.google.p"
-    "rotobuf.UninterpretedOption\"P\n\020Idempoten"
-    "cyLevel\022\027\n\023IDEMPOTENCY_UNKNOWN\020\000\022\023\n\017NO_S"
-    "IDE_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\004name\030\002 \003(\0132-"
-    ".google.protobuf.UninterpretedOption.Nam"
-    "ePart\022\030\n\020identifier_value\030\003 \001(\t\022\032\n\022posit"
-    "ive_int_value\030\004 \001(\004\022\032\n\022negative_int_valu"
-    "e\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\010"
-    "NamePart\022\021\n\tname_part\030\001 \002(\t\022\024\n\014is_extens"
-    "ion\030\002 \002(\010\"\235\t\n\nFeatureSet\022|\n\016field_presen"
-    "ce\030\001 \001(\0162).google.protobuf.FeatureSet.Fi"
-    "eldPresenceB9\210\001\001\230\001\004\230\001\001\242\001\r\022\010EXPLICIT\030\346\007\242\001"
-    "\r\022\010IMPLICIT\030\347\007\242\001\r\022\010EXPLICIT\030\350\007\022\\\n\tenum_t"
-    "ype\030\002 \001(\0162$.google.protobuf.FeatureSet.E"
-    "numTypeB#\210\001\001\230\001\006\230\001\001\242\001\013\022\006CLOSED\030\346\007\242\001\t\022\004OPE"
-    "N\030\347\007\022{\n\027repeated_field_encoding\030\003 \001(\01621."
-    "google.protobuf.FeatureSet.RepeatedField"
-    "EncodingB\'\210\001\001\230\001\004\230\001\001\242\001\r\022\010EXPANDED\030\346\007\242\001\013\022\006"
-    "PACKED\030\347\007\022h\n\017utf8_validation\030\004 \001(\0162*.goo"
-    "gle.protobuf.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\022g\n\020m"
-    "essage_encoding\030\005 \001(\0162+.google.protobuf."
-    "FeatureSet.MessageEncodingB \210\001\001\230\001\004\230\001\001\242\001\024"
-    "\022\017LENGTH_PREFIXED\030\346\007\022p\n\013json_format\030\006 \001("
-    "\0162&.google.protobuf.FeatureSet.JsonForma"
-    "tB3\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\"\\\n\rFieldPresence\022\032\n\026FIELD"
-    "_PRESENCE_UNKNOWN\020\000\022\014\n\010EXPLICIT\020\001\022\014\n\010IMP"
-    "LICIT\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\006CLO"
-    "SED\020\002\"V\n\025RepeatedFieldEncoding\022#\n\037REPEAT"
-    "ED_FIELD_ENCODING_UNKNOWN\020\000\022\n\n\006PACKED\020\001\022"
-    "\014\n\010EXPANDED\020\002\"C\n\016Utf8Validation\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\030MESSAGE_ENCODIN"
-    "G_UNKNOWN\020\000\022\023\n\017LENGTH_PREFIXED\020\001\022\r\n\tDELI"
-    "MITED\020\002\"H\n\nJsonFormat\022\027\n\023JSON_FORMAT_UNK"
-    "NOWN\020\000\022\t\n\005ALLOW\020\001\022\026\n\022LEGACY_BEST_EFFORT\020"
-    "\002*\006\010\350\007\020\351\007*\006\010\351\007\020\352\007*\006\010\213N\020\220NJ\006\010\347\007\020\350\007\"\300\002\n\022Fe"
-    "atureSetDefaults\022N\n\010defaults\030\001 \003(\0132<.goo"
-    "gle.protobuf.FeatureSetDefaults.FeatureS"
-    "etEditionDefault\0221\n\017minimum_edition\030\004 \001("
-    "\0162\030.google.protobuf.Edition\0221\n\017maximum_e"
-    "dition\030\005 \001(\0162\030.google.protobuf.Edition\032t"
-    "\n\030FeatureSetEditionDefault\022)\n\007edition\030\003 "
-    "\001(\0162\030.google.protobuf.Edition\022-\n\010feature"
-    "s\030\002 \001(\0132\033.google.protobuf.FeatureSet\"\325\001\n"
-    "\016SourceCodeInfo\022:\n\010location\030\001 \003(\0132(.goog"
-    "le.protobuf.SourceCodeInfo.Location\032\206\001\n\010"
-    "Location\022\020\n\004path\030\001 \003(\005B\002\020\001\022\020\n\004span\030\002 \003(\005"
-    "B\002\020\001\022\030\n\020leading_comments\030\003 \001(\t\022\031\n\021traili"
-    "ng_comments\030\004 \001(\t\022!\n\031leading_detached_co"
-    "mments\030\006 \003(\t\"\234\002\n\021GeneratedCodeInfo\022A\n\nan"
-    "notation\030\001 \003(\0132-.google.protobuf.Generat"
-    "edCodeInfo.Annotation\032\303\001\n\nAnnotation\022\020\n\004"
-    "path\030\001 \003(\005B\002\020\001\022\023\n\013source_file\030\002 \001(\t\022\r\n\005b"
-    "egin\030\003 \001(\005\022\013\n\003end\030\004 \001(\005\022H\n\010semantic\030\005 \001("
-    "\01626.google.protobuf.GeneratedCodeInfo.An"
-    "notation.Semantic\"(\n\010Semantic\022\010\n\004NONE\020\000\022"
-    "\007\n\003SET\020\001\022\t\n\005ALIAS\020\002*\352\001\n\007Edition\022\023\n\017EDITI"
-    "ON_UNKNOWN\020\000\022\023\n\016EDITION_PROTO2\020\346\007\022\023\n\016EDI"
-    "TION_PROTO3\020\347\007\022\021\n\014EDITION_2023\020\350\007\022\027\n\023EDI"
-    "TION_1_TEST_ONLY\020\001\022\027\n\023EDITION_2_TEST_ONL"
-    "Y\020\002\022\035\n\027EDITION_99997_TEST_ONLY\020\235\215\006\022\035\n\027ED"
-    "ITION_99998_TEST_ONLY\020\236\215\006\022\035\n\027EDITION_999"
-    "99_TEST_ONLY\020\237\215\006B~\n\023com.google.protobufB"
-    "\020DescriptorProtosH\001Z-google.golang.org/p"
-    "rotobuf/types/descriptorpb\370\001\001\242\002\003GPB\252\002\032Go"
-    "ogle.Protobuf.Reflection"
+    "\002\"\252\001\n\016ServiceOptions\022-\n\010features\030\" \001(\0132\033"
+    ".google.protobuf.FeatureSet\022\031\n\ndeprecate"
+    "d\030! \001(\010:\005false\022C\n\024uninterpreted_option\030\347"
+    "\007 \003(\0132$.google.protobuf.UninterpretedOpt"
+    "ion*\t\010\350\007\020\200\200\200\200\002\"\334\002\n\rMethodOptions\022\031\n\ndepr"
+    "ecated\030! \001(\010:\005false\022_\n\021idempotency_level"
+    "\030\" \001(\0162/.google.protobuf.MethodOptions.I"
+    "dempotencyLevel:\023IDEMPOTENCY_UNKNOWN\022-\n\010"
+    "features\030# \001(\0132\033.google.protobuf.Feature"
+    "Set\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.goo"
+    "gle.protobuf.UninterpretedOption\"P\n\020Idem"
+    "potencyLevel\022\027\n\023IDEMPOTENCY_UNKNOWN\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\004name\030\002 "
+    "\003(\0132-.google.protobuf.UninterpretedOptio"
+    "n.NamePart\022\030\n\020identifier_value\030\003 \001(\t\022\032\n\022"
+    "positive_int_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\014st"
+    "ring_value\030\007 \001(\014\022\027\n\017aggregate_value\030\010 \001("
+    "\t\0323\n\010NamePart\022\021\n\tname_part\030\001 \002(\t\022\024\n\014is_e"
+    "xtension\030\002 \002(\010\"\235\t\n\nFeatureSet\022|\n\016field_p"
+    "resence\030\001 \001(\0162).google.protobuf.FeatureS"
+    "et.FieldPresenceB9\210\001\001\230\001\004\230\001\001\242\001\r\022\010EXPLICIT"
+    "\030\346\007\242\001\r\022\010IMPLICIT\030\347\007\242\001\r\022\010EXPLICIT\030\350\007\022\\\n\te"
+    "num_type\030\002 \001(\0162$.google.protobuf.Feature"
+    "Set.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\022{\n\027repeated_field_encoding\030\003 \001"
+    "(\01621.google.protobuf.FeatureSet.Repeated"
+    "FieldEncodingB\'\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\022h\n\017utf8_validation\030\004 \001(\0162"
+    "*.google.protobuf.FeatureSet.Utf8Validat"
+    "ionB#\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"
+    "\022g\n\020message_encoding\030\005 \001(\0162+.google.prot"
+    "obuf.FeatureSet.MessageEncodingB \210\001\001\230\001\004\230"
+    "\001\001\242\001\024\022\017LENGTH_PREFIXED\030\346\007\022p\n\013json_format"
+    "\030\006 \001(\0162&.google.protobuf.FeatureSet.Json"
+    "FormatB3\210\001\001\230\001\003\230\001\006\230\001\001\242\001\027\022\022LEGACY_BEST_EFF"
+    "ORT\030\346\007\242\001\n\022\005ALLOW\030\347\007\"\\\n\rFieldPresence\022\032\n\026"
+    "FIELD_PRESENCE_UNKNOWN\020\000\022\014\n\010EXPLICIT\020\001\022\014"
+    "\n\010IMPLICIT\020\002\022\023\n\017LEGACY_REQUIRED\020\003\"7\n\010Enu"
+    "mType\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\037R"
+    "EPEATED_FIELD_ENCODING_UNKNOWN\020\000\022\n\n\006PACK"
+    "ED\020\001\022\014\n\010EXPANDED\020\002\"C\n\016Utf8Validation\022\033\n\027"
+    "UTF8_VALIDATION_UNKNOWN\020\000\022\n\n\006VERIFY\020\002\022\010\n"
+    "\004NONE\020\003\"S\n\017MessageEncoding\022\034\n\030MESSAGE_EN"
+    "CODING_UNKNOWN\020\000\022\023\n\017LENGTH_PREFIXED\020\001\022\r\n"
+    "\tDELIMITED\020\002\"H\n\nJsonFormat\022\027\n\023JSON_FORMA"
+    "T_UNKNOWN\020\000\022\t\n\005ALLOW\020\001\022\026\n\022LEGACY_BEST_EF"
+    "FORT\020\002*\006\010\350\007\020\351\007*\006\010\351\007\020\352\007*\006\010\213N\020\220NJ\006\010\347\007\020\350\007\"\300"
+    "\002\n\022FeatureSetDefaults\022N\n\010defaults\030\001 \003(\0132"
+    "<.google.protobuf.FeatureSetDefaults.Fea"
+    "tureSetEditionDefault\0221\n\017minimum_edition"
+    "\030\004 \001(\0162\030.google.protobuf.Edition\0221\n\017maxi"
+    "mum_edition\030\005 \001(\0162\030.google.protobuf.Edit"
+    "ion\032t\n\030FeatureSetEditionDefault\022)\n\007editi"
+    "on\030\003 \001(\0162\030.google.protobuf.Edition\022-\n\010fe"
+    "atures\030\002 \001(\0132\033.google.protobuf.FeatureSe"
+    "t\"\325\001\n\016SourceCodeInfo\022:\n\010location\030\001 \003(\0132("
+    ".google.protobuf.SourceCodeInfo.Location"
+    "\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\021t"
+    "railing_comments\030\004 \001(\t\022!\n\031leading_detach"
+    "ed_comments\030\006 \003(\t\"\234\002\n\021GeneratedCodeInfo\022"
+    "A\n\nannotation\030\001 \003(\0132-.google.protobuf.Ge"
+    "neratedCodeInfo.Annotation\032\303\001\n\nAnnotatio"
+    "n\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.GeneratedCodeIn"
+    "fo.Annotation.Semantic\"(\n\010Semantic\022\010\n\004NO"
+    "NE\020\000\022\007\n\003SET\020\001\022\t\n\005ALIAS\020\002*\352\001\n\007Edition\022\023\n\017"
+    "EDITION_UNKNOWN\020\000\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\027"
+    "\n\023EDITION_1_TEST_ONLY\020\001\022\027\n\023EDITION_2_TES"
+    "T_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\027EDITIO"
+    "N_99999_TEST_ONLY\020\237\215\006B~\n\023com.google.prot"
+    "obufB\020DescriptorProtosH\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;
 const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fdescriptor_2eproto = {
     false,
     false,
-    9544,
+    9549,
     descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto,
     "google/protobuf/descriptor.proto",
     &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
@@ -4580,7 +4580,7 @@ constexpr ::_pbi::TcParseTable<3, 4, 4, 0, 12> ExtensionRangeOptions::_table_ =
     // repeated .google.protobuf.ExtensionRangeOptions.Declaration declaration = 2 [retention = RETENTION_SOURCE];
     {::_pbi::TcParser::FastMtR1,
      {18, 63, 0, PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_.declaration_)}},
-    // optional .google.protobuf.ExtensionRangeOptions.VerificationState verification = 3 [default = UNVERIFIED];
+    // optional .google.protobuf.ExtensionRangeOptions.VerificationState verification = 3 [default = UNVERIFIED, retention = RETENTION_SOURCE];
     {::_pbi::TcParser::FastEr0S1,
      {24, 1, 1, PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_.verification_)}},
     {::_pbi::TcParser::MiniParse, {}},
@@ -4598,7 +4598,7 @@ constexpr ::_pbi::TcParseTable<3, 4, 4, 0, 12> ExtensionRangeOptions::_table_ =
     // repeated .google.protobuf.ExtensionRangeOptions.Declaration declaration = 2 [retention = RETENTION_SOURCE];
     {PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_.declaration_), -1, 0,
     (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // optional .google.protobuf.ExtensionRangeOptions.VerificationState verification = 3 [default = UNVERIFIED];
+    // optional .google.protobuf.ExtensionRangeOptions.VerificationState verification = 3 [default = UNVERIFIED, retention = RETENTION_SOURCE];
     {PROTOBUF_FIELD_OFFSET(ExtensionRangeOptions, _impl_.verification_), _Internal::kHasBitsOffset + 1, 1,
     (0 | ::_fl::kFcOptional | ::_fl::kEnumRange)},
     // optional .google.protobuf.FeatureSet features = 50;
@@ -4632,7 +4632,7 @@ constexpr ::_pbi::TcParseTable<3, 4, 4, 0, 12> ExtensionRangeOptions::_table_ =
   }
 
   cached_has_bits = _impl_._has_bits_[0];
-  // optional .google.protobuf.ExtensionRangeOptions.VerificationState verification = 3 [default = UNVERIFIED];
+  // optional .google.protobuf.ExtensionRangeOptions.VerificationState verification = 3 [default = UNVERIFIED, retention = RETENTION_SOURCE];
   if (cached_has_bits & 0x00000002u) {
     target = stream->EnsureSpace(target);
     target = ::_pbi::WireFormatLite::WriteEnumToArray(
@@ -4695,7 +4695,7 @@ constexpr ::_pbi::TcParseTable<3, 4, 4, 0, 12> ExtensionRangeOptions::_table_ =
           2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.features_);
     }
 
-    // optional .google.protobuf.ExtensionRangeOptions.VerificationState verification = 3 [default = UNVERIFIED];
+    // optional .google.protobuf.ExtensionRangeOptions.VerificationState verification = 3 [default = UNVERIFIED, retention = RETENTION_SOURCE];
     if (cached_has_bits & 0x00000002u) {
       total_size += 1 +
                     ::_pbi::WireFormatLite::EnumSize(this->_internal_verification());
diff --git a/src/google/protobuf/descriptor.pb.h b/src/google/protobuf/descriptor.pb.h
index cb2fe93640..f859f6aa05 100644
--- a/src/google/protobuf/descriptor.pb.h
+++ b/src/google/protobuf/descriptor.pb.h
@@ -6861,7 +6861,7 @@ class PROTOBUF_EXPORT ExtensionRangeOptions final : public ::google::protobuf::M
   ::google::protobuf::FeatureSet* _internal_mutable_features();
 
   public:
-  // optional .google.protobuf.ExtensionRangeOptions.VerificationState verification = 3 [default = UNVERIFIED];
+  // optional .google.protobuf.ExtensionRangeOptions.VerificationState verification = 3 [default = UNVERIFIED, retention = RETENTION_SOURCE];
   bool has_verification() const;
   void clear_verification() ;
   ::google::protobuf::ExtensionRangeOptions_VerificationState verification() const;
@@ -12686,7 +12686,7 @@ inline void ExtensionRangeOptions::set_allocated_features(::google::protobuf::Fe
   // @@protoc_insertion_point(field_set_allocated:google.protobuf.ExtensionRangeOptions.features)
 }
 
-// optional .google.protobuf.ExtensionRangeOptions.VerificationState verification = 3 [default = UNVERIFIED];
+// optional .google.protobuf.ExtensionRangeOptions.VerificationState verification = 3 [default = UNVERIFIED, retention = RETENTION_SOURCE];
 inline bool ExtensionRangeOptions::has_verification() const {
   bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
diff --git a/src/google/protobuf/descriptor.proto b/src/google/protobuf/descriptor.proto
index fb6f58fee2..4126eab857 100644
--- a/src/google/protobuf/descriptor.proto
+++ b/src/google/protobuf/descriptor.proto
@@ -202,7 +202,8 @@ message ExtensionRangeOptions {
   // The verification state of the range.
   // TODO: flip the default to DECLARATION once all empty ranges
   // are marked as UNVERIFIED.
-  optional VerificationState verification = 3 [default = UNVERIFIED];
+  optional VerificationState verification = 3
+      [default = UNVERIFIED, retention = RETENTION_SOURCE];
 
   // Clients can define custom options in extensions of this message. See above.
   extensions 1000 to max;