diff --git a/csharp/src/Google.Protobuf.Test/testprotos.pb b/csharp/src/Google.Protobuf.Test/testprotos.pb
index d43f037946..08e36f0af5 100644
Binary files a/csharp/src/Google.Protobuf.Test/testprotos.pb and b/csharp/src/Google.Protobuf.Test/testprotos.pb differ
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Api.pb.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Api.pb.cs
index 06b59835f1..7ef267a201 100644
--- a/csharp/src/Google.Protobuf/WellKnownTypes/Api.pb.cs
+++ b/csharp/src/Google.Protobuf/WellKnownTypes/Api.pb.cs
@@ -32,16 +32,16 @@ namespace Google.Protobuf.WellKnownTypes {
             "b24YBCABKAkSNgoOc291cmNlX2NvbnRleHQYBSABKAsyHi5nb29nbGUucHJv",
             "dG9idWYuU291cmNlQ29udGV4dBImCgZtaXhpbnMYBiADKAsyFi5nb29nbGUu",
             "cHJvdG9idWYuTWl4aW4SJwoGc3ludGF4GAcgASgOMhcuZ29vZ2xlLnByb3Rv",
-            "YnVmLlN5bnRheBIPCgdlZGl0aW9uGAggASgJIuYBCgZNZXRob2QSDAoEbmFt",
+            "YnVmLlN5bnRheBIPCgdlZGl0aW9uGAggASgJIu4BCgZNZXRob2QSDAoEbmFt",
             "ZRgBIAEoCRIYChByZXF1ZXN0X3R5cGVfdXJsGAIgASgJEhkKEXJlcXVlc3Rf",
             "c3RyZWFtaW5nGAMgASgIEhkKEXJlc3BvbnNlX3R5cGVfdXJsGAQgASgJEhoK",
             "EnJlc3BvbnNlX3N0cmVhbWluZxgFIAEoCBIoCgdvcHRpb25zGAYgAygLMhcu",
-            "Z29vZ2xlLnByb3RvYnVmLk9wdGlvbhInCgZzeW50YXgYByABKA4yFy5nb29n",
-            "bGUucHJvdG9idWYuU3ludGF4Eg8KB2VkaXRpb24YCCABKAkiIwoFTWl4aW4S",
-            "DAoEbmFtZRgBIAEoCRIMCgRyb290GAIgASgJQnYKE2NvbS5nb29nbGUucHJv",
-            "dG9idWZCCEFwaVByb3RvUAFaLGdvb2dsZS5nb2xhbmcub3JnL3Byb3RvYnVm",
-            "L3R5cGVzL2tub3duL2FwaXBiogIDR1BCqgIeR29vZ2xlLlByb3RvYnVmLldl",
-            "bGxLbm93blR5cGVzYgZwcm90bzM="));
+            "Z29vZ2xlLnByb3RvYnVmLk9wdGlvbhIrCgZzeW50YXgYByABKA4yFy5nb29n",
+            "bGUucHJvdG9idWYuU3ludGF4QgIYARITCgdlZGl0aW9uGAggASgJQgIYASIj",
+            "CgVNaXhpbhIMCgRuYW1lGAEgASgJEgwKBHJvb3QYAiABKAlCdgoTY29tLmdv",
+            "b2dsZS5wcm90b2J1ZkIIQXBpUHJvdG9QAVosZ29vZ2xlLmdvbGFuZy5vcmcv",
+            "cHJvdG9idWYvdHlwZXMva25vd24vYXBpcGKiAgNHUEKqAh5Hb29nbGUuUHJv",
+            "dG9idWYuV2VsbEtub3duVHlwZXNiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.SourceContextReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.TypeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
@@ -701,7 +701,11 @@ namespace Google.Protobuf.WellKnownTypes {
     private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = global::Google.Protobuf.WellKnownTypes.Syntax.Proto2;
     /// <summary>
     /// The source syntax of this method.
+    ///
+    /// This field should be ignored, instead the syntax should be inherited from
+    /// Api. This is similar to Field and EnumValue.
     /// </summary>
+    [global::System.ObsoleteAttribute]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
     public global::Google.Protobuf.WellKnownTypes.Syntax Syntax {
@@ -716,7 +720,11 @@ namespace Google.Protobuf.WellKnownTypes {
     private string edition_ = "";
     /// <summary>
     /// The source edition string, only valid when syntax is SYNTAX_EDITIONS.
+    ///
+    /// This field should be ignored, instead the edition should be inherited from
+    /// Api. This is similar to Field and EnumValue.
     /// </summary>
+    [global::System.ObsoleteAttribute]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
     public string Edition {
diff --git a/objectivec/GPBApi.pbobjc.h b/objectivec/GPBApi.pbobjc.h
index 1d9e526af1..62d5e0add5 100644
--- a/objectivec/GPBApi.pbobjc.h
+++ b/objectivec/GPBApi.pbobjc.h
@@ -189,11 +189,21 @@ GPB_FINAL @interface GPBMethod : GPBMessage
 /** The number of items in @c optionsArray without causing the container to be created. */
 @property(nonatomic, readonly) NSUInteger optionsArray_Count;
 
-/** The source syntax of this method. */
-@property(nonatomic, readwrite) GPBSyntax syntax;
+/**
+ * The source syntax of this method.
+ *
+ * This field should be ignored, instead the syntax should be inherited from
+ * Api. This is similar to Field and EnumValue.
+ **/
+@property(nonatomic, readwrite) GPBSyntax syntax GPB_DEPRECATED_MSG("google.protobuf.Method.syntax is deprecated (see google/protobuf/api.proto).");
 
-/** The source edition string, only valid when syntax is SYNTAX_EDITIONS. */
-@property(nonatomic, readwrite, copy, null_resettable) NSString *edition;
+/**
+ * The source edition string, only valid when syntax is SYNTAX_EDITIONS.
+ *
+ * This field should be ignored, instead the edition should be inherited from
+ * Api. This is similar to Field and EnumValue.
+ **/
+@property(nonatomic, readwrite, copy, null_resettable) NSString *edition GPB_DEPRECATED_MSG("google.protobuf.Method.edition is deprecated (see google/protobuf/api.proto).");
 
 @end
 
diff --git a/php/ext/google/protobuf/wkt.inc b/php/ext/google/protobuf/wkt.inc
index 86acd89404..de474623b5 100644
--- a/php/ext/google/protobuf/wkt.inc
+++ b/php/ext/google/protobuf/wkt.inc
@@ -140,7 +140,7 @@ static void google_protobuf_Any_ModuleInit() {
 
 zend_class_entry* GPBMetadata_Google_Protobuf_Api_ce;
 
-const char google_protobuf_api_proto_descriptor [785] = {
+const char google_protobuf_api_proto_descriptor [793] = {
 '\n', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'p', 'i', '.', 'p', 'r', 'o', 
 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\032', '$', 'g', 'o', 'o', 'g', 
 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 'o', 'u', 'r', 'c', 'e', '_', 'c', 'o', 'n', 't', 'e', 'x', 
@@ -156,23 +156,23 @@ const char google_protobuf_api_proto_descriptor [785] = {
 '\006', ' ', '\003', '(', '\013', '2', '\026', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 
 'i', 'x', 'i', 'n', '\022', '\'', '\n', '\006', 's', 'y', 'n', 't', 'a', 'x', '\030', '\007', ' ', '\001', '(', '\016', '2', '\027', '.', 'g', 'o', 
 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'y', 'n', 't', 'a', 'x', '\022', '\017', '\n', '\007', 'e', 
-'d', 'i', 't', 'i', 'o', 'n', '\030', '\010', ' ', '\001', '(', '\t', '\"', '\346', '\001', '\n', '\006', 'M', 'e', 't', 'h', 'o', 'd', '\022', '\014', 
+'d', 'i', 't', 'i', 'o', 'n', '\030', '\010', ' ', '\001', '(', '\t', '\"', '\356', '\001', '\n', '\006', 'M', 'e', 't', 'h', 'o', 'd', '\022', '\014', 
 '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', '\022', '\030', '\n', '\020', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 't', 
 'y', 'p', 'e', '_', 'u', 'r', 'l', '\030', '\002', ' ', '\001', '(', '\t', '\022', '\031', '\n', '\021', 'r', 'e', 'q', 'u', 'e', 's', 't', '_', 
 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\010', '\022', '\031', '\n', '\021', 'r', 'e', 's', 'p', 'o', 'n', 
 's', 'e', '_', 't', 'y', 'p', 'e', '_', 'u', 'r', 'l', '\030', '\004', ' ', '\001', '(', '\t', '\022', '\032', '\n', '\022', 'r', 'e', 's', 'p', 
 'o', 'n', 's', 'e', '_', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\010', '\022', '(', '\n', '\007', 'o', 
 'p', 't', 'i', 'o', 'n', 's', '\030', '\006', ' ', '\003', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', 'b', 'u', 'f', '.', 'O', 'p', 't', 'i', 'o', 'n', '\022', '\'', '\n', '\006', 's', 'y', 'n', 't', 'a', 'x', '\030', '\007', ' ', 
+'t', 'o', 'b', 'u', 'f', '.', 'O', 'p', 't', 'i', 'o', 'n', '\022', '+', '\n', '\006', 's', 'y', 'n', 't', 'a', 'x', '\030', '\007', ' ', 
 '\001', '(', '\016', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'y', 'n', 
-'t', 'a', 'x', '\022', '\017', '\n', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\010', ' ', '\001', '(', '\t', '\"', '#', '\n', '\005', 'M', 
-'i', 'x', 'i', 'n', '\022', '\014', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', '\022', '\014', '\n', '\004', 'r', 'o', 'o', 
-'t', '\030', '\002', ' ', '\001', '(', '\t', 'B', 'v', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', 'b', 'u', 'f', 'B', '\010', 'A', 'p', 'i', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', ',', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 
-'s', '/', 'k', 'n', 'o', 'w', 'n', '/', 'a', 'p', 'i', 'p', 'b', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\036', 'G', 'o', 'o', 
-'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 'w', 'n', 'T', 'y', 'p', 
-'e', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+'t', 'a', 'x', 'B', '\002', '\030', '\001', '\022', '\023', '\n', '\007', 'e', 'd', 'i', 't', 'i', 'o', 'n', '\030', '\010', ' ', '\001', '(', '\t', 'B', 
+'\002', '\030', '\001', '\"', '#', '\n', '\005', 'M', 'i', 'x', 'i', 'n', '\022', '\014', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', 
+'\t', '\022', '\014', '\n', '\004', 'r', 'o', 'o', 't', '\030', '\002', ' ', '\001', '(', '\t', 'B', 'v', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 
+'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\010', 'A', 'p', 'i', 'P', 'r', 'o', 't', 'o', 'P', '\001', 
+'Z', ',', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 
+'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'k', 'n', 'o', 'w', 'n', '/', 'a', 'p', 'i', 'p', 'b', '\242', '\002', '\003', 'G', 
+'P', 'B', '\252', '\002', '\036', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'W', 'e', 'l', 'l', 
+'K', 'n', 'o', 'w', 'n', 'T', 'y', 'p', 'e', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
 };
 
 static void google_protobuf_api_proto_AddDescriptor() {
diff --git a/php/src/GPBMetadata/Google/Protobuf/Api.php b/php/src/GPBMetadata/Google/Protobuf/Api.php
index 5cd5beb10c..83e2748e4c 100644
--- a/php/src/GPBMetadata/Google/Protobuf/Api.php
+++ b/php/src/GPBMetadata/Google/Protobuf/Api.php
@@ -18,7 +18,7 @@ class Api
         \GPBMetadata\Google\Protobuf\SourceContext::initOnce();
         \GPBMetadata\Google\Protobuf\Type::initOnce();
         $pool->internalAddGeneratedFile(
-            "\x0A\xEB\x05\x0A\x19google/protobuf/api.proto\x12\x0Fgoogle.protobuf\x1A\x1Agoogle/protobuf/type.proto\"\x92\x02\x0A\x03Api\x12\x0C\x0A\x04name\x18\x01 \x01(\x09\x12(\x0A\x07methods\x18\x02 \x03(\x0B2\x17.google.protobuf.Method\x12(\x0A\x07options\x18\x03 \x03(\x0B2\x17.google.protobuf.Option\x12\x0F\x0A\x07version\x18\x04 \x01(\x09\x126\x0A\x0Esource_context\x18\x05 \x01(\x0B2\x1E.google.protobuf.SourceContext\x12&\x0A\x06mixins\x18\x06 \x03(\x0B2\x16.google.protobuf.Mixin\x12'\x0A\x06syntax\x18\x07 \x01(\x0E2\x17.google.protobuf.Syntax\x12\x0F\x0A\x07edition\x18\x08 \x01(\x09\"\xE6\x01\x0A\x06Method\x12\x0C\x0A\x04name\x18\x01 \x01(\x09\x12\x18\x0A\x10request_type_url\x18\x02 \x01(\x09\x12\x19\x0A\x11request_streaming\x18\x03 \x01(\x08\x12\x19\x0A\x11response_type_url\x18\x04 \x01(\x09\x12\x1A\x0A\x12response_streaming\x18\x05 \x01(\x08\x12(\x0A\x07options\x18\x06 \x03(\x0B2\x17.google.protobuf.Option\x12'\x0A\x06syntax\x18\x07 \x01(\x0E2\x17.google.protobuf.Syntax\x12\x0F\x0A\x07edition\x18\x08 \x01(\x09\"#\x0A\x05Mixin\x12\x0C\x0A\x04name\x18\x01 \x01(\x09\x12\x0C\x0A\x04root\x18\x02 \x01(\x09Bv\x0A\x13com.google.protobufB\x08ApiProtoP\x01Z,google.golang.org/protobuf/types/known/apipb\xA2\x02\x03GPB\xAA\x02\x1EGoogle.Protobuf.WellKnownTypesb\x06proto3"
+            "\x0A\xF3\x05\x0A\x19google/protobuf/api.proto\x12\x0Fgoogle.protobuf\x1A\x1Agoogle/protobuf/type.proto\"\x92\x02\x0A\x03Api\x12\x0C\x0A\x04name\x18\x01 \x01(\x09\x12(\x0A\x07methods\x18\x02 \x03(\x0B2\x17.google.protobuf.Method\x12(\x0A\x07options\x18\x03 \x03(\x0B2\x17.google.protobuf.Option\x12\x0F\x0A\x07version\x18\x04 \x01(\x09\x126\x0A\x0Esource_context\x18\x05 \x01(\x0B2\x1E.google.protobuf.SourceContext\x12&\x0A\x06mixins\x18\x06 \x03(\x0B2\x16.google.protobuf.Mixin\x12'\x0A\x06syntax\x18\x07 \x01(\x0E2\x17.google.protobuf.Syntax\x12\x0F\x0A\x07edition\x18\x08 \x01(\x09\"\xEE\x01\x0A\x06Method\x12\x0C\x0A\x04name\x18\x01 \x01(\x09\x12\x18\x0A\x10request_type_url\x18\x02 \x01(\x09\x12\x19\x0A\x11request_streaming\x18\x03 \x01(\x08\x12\x19\x0A\x11response_type_url\x18\x04 \x01(\x09\x12\x1A\x0A\x12response_streaming\x18\x05 \x01(\x08\x12(\x0A\x07options\x18\x06 \x03(\x0B2\x17.google.protobuf.Option\x12+\x0A\x06syntax\x18\x07 \x01(\x0E2\x17.google.protobuf.SyntaxB\x02\x18\x01\x12\x13\x0A\x07edition\x18\x08 \x01(\x09B\x02\x18\x01\"#\x0A\x05Mixin\x12\x0C\x0A\x04name\x18\x01 \x01(\x09\x12\x0C\x0A\x04root\x18\x02 \x01(\x09Bv\x0A\x13com.google.protobufB\x08ApiProtoP\x01Z,google.golang.org/protobuf/types/known/apipb\xA2\x02\x03GPB\xAA\x02\x1EGoogle.Protobuf.WellKnownTypesb\x06proto3"
         , true);
 
         static::$is_initialized = true;
diff --git a/php/src/Google/Protobuf/Method.php b/php/src/Google/Protobuf/Method.php
index b41d11e801..6eb9c358c5 100644
--- a/php/src/Google/Protobuf/Method.php
+++ b/php/src/Google/Protobuf/Method.php
@@ -58,14 +58,20 @@ class Method extends \Google\Protobuf\Internal\Message
     private $options;
     /**
      * The source syntax of this method.
+     * This field should be ignored, instead the syntax should be inherited from
+     * Api. This is similar to Field and EnumValue.
      *
-     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 7;</code>
+     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 7 [deprecated = true];</code>
+     * @deprecated
      */
     protected $syntax = 0;
     /**
      * The source edition string, only valid when syntax is SYNTAX_EDITIONS.
+     * This field should be ignored, instead the edition should be inherited from
+     * Api. This is similar to Field and EnumValue.
      *
-     * Generated from protobuf field <code>string edition = 8;</code>
+     * Generated from protobuf field <code>string edition = 8 [deprecated = true];</code>
+     * @deprecated
      */
     protected $edition = '';
 
@@ -89,8 +95,12 @@ class Method extends \Google\Protobuf\Internal\Message
      *           Any metadata attached to the method.
      *     @type int $syntax
      *           The source syntax of this method.
+     *           This field should be ignored, instead the syntax should be inherited from
+     *           Api. This is similar to Field and EnumValue.
      *     @type string $edition
      *           The source edition string, only valid when syntax is SYNTAX_EDITIONS.
+     *           This field should be ignored, instead the edition should be inherited from
+     *           Api. This is similar to Field and EnumValue.
      * }
      */
     public function __construct($data = NULL) {
@@ -256,24 +266,34 @@ class Method extends \Google\Protobuf\Internal\Message
 
     /**
      * The source syntax of this method.
+     * This field should be ignored, instead the syntax should be inherited from
+     * Api. This is similar to Field and EnumValue.
      *
-     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 7;</code>
+     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 7 [deprecated = true];</code>
      * @return int
+     * @deprecated
      */
     public function getSyntax()
     {
+        if ($this->syntax !== 0) {
+            @trigger_error('syntax is deprecated.', E_USER_DEPRECATED);
+        }
         return $this->syntax;
     }
 
     /**
      * The source syntax of this method.
+     * This field should be ignored, instead the syntax should be inherited from
+     * Api. This is similar to Field and EnumValue.
      *
-     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 7;</code>
+     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 7 [deprecated = true];</code>
      * @param int $var
      * @return $this
+     * @deprecated
      */
     public function setSyntax($var)
     {
+        @trigger_error('syntax is deprecated.', E_USER_DEPRECATED);
         GPBUtil::checkEnum($var, \Google\Protobuf\Syntax::class);
         $this->syntax = $var;
 
@@ -282,24 +302,34 @@ class Method extends \Google\Protobuf\Internal\Message
 
     /**
      * The source edition string, only valid when syntax is SYNTAX_EDITIONS.
+     * This field should be ignored, instead the edition should be inherited from
+     * Api. This is similar to Field and EnumValue.
      *
-     * Generated from protobuf field <code>string edition = 8;</code>
+     * Generated from protobuf field <code>string edition = 8 [deprecated = true];</code>
      * @return string
+     * @deprecated
      */
     public function getEdition()
     {
+        if ($this->edition !== '') {
+            @trigger_error('edition is deprecated.', E_USER_DEPRECATED);
+        }
         return $this->edition;
     }
 
     /**
      * The source edition string, only valid when syntax is SYNTAX_EDITIONS.
+     * This field should be ignored, instead the edition should be inherited from
+     * Api. This is similar to Field and EnumValue.
      *
-     * Generated from protobuf field <code>string edition = 8;</code>
+     * Generated from protobuf field <code>string edition = 8 [deprecated = true];</code>
      * @param string $var
      * @return $this
+     * @deprecated
      */
     public function setEdition($var)
     {
+        @trigger_error('edition is deprecated.', E_USER_DEPRECATED);
         GPBUtil::checkString($var, True);
         $this->edition = $var;
 
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc
index 6cc9d20c9b..849e1b8d29 100644
--- a/src/google/protobuf/api.pb.cc
+++ b/src/google/protobuf/api.pb.cc
@@ -212,17 +212,17 @@ const char descriptor_table_protodef_google_2fprotobuf_2fapi_2eproto[] ABSL_ATTR
     "rce_context\030\005 \001(\0132\036.google.protobuf.Sour"
     "ceContext\022&\n\006mixins\030\006 \003(\0132\026.google.proto"
     "buf.Mixin\022\'\n\006syntax\030\007 \001(\0162\027.google.proto"
-    "buf.Syntax\022\017\n\007edition\030\010 \001(\t\"\346\001\n\006Method\022\014"
+    "buf.Syntax\022\017\n\007edition\030\010 \001(\t\"\356\001\n\006Method\022\014"
     "\n\004name\030\001 \001(\t\022\030\n\020request_type_url\030\002 \001(\t\022\031"
     "\n\021request_streaming\030\003 \001(\010\022\031\n\021response_ty"
     "pe_url\030\004 \001(\t\022\032\n\022response_streaming\030\005 \001(\010"
     "\022(\n\007options\030\006 \003(\0132\027.google.protobuf.Opti"
-    "on\022\'\n\006syntax\030\007 \001(\0162\027.google.protobuf.Syn"
-    "tax\022\017\n\007edition\030\010 \001(\t\"#\n\005Mixin\022\014\n\004name\030\001 "
-    "\001(\t\022\014\n\004root\030\002 \001(\tBv\n\023com.google.protobuf"
-    "B\010ApiProtoP\001Z,google.golang.org/protobuf"
-    "/types/known/apipb\242\002\003GPB\252\002\036Google.Protob"
-    "uf.WellKnownTypesb\006proto3"
+    "on\022+\n\006syntax\030\007 \001(\0162\027.google.protobuf.Syn"
+    "taxB\002\030\001\022\023\n\007edition\030\010 \001(\tB\002\030\001\"#\n\005Mixin\022\014\n"
+    "\004name\030\001 \001(\t\022\014\n\004root\030\002 \001(\tBv\n\023com.google."
+    "protobufB\010ApiProtoP\001Z,google.golang.org/"
+    "protobuf/types/known/apipb\242\002\003GPB\252\002\036Googl"
+    "e.Protobuf.WellKnownTypesb\006proto3"
 };
 static const ::_pbi::DescriptorTable* PROTOBUF_NONNULL const
     descriptor_table_google_2fprotobuf_2fapi_2eproto_deps[2] = {
@@ -233,7 +233,7 @@ static ::absl::once_flag descriptor_table_google_2fprotobuf_2fapi_2eproto_once;
 PROTOBUF_CONSTINIT const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fapi_2eproto = {
     false,
     false,
-    785,
+    793,
     descriptor_table_protodef_google_2fprotobuf_2fapi_2eproto,
     "google/protobuf/api.proto",
     &descriptor_table_google_2fprotobuf_2fapi_2eproto_once,
@@ -969,7 +969,7 @@ Method::_table_ = {
     ::_pbi::TcParser::GetTable<::google::protobuf::Method>(),  // to_prefetch
     #endif  // PROTOBUF_PREFETCH_PARSE_TABLE
   }, {{
-    // string edition = 8;
+    // string edition = 8 [deprecated = true];
     {::_pbi::TcParser::FastUS1,
      {66, 3, 0, PROTOBUF_FIELD_OFFSET(Method, _impl_.edition_)}},
     // string name = 1;
@@ -990,7 +990,7 @@ Method::_table_ = {
     // repeated .google.protobuf.Option options = 6;
     {::_pbi::TcParser::FastMtR1,
      {50, 63, 0, PROTOBUF_FIELD_OFFSET(Method, _impl_.options_)}},
-    // .google.protobuf.Syntax syntax = 7;
+    // .google.protobuf.Syntax syntax = 7 [deprecated = true];
     {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(Method, _impl_.syntax_), 6>(),
      {56, 6, 0, PROTOBUF_FIELD_OFFSET(Method, _impl_.syntax_)}},
   }}, {{
@@ -1008,9 +1008,9 @@ Method::_table_ = {
     {PROTOBUF_FIELD_OFFSET(Method, _impl_.response_streaming_), _Internal::kHasBitsOffset + 5, 0, (0 | ::_fl::kFcOptional | ::_fl::kBool)},
     // repeated .google.protobuf.Option options = 6;
     {PROTOBUF_FIELD_OFFSET(Method, _impl_.options_), -1, 0, (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .google.protobuf.Syntax syntax = 7;
+    // .google.protobuf.Syntax syntax = 7 [deprecated = true];
     {PROTOBUF_FIELD_OFFSET(Method, _impl_.syntax_), _Internal::kHasBitsOffset + 6, 0, (0 | ::_fl::kFcOptional | ::_fl::kOpenEnum)},
-    // string edition = 8;
+    // string edition = 8 [deprecated = true];
     {PROTOBUF_FIELD_OFFSET(Method, _impl_.edition_), _Internal::kHasBitsOffset + 3, 0, (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
   }},
   {{
@@ -1134,7 +1134,7 @@ PROTOBUF_NOINLINE void Method::Clear() {
             target, stream);
   }
 
-  // .google.protobuf.Syntax syntax = 7;
+  // .google.protobuf.Syntax syntax = 7 [deprecated = true];
   if ((this_._impl_._has_bits_[0] & 0x00000040U) != 0) {
     if (this_._internal_syntax() != 0) {
       target = stream->EnsureSpace(target);
@@ -1143,7 +1143,7 @@ PROTOBUF_NOINLINE void Method::Clear() {
     }
   }
 
-  // string edition = 8;
+  // string edition = 8 [deprecated = true];
   if ((this_._impl_._has_bits_[0] & 0x00000008U) != 0) {
     if (!this_._internal_edition().empty()) {
       const ::std::string& _s = this_._internal_edition();
@@ -1209,7 +1209,7 @@ PROTOBUF_NOINLINE void Method::Clear() {
                                         this_._internal_response_type_url());
       }
     }
-    // string edition = 8;
+    // string edition = 8 [deprecated = true];
     if ((cached_has_bits & 0x00000008U) != 0) {
       if (!this_._internal_edition().empty()) {
         total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
@@ -1228,7 +1228,7 @@ PROTOBUF_NOINLINE void Method::Clear() {
         total_size += 2;
       }
     }
-    // .google.protobuf.Syntax syntax = 7;
+    // .google.protobuf.Syntax syntax = 7 [deprecated = true];
     if ((cached_has_bits & 0x00000040U) != 0) {
       if (this_._internal_syntax() != 0) {
         total_size += 1 +
diff --git a/src/google/protobuf/api.pb.h b/src/google/protobuf/api.pb.h
index 3356bcf33e..b8943be121 100644
--- a/src/google/protobuf/api.pb.h
+++ b/src/google/protobuf/api.pb.h
@@ -506,14 +506,14 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message
   ::std::string* PROTOBUF_NONNULL _internal_mutable_response_type_url();
 
   public:
-  // string edition = 8;
-  void clear_edition() ;
-  const ::std::string& edition() const;
+  // string edition = 8 [deprecated = true];
+  [[deprecated]]  void clear_edition() ;
+  [[deprecated]] const ::std::string& edition() const;
   template <typename Arg_ = const ::std::string&, typename... Args_>
-  void set_edition(Arg_&& arg, Args_... args);
-  ::std::string* PROTOBUF_NONNULL mutable_edition();
-  [[nodiscard]] ::std::string* PROTOBUF_NULLABLE release_edition();
-  void set_allocated_edition(::std::string* PROTOBUF_NULLABLE value);
+  [[deprecated]] void set_edition(Arg_&& arg, Args_... args);
+  [[deprecated]] ::std::string* PROTOBUF_NONNULL mutable_edition();
+  [[deprecated]] [[nodiscard]] ::std::string* PROTOBUF_NULLABLE release_edition();
+  [[deprecated]] void set_allocated_edition(::std::string* PROTOBUF_NULLABLE value);
 
   private:
   const ::std::string& _internal_edition() const;
@@ -541,10 +541,10 @@ class PROTOBUF_EXPORT Method final : public ::google::protobuf::Message
   void _internal_set_response_streaming(bool value);
 
   public:
-  // .google.protobuf.Syntax syntax = 7;
-  void clear_syntax() ;
-  ::google::protobuf::Syntax syntax() const;
-  void set_syntax(::google::protobuf::Syntax value);
+  // .google.protobuf.Syntax syntax = 7 [deprecated = true];
+  [[deprecated]]  void clear_syntax() ;
+  [[deprecated]] ::google::protobuf::Syntax syntax() const;
+  [[deprecated]] void set_syntax(::google::protobuf::Syntax value);
 
   private:
   ::google::protobuf::Syntax _internal_syntax() const;
@@ -1676,7 +1676,7 @@ Method::_internal_mutable_options() {
   return &_impl_.options_;
 }
 
-// .google.protobuf.Syntax syntax = 7;
+// .google.protobuf.Syntax syntax = 7 [deprecated = true];
 inline void Method::clear_syntax() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
   _impl_.syntax_ = 0;
@@ -1700,7 +1700,7 @@ inline void Method::_internal_set_syntax(::google::protobuf::Syntax value) {
   _impl_.syntax_ = value;
 }
 
-// string edition = 8;
+// string edition = 8 [deprecated = true];
 inline void Method::clear_edition() {
   ::google::protobuf::internal::TSanWrite(&_impl_);
   _impl_.edition_.ClearToEmpty();