diff --git a/Google.Api.Generator.Tests/ProtoTests/Showcase/Compliance.g.cs b/Google.Api.Generator.Tests/ProtoTests/Showcase/Compliance.g.cs
index 98d456a1..82b6388a 100644
--- a/Google.Api.Generator.Tests/ProtoTests/Showcase/Compliance.g.cs
+++ b/Google.Api.Generator.Tests/ProtoTests/Showcase/Compliance.g.cs
@@ -150,6 +150,7 @@ public enum Continent {
   #endregion
 
   #region Messages
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class RepeatRequest : pb::IMessage<RepeatRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -641,7 +642,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -699,7 +704,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -753,6 +762,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class RepeatResponse : pb::IMessage<RepeatResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -943,7 +953,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -969,7 +983,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -996,6 +1014,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// over REST to the Compliance service to test their gRPC-to-REST transcoding
   /// implementation.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ComplianceSuite : pb::IMessage<ComplianceSuite>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1140,7 +1159,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1159,7 +1182,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1179,6 +1206,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// server: one request for each combination of elements of `rpcs` and of
   /// `requests`.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ComplianceGroup : pb::IMessage<ComplianceGroup>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1370,7 +1398,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1397,7 +1429,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1424,6 +1460,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// ComplianceData is a message used for testing REST transcoding of
   /// different data types.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ComplianceData : pb::IMessage<ComplianceData>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -2299,7 +2336,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -2412,7 +2453,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -2539,6 +2584,7 @@ public enum LifeKingdom {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ComplianceDataChild : pb::IMessage<ComplianceDataChild>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3080,7 +3126,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -3149,7 +3199,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -3214,6 +3268,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ComplianceDataGrandchild : pb::IMessage<ComplianceDataGrandchild>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3427,7 +3482,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -3454,7 +3513,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -3477,6 +3540,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class EnumRequest : pb::IMessage<EnumRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3635,7 +3699,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -3654,7 +3722,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -3669,6 +3741,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class EnumResponse : pb::IMessage<EnumResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3862,7 +3935,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -3888,7 +3965,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
diff --git a/Google.Api.Generator.Tests/ProtoTests/Showcase/ComplianceGrpc.g.cs b/Google.Api.Generator.Tests/ProtoTests/Showcase/ComplianceGrpc.g.cs
index 4b68beee..8143c9bb 100644
--- a/Google.Api.Generator.Tests/ProtoTests/Showcase/ComplianceGrpc.g.cs
+++ b/Google.Api.Generator.Tests/ProtoTests/Showcase/ComplianceGrpc.g.cs
@@ -17,7 +17,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#pragma warning disable 0414, 1591, 8981
+#pragma warning disable 0414, 1591, 8981, 0612
 #region Designer generated code
 
 using grpc = global::Grpc.Core;
diff --git a/Google.Api.Generator.Tests/ProtoTests/Showcase/Identity.g.cs b/Google.Api.Generator.Tests/ProtoTests/Showcase/Identity.g.cs
index 9d85c30e..f7371fc2 100644
--- a/Google.Api.Generator.Tests/ProtoTests/Showcase/Identity.g.cs
+++ b/Google.Api.Generator.Tests/ProtoTests/Showcase/Identity.g.cs
@@ -41,29 +41,29 @@ static IdentityReflection() {
             "CwoJX25pY2tuYW1lQhcKFV9lbmFibGVfbm90aWZpY2F0aW9ucyJAChFDcmVh",
             "dGVVc2VyUmVxdWVzdBIrCgR1c2VyGAEgASgLMh0uZ29vZ2xlLnNob3djYXNl",
             "LnYxYmV0YTEuVXNlciJECg5HZXRVc2VyUmVxdWVzdBIyCgRuYW1lGAEgASgJ",
-            "QiT6QR4KHHNob3djYXNlLmdvb2dsZWFwaXMuY29tL1VzZXLgQQIicQoRVXBk",
+            "QiTgQQL6QR4KHHNob3djYXNlLmdvb2dsZWFwaXMuY29tL1VzZXIicQoRVXBk",
             "YXRlVXNlclJlcXVlc3QSKwoEdXNlchgBIAEoCzIdLmdvb2dsZS5zaG93Y2Fz",
             "ZS52MWJldGExLlVzZXISLwoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUu",
             "cHJvdG9idWYuRmllbGRNYXNrIkcKEURlbGV0ZVVzZXJSZXF1ZXN0EjIKBG5h",
-            "bWUYASABKAlCJPpBHgocc2hvd2Nhc2UuZ29vZ2xlYXBpcy5jb20vVXNlcuBB",
-            "AiI5ChBMaXN0VXNlcnNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpw",
+            "bWUYASABKAlCJOBBAvpBHgocc2hvd2Nhc2UuZ29vZ2xlYXBpcy5jb20vVXNl",
+            "ciI5ChBMaXN0VXNlcnNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpw",
             "YWdlX3Rva2VuGAIgASgJIloKEUxpc3RVc2Vyc1Jlc3BvbnNlEiwKBXVzZXJz",
             "GAEgAygLMh0uZ29vZ2xlLnNob3djYXNlLnYxYmV0YTEuVXNlchIXCg9uZXh0",
             "X3BhZ2VfdG9rZW4YAiABKAkyigYKCElkZW50aXR5EvMBCgpDcmVhdGVVc2Vy",
             "EiouZ29vZ2xlLnNob3djYXNlLnYxYmV0YTEuQ3JlYXRlVXNlclJlcXVlc3Qa",
-            "HS5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5Vc2VyIpkBgtPkkwITIg4vdjFi",
-            "ZXRhMS91c2VyczoBKtpBHHVzZXIuZGlzcGxheV9uYW1lLHVzZXIuZW1haWza",
-            "QV51c2VyLmRpc3BsYXlfbmFtZSx1c2VyLmVtYWlsLHVzZXIuYWdlLHVzZXIu",
-            "bmlja25hbWUsdXNlci5lbmFibGVfbm90aWZpY2F0aW9ucyx1c2VyLmhlaWdo",
-            "dF9mZWV0EnkKB0dldFVzZXISJy5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5H",
+            "HS5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5Vc2VyIpkB2kEcdXNlci5kaXNw",
+            "bGF5X25hbWUsdXNlci5lbWFpbNpBXnVzZXIuZGlzcGxheV9uYW1lLHVzZXIu",
+            "ZW1haWwsdXNlci5hZ2UsdXNlci5uaWNrbmFtZSx1c2VyLmVuYWJsZV9ub3Rp",
+            "ZmljYXRpb25zLHVzZXIuaGVpZ2h0X2ZlZXSC0+STAhMiDi92MWJldGExL3Vz",
+            "ZXJzOgEqEnkKB0dldFVzZXISJy5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5H",
             "ZXRVc2VyUmVxdWVzdBodLmdvb2dsZS5zaG93Y2FzZS52MWJldGExLlVzZXIi",
-            "JoLT5JMCGRIXL3YxYmV0YTEve25hbWU9dXNlcnMvKn3aQQRuYW1lEoMBCgpV",
+            "JtpBBG5hbWWC0+STAhkSFy92MWJldGExL3tuYW1lPXVzZXJzLyp9EoMBCgpV",
             "cGRhdGVVc2VyEiouZ29vZ2xlLnNob3djYXNlLnYxYmV0YTEuVXBkYXRlVXNl",
             "clJlcXVlc3QaHS5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5Vc2VyIiqC0+ST",
             "AiQyHC92MWJldGExL3t1c2VyLm5hbWU9dXNlcnMvKn06BHVzZXISeAoKRGVs",
             "ZXRlVXNlchIqLmdvb2dsZS5zaG93Y2FzZS52MWJldGExLkRlbGV0ZVVzZXJS",
-            "ZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IiaC0+STAhkqFy92MWJl",
-            "dGExL3tuYW1lPXVzZXJzLyp92kEEbmFtZRJ6CglMaXN0VXNlcnMSKS5nb29n",
+            "ZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IibaQQRuYW1lgtPkkwIZ",
+            "KhcvdjFiZXRhMS97bmFtZT11c2Vycy8qfRJ6CglMaXN0VXNlcnMSKS5nb29n",
             "bGUuc2hvd2Nhc2UudjFiZXRhMS5MaXN0VXNlcnNSZXF1ZXN0GiouZ29vZ2xl",
             "LnNob3djYXNlLnYxYmV0YTEuTGlzdFVzZXJzUmVzcG9uc2UiFoLT5JMCEBIO",
             "L3YxYmV0YTEvdXNlcnMaEcpBDmxvY2FsaG9zdDo3NDY5QnEKG2NvbS5nb29n",
@@ -89,6 +89,7 @@ static IdentityReflection() {
   /// <summary>
   /// A user.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class User : pb::IMessage<User>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -576,7 +577,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -633,7 +638,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -690,6 +699,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Identity\CreateUser
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class CreateUserRequest : pb::IMessage<CreateUserRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -851,7 +861,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -873,7 +887,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -895,6 +913,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Identity\GetUser
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class GetUserRequest : pb::IMessage<GetUserRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1053,7 +1072,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1072,7 +1095,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1091,6 +1118,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Identity\UpdateUser
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class UpdateUserRequest : pb::IMessage<UpdateUserRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1288,7 +1316,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1317,7 +1349,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1346,6 +1382,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Identity\DeleteUser
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class DeleteUserRequest : pb::IMessage<DeleteUserRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1504,7 +1541,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1523,7 +1564,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1542,6 +1587,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Identity\ListUsers
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ListUsersRequest : pb::IMessage<ListUsersRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1735,7 +1781,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1758,7 +1808,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1781,6 +1835,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The response message for the google.showcase.v1beta1.Identity\ListUsers
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ListUsersResponse : pb::IMessage<ListUsersResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1963,7 +2018,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1986,7 +2045,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
diff --git a/Google.Api.Generator.Tests/ProtoTests/Showcase/IdentityGrpc.g.cs b/Google.Api.Generator.Tests/ProtoTests/Showcase/IdentityGrpc.g.cs
index ddc6b7bf..05799836 100644
--- a/Google.Api.Generator.Tests/ProtoTests/Showcase/IdentityGrpc.g.cs
+++ b/Google.Api.Generator.Tests/ProtoTests/Showcase/IdentityGrpc.g.cs
@@ -17,7 +17,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#pragma warning disable 0414, 1591, 8981
+#pragma warning disable 0414, 1591, 8981, 0612
 #region Designer generated code
 
 using grpc = global::Grpc.Core;
diff --git a/Google.Api.Generator.Tests/ProtoTests/Showcase/Messaging.g.cs b/Google.Api.Generator.Tests/ProtoTests/Showcase/Messaging.g.cs
index 6586c4e8..e4c30210 100644
--- a/Google.Api.Generator.Tests/ProtoTests/Showcase/Messaging.g.cs
+++ b/Google.Api.Generator.Tests/ProtoTests/Showcase/Messaging.g.cs
@@ -38,17 +38,17 @@ static MessagingReflection() {
             "Z29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDOi/qQSwKHHNob3djYXNl",
             "Lmdvb2dsZWFwaXMuY29tL1Jvb20SDHJvb21zL3tyb29tfSJAChFDcmVhdGVS",
             "b29tUmVxdWVzdBIrCgRyb29tGAEgASgLMh0uZ29vZ2xlLnNob3djYXNlLnYx",
-            "YmV0YTEuUm9vbSJECg5HZXRSb29tUmVxdWVzdBIyCgRuYW1lGAEgASgJQiT6",
-            "QR4KHHNob3djYXNlLmdvb2dsZWFwaXMuY29tL1Jvb23gQQIicQoRVXBkYXRl",
+            "YmV0YTEuUm9vbSJECg5HZXRSb29tUmVxdWVzdBIyCgRuYW1lGAEgASgJQiTg",
+            "QQL6QR4KHHNob3djYXNlLmdvb2dsZWFwaXMuY29tL1Jvb20icQoRVXBkYXRl",
             "Um9vbVJlcXVlc3QSKwoEcm9vbRgBIAEoCzIdLmdvb2dsZS5zaG93Y2FzZS52",
             "MWJldGExLlJvb20SLwoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJv",
             "dG9idWYuRmllbGRNYXNrIkcKEURlbGV0ZVJvb21SZXF1ZXN0EjIKBG5hbWUY",
-            "ASABKAlCJPpBHgocc2hvd2Nhc2UuZ29vZ2xlYXBpcy5jb20vUm9vbeBBAiI5",
+            "ASABKAlCJOBBAvpBHgocc2hvd2Nhc2UuZ29vZ2xlYXBpcy5jb20vUm9vbSI5",
             "ChBMaXN0Um9vbXNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpwYWdl",
             "X3Rva2VuGAIgASgJIloKEUxpc3RSb29tc1Jlc3BvbnNlEiwKBXJvb21zGAEg",
             "AygLMh0uZ29vZ2xlLnNob3djYXNlLnYxYmV0YTEuUm9vbRIXCg9uZXh0X3Bh",
             "Z2VfdG9rZW4YAiABKAki4wIKBUJsdXJiEgwKBG5hbWUYASABKAkSMgoEdXNl",
-            "chgCIAEoCUIk+kEeChxzaG93Y2FzZS5nb29nbGVhcGlzLmNvbS9Vc2Vy4EEC",
+            "chgCIAEoCUIk4EEC+kEeChxzaG93Y2FzZS5nb29nbGVhcGlzLmNvbS9Vc2Vy",
             "Eg4KBHRleHQYAyABKAlIABIPCgVpbWFnZRgEIAEoDEgAEjQKC2NyZWF0ZV90",
             "aW1lGAUgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQK",
             "C3VwZGF0ZV90aW1lGAYgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFt",
@@ -56,16 +56,16 @@ static MessagingReflection() {
             "ZXJfaWQYCCABKAlIATo/6kE8Ch1zaG93Y2FzZS5nb29nbGVhcGlzLmNvbS9C",
             "bHVyYhIbcm9vbXMve3Jvb219L2JsdXJicy97Ymx1cmJ9QgkKB2NvbnRlbnRC",
             "CwoJbGVnYWN5X2lkInoKEkNyZWF0ZUJsdXJiUmVxdWVzdBI1CgZwYXJlbnQY",
-            "ASABKAlCJfpBHxIdc2hvd2Nhc2UuZ29vZ2xlYXBpcy5jb20vQmx1cmLgQQIS",
+            "ASABKAlCJeBBAvpBHxIdc2hvd2Nhc2UuZ29vZ2xlYXBpcy5jb20vQmx1cmIS",
             "LQoFYmx1cmIYAiABKAsyHi5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5CbHVy",
-            "YiJGCg9HZXRCbHVyYlJlcXVlc3QSMwoEbmFtZRgBIAEoCUIl+kEfCh1zaG93",
-            "Y2FzZS5nb29nbGVhcGlzLmNvbS9CbHVyYuBBAiJ0ChJVcGRhdGVCbHVyYlJl",
+            "YiJGCg9HZXRCbHVyYlJlcXVlc3QSMwoEbmFtZRgBIAEoCUIl4EEC+kEfCh1z",
+            "aG93Y2FzZS5nb29nbGVhcGlzLmNvbS9CbHVyYiJ0ChJVcGRhdGVCbHVyYlJl",
             "cXVlc3QSLQoFYmx1cmIYASABKAsyHi5nb29nbGUuc2hvd2Nhc2UudjFiZXRh",
             "MS5CbHVyYhIvCgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1",
             "Zi5GaWVsZE1hc2siSQoSRGVsZXRlQmx1cmJSZXF1ZXN0EjMKBG5hbWUYASAB",
-            "KAlCJfpBHwodc2hvd2Nhc2UuZ29vZ2xlYXBpcy5jb20vQmx1cmLgQQIicQoR",
-            "TGlzdEJsdXJic1JlcXVlc3QSNQoGcGFyZW50GAEgASgJQiX6QR8SHXNob3dj",
-            "YXNlLmdvb2dsZWFwaXMuY29tL0JsdXJi4EECEhEKCXBhZ2Vfc2l6ZRgCIAEo",
+            "KAlCJeBBAvpBHwodc2hvd2Nhc2UuZ29vZ2xlYXBpcy5jb20vQmx1cmIicQoR",
+            "TGlzdEJsdXJic1JlcXVlc3QSNQoGcGFyZW50GAEgASgJQiXgQQL6QR8SHXNo",
+            "b3djYXNlLmdvb2dsZWFwaXMuY29tL0JsdXJiEhEKCXBhZ2Vfc2l6ZRgCIAEo",
             "BRISCgpwYWdlX3Rva2VuGAMgASgJIl0KEkxpc3RCbHVyYnNSZXNwb25zZRIu",
             "CgZibHVyYnMYASADKAsyHi5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5CbHVy",
             "YhIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkihAEKE1NlYXJjaEJsdXJic1Jl",
@@ -76,7 +76,7 @@ static MessagingReflection() {
             "bmZvIl8KFFNlYXJjaEJsdXJic1Jlc3BvbnNlEi4KBmJsdXJicxgBIAMoCzIe",
             "Lmdvb2dsZS5zaG93Y2FzZS52MWJldGExLkJsdXJiEhcKD25leHRfcGFnZV90",
             "b2tlbhgCIAEoCSKAAQoTU3RyZWFtQmx1cmJzUmVxdWVzdBIzCgRuYW1lGAEg",
-            "ASgJQiX6QR8SHXNob3djYXNlLmdvb2dsZWFwaXMuY29tL0JsdXJi4EECEjQK",
+            "ASgJQiXgQQL6QR8SHXNob3djYXNlLmdvb2dsZWFwaXMuY29tL0JsdXJiEjQK",
             "C2V4cGlyZV90aW1lGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFt",
             "cEID4EECItEBChRTdHJlYW1CbHVyYnNSZXNwb25zZRItCgVibHVyYhgBIAEo",
             "CzIeLmdvb2dsZS5zaG93Y2FzZS52MWJldGExLkJsdXJiEkQKBmFjdGlvbhgC",
@@ -90,48 +90,48 @@ static MessagingReflection() {
             "Y3RDb25maWcSMgoGcGFyZW50GAEgASgJQiL6QR8SHXNob3djYXNlLmdvb2ds",
             "ZWFwaXMuY29tL0JsdXJiQgkKB3JlcXVlc3QyrBMKCU1lc3NhZ2luZxKXAQoK",
             "Q3JlYXRlUm9vbRIqLmdvb2dsZS5zaG93Y2FzZS52MWJldGExLkNyZWF0ZVJv",
-            "b21SZXF1ZXN0Gh0uZ29vZ2xlLnNob3djYXNlLnYxYmV0YTEuUm9vbSI+gtPk",
-            "kwITIg4vdjFiZXRhMS9yb29tczoBKtpBInJvb20uZGlzcGxheV9uYW1lLHJv",
-            "b20uZGVzY3JpcHRpb24SeQoHR2V0Um9vbRInLmdvb2dsZS5zaG93Y2FzZS52",
+            "b21SZXF1ZXN0Gh0uZ29vZ2xlLnNob3djYXNlLnYxYmV0YTEuUm9vbSI+2kEi",
+            "cm9vbS5kaXNwbGF5X25hbWUscm9vbS5kZXNjcmlwdGlvboLT5JMCEyIOL3Yx",
+            "YmV0YTEvcm9vbXM6ASoSeQoHR2V0Um9vbRInLmdvb2dsZS5zaG93Y2FzZS52",
             "MWJldGExLkdldFJvb21SZXF1ZXN0Gh0uZ29vZ2xlLnNob3djYXNlLnYxYmV0",
-            "YTEuUm9vbSImgtPkkwIZEhcvdjFiZXRhMS97bmFtZT1yb29tcy8qfdpBBG5h",
-            "bWUSgwEKClVwZGF0ZVJvb20SKi5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5V",
+            "YTEuUm9vbSIm2kEEbmFtZYLT5JMCGRIXL3YxYmV0YTEve25hbWU9cm9vbXMv",
+            "Kn0SgwEKClVwZGF0ZVJvb20SKi5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5V",
             "cGRhdGVSb29tUmVxdWVzdBodLmdvb2dsZS5zaG93Y2FzZS52MWJldGExLlJv",
             "b20iKoLT5JMCJDIcL3YxYmV0YTEve3Jvb20ubmFtZT1yb29tcy8qfToEcm9v",
             "bRJ4CgpEZWxldGVSb29tEiouZ29vZ2xlLnNob3djYXNlLnYxYmV0YTEuRGVs",
-            "ZXRlUm9vbVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiJoLT5JMC",
-            "GSoXL3YxYmV0YTEve25hbWU9cm9vbXMvKn3aQQRuYW1lEnoKCUxpc3RSb29t",
+            "ZXRlUm9vbVJlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiJtpBBG5h",
+            "bWWC0+STAhkqFy92MWJldGExL3tuYW1lPXJvb21zLyp9EnoKCUxpc3RSb29t",
             "cxIpLmdvb2dsZS5zaG93Y2FzZS52MWJldGExLkxpc3RSb29tc1JlcXVlc3Qa",
             "Ki5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5MaXN0Um9vbXNSZXNwb25zZSIW",
             "gtPkkwIQEg4vdjFiZXRhMS9yb29tcxL2AQoLQ3JlYXRlQmx1cmISKy5nb29n",
             "bGUuc2hvd2Nhc2UudjFiZXRhMS5DcmVhdGVCbHVyYlJlcXVlc3QaHi5nb29n",
-            "bGUuc2hvd2Nhc2UudjFiZXRhMS5CbHVyYiKZAYLT5JMCVCIgL3YxYmV0YTEv",
-            "e3BhcmVudD1yb29tcy8qfS9ibHVyYnM6ASpaLSIoL3YxYmV0YTEve3BhcmVu",
-            "dD11c2Vycy8qL3Byb2ZpbGV9L2JsdXJiczoBKtpBHHBhcmVudCxibHVyYi51",
+            "bGUuc2hvd2Nhc2UudjFiZXRhMS5CbHVyYiKZAdpBHHBhcmVudCxibHVyYi51",
             "c2VyLGJsdXJiLnRleHTaQR1wYXJlbnQsYmx1cmIudXNlcixibHVyYi5pbWFn",
-            "ZRKxAQoIR2V0Qmx1cmISKC5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5HZXRC",
+            "ZYLT5JMCVCIgL3YxYmV0YTEve3BhcmVudD1yb29tcy8qfS9ibHVyYnM6ASpa",
+            "LSIoL3YxYmV0YTEve3BhcmVudD11c2Vycy8qL3Byb2ZpbGV9L2JsdXJiczoB",
+            "KhKxAQoIR2V0Qmx1cmISKC5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5HZXRC",
             "bHVyYlJlcXVlc3QaHi5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5CbHVyYiJb",
-            "gtPkkwJOEiAvdjFiZXRhMS97bmFtZT1yb29tcy8qL2JsdXJicy8qfVoqEigv",
-            "djFiZXRhMS97bmFtZT11c2Vycy8qL3Byb2ZpbGUvYmx1cmJzLyp92kEEbmFt",
-            "ZRLCAQoLVXBkYXRlQmx1cmISKy5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5V",
+            "2kEEbmFtZYLT5JMCThIgL3YxYmV0YTEve25hbWU9cm9vbXMvKi9ibHVyYnMv",
+            "Kn1aKhIoL3YxYmV0YTEve25hbWU9dXNlcnMvKi9wcm9maWxlL2JsdXJicy8q",
+            "fRLCAQoLVXBkYXRlQmx1cmISKy5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5V",
             "cGRhdGVCbHVyYlJlcXVlc3QaHi5nb29nbGUuc2hvd2Nhc2UudjFiZXRhMS5C",
             "bHVyYiJmgtPkkwJgMiYvdjFiZXRhMS97Ymx1cmIubmFtZT1yb29tcy8qL2Js",
             "dXJicy8qfToBKlozMi4vdjFiZXRhMS97Ymx1cmIubmFtZT11c2Vycy8qL3By",
             "b2ZpbGUvYmx1cmJzLyp9OgEqEq8BCgtEZWxldGVCbHVyYhIrLmdvb2dsZS5z",
             "aG93Y2FzZS52MWJldGExLkRlbGV0ZUJsdXJiUmVxdWVzdBoWLmdvb2dsZS5w",
-            "cm90b2J1Zi5FbXB0eSJbgtPkkwJOKiAvdjFiZXRhMS97bmFtZT1yb29tcy8q",
-            "L2JsdXJicy8qfVoqKigvdjFiZXRhMS97bmFtZT11c2Vycy8qL3Byb2ZpbGUv",
-            "Ymx1cmJzLyp92kEEbmFtZRLEAQoKTGlzdEJsdXJicxIqLmdvb2dsZS5zaG93",
+            "cm90b2J1Zi5FbXB0eSJb2kEEbmFtZYLT5JMCTiogL3YxYmV0YTEve25hbWU9",
+            "cm9vbXMvKi9ibHVyYnMvKn1aKiooL3YxYmV0YTEve25hbWU9dXNlcnMvKi9w",
+            "cm9maWxlL2JsdXJicy8qfRLEAQoKTGlzdEJsdXJicxIqLmdvb2dsZS5zaG93",
             "Y2FzZS52MWJldGExLkxpc3RCbHVyYnNSZXF1ZXN0GisuZ29vZ2xlLnNob3dj",
-            "YXNlLnYxYmV0YTEuTGlzdEJsdXJic1Jlc3BvbnNlIl2C0+STAk4SIC92MWJl",
-            "dGExL3twYXJlbnQ9cm9vbXMvKn0vYmx1cmJzWioSKC92MWJldGExL3twYXJl",
-            "bnQ9dXNlcnMvKi9wcm9maWxlfS9ibHVyYnPaQQZwYXJlbnQSgQIKDFNlYXJj",
+            "YXNlLnYxYmV0YTEuTGlzdEJsdXJic1Jlc3BvbnNlIl3aQQZwYXJlbnSC0+ST",
+            "Ak4SIC92MWJldGExL3twYXJlbnQ9cm9vbXMvKn0vYmx1cmJzWioSKC92MWJl",
+            "dGExL3twYXJlbnQ9dXNlcnMvKi9wcm9maWxlfS9ibHVyYnMSgQIKDFNlYXJj",
             "aEJsdXJicxIsLmdvb2dsZS5zaG93Y2FzZS52MWJldGExLlNlYXJjaEJsdXJi",
-            "c1JlcXVlc3QaHS5nb29nbGUubG9uZ3J1bm5pbmcuT3BlcmF0aW9uIqMBgtPk",
-            "kwJfIicvdjFiZXRhMS97cGFyZW50PXJvb21zLyp9L2JsdXJiczpzZWFyY2g6",
-            "ASpaMSIvL3YxYmV0YTEve3BhcmVudD11c2Vycy8qL3Byb2ZpbGV9L2JsdXJi",
-            "czpzZWFyY2jKQSwKFFNlYXJjaEJsdXJic1Jlc3BvbnNlEhRTZWFyY2hCbHVy",
-            "YnNNZXRhZGF0YdpBDHBhcmVudCxxdWVyeRLTAQoMU3RyZWFtQmx1cmJzEiwu",
+            "c1JlcXVlc3QaHS5nb29nbGUubG9uZ3J1bm5pbmcuT3BlcmF0aW9uIqMBykEs",
+            "ChRTZWFyY2hCbHVyYnNSZXNwb25zZRIUU2VhcmNoQmx1cmJzTWV0YWRhdGHa",
+            "QQxwYXJlbnQscXVlcnmC0+STAl8iJy92MWJldGExL3twYXJlbnQ9cm9vbXMv",
+            "Kn0vYmx1cmJzOnNlYXJjaDoBKloxIi8vdjFiZXRhMS97cGFyZW50PXVzZXJz",
+            "LyovcHJvZmlsZX0vYmx1cmJzOnNlYXJjaBLTAQoMU3RyZWFtQmx1cmJzEiwu",
             "Z29vZ2xlLnNob3djYXNlLnYxYmV0YTEuU3RyZWFtQmx1cmJzUmVxdWVzdBot",
             "Lmdvb2dsZS5zaG93Y2FzZS52MWJldGExLlN0cmVhbUJsdXJic1Jlc3BvbnNl",
             "ImSC0+STAl4iJS92MWJldGExL3tuYW1lPXJvb21zLyp9L2JsdXJiczpzdHJl",
@@ -180,6 +180,7 @@ static MessagingReflection() {
   /// <summary>
   /// A chat room.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Room : pb::IMessage<Room>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -472,7 +473,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -513,7 +518,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -554,6 +563,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Messaging\CreateRoom
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class CreateRoomRequest : pb::IMessage<CreateRoomRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -715,7 +725,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -737,7 +751,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -759,6 +777,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Messaging\GetRoom
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class GetRoomRequest : pb::IMessage<GetRoomRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -917,7 +936,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -936,7 +959,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -955,6 +982,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Messaging\UpdateRoom
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class UpdateRoomRequest : pb::IMessage<UpdateRoomRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1152,7 +1180,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1181,7 +1213,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1210,6 +1246,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Messaging\DeleteRoom
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class DeleteRoomRequest : pb::IMessage<DeleteRoomRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1368,7 +1405,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1387,7 +1428,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1406,6 +1451,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Messaging\ListRooms
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ListRoomsRequest : pb::IMessage<ListRoomsRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1599,7 +1645,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1622,7 +1672,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1645,6 +1699,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The response message for the google.showcase.v1beta1.Messaging\ListRooms
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ListRoomsResponse : pb::IMessage<ListRoomsResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1827,7 +1882,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1850,7 +1909,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1873,6 +1936,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// This protocol buffer message represents a blurb sent to a chat room or
   /// posted on a user profile.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Blurb : pb::IMessage<Blurb>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -2387,7 +2451,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -2440,7 +2508,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -2493,6 +2565,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Messaging\CreateBlurb
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class CreateBlurbRequest : pb::IMessage<CreateBlurbRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -2687,7 +2760,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -2713,7 +2790,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -2739,6 +2820,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Messaging\GetBlurb
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class GetBlurbRequest : pb::IMessage<GetBlurbRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -2897,7 +2979,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -2916,7 +3002,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -2935,6 +3025,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Messaging\UpdateBlurb
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class UpdateBlurbRequest : pb::IMessage<UpdateBlurbRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3132,7 +3223,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -3161,7 +3256,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -3190,6 +3289,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Messaging\DeleteBlurb
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class DeleteBlurbRequest : pb::IMessage<DeleteBlurbRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3348,7 +3448,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -3367,7 +3471,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -3386,6 +3494,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Messaging\ListBlurbs
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ListBlurbsRequest : pb::IMessage<ListBlurbsRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3612,7 +3721,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -3639,7 +3752,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -3666,6 +3783,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The response message for the google.showcase.v1beta1.Messaging\ListBlurbs
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ListBlurbsResponse : pb::IMessage<ListBlurbsResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3848,7 +3966,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -3871,7 +3993,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -3894,6 +4020,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Messaging\SearchBlurbs
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SearchBlurbsRequest : pb::IMessage<SearchBlurbsRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -4155,7 +4282,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -4186,7 +4317,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -4217,6 +4352,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The operation metadata message for the
   /// google.showcase.v1beta1.Messaging\SearchBlurbs method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SearchBlurbsMetadata : pb::IMessage<SearchBlurbsMetadata>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -4378,7 +4514,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -4400,7 +4540,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -4422,6 +4566,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The operation response message for the
   /// google.showcase.v1beta1.Messaging\SearchBlurbs method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SearchBlurbsResponse : pb::IMessage<SearchBlurbsResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -4604,7 +4749,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -4627,7 +4776,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -4650,6 +4803,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Messaging\StreamBlurbs
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class StreamBlurbsRequest : pb::IMessage<StreamBlurbsRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -4843,7 +4997,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -4869,7 +5027,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -4895,6 +5057,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The response message for the google.showcase.v1beta1.Messaging\StreamBlurbs
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class StreamBlurbsResponse : pb::IMessage<StreamBlurbsResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -5088,7 +5251,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -5114,7 +5281,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -5167,6 +5338,7 @@ public enum Action {
   /// The response message for the google.showcase.v1beta1.Messaging\SendBlurbs
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SendBlurbsResponse : pb::IMessage<SendBlurbsResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -5314,7 +5486,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -5333,7 +5509,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -5352,6 +5532,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// The request message for the google.showcase.v1beta1.Messaging\Connect
   /// method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ConnectRequest : pb::IMessage<ConnectRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -5582,7 +5763,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -5615,7 +5800,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -5647,6 +5836,7 @@ public void MergeFrom(pb::CodedInputStream input) {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
     public static partial class Types {
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class ConnectConfig : pb::IMessage<ConnectConfig>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -5805,7 +5995,11 @@ public void MergeFrom(pb::CodedInputStream input) {
         #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
                 break;
@@ -5824,7 +6018,11 @@ public void MergeFrom(pb::CodedInputStream input) {
         void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
                 break;
diff --git a/Google.Api.Generator.Tests/ProtoTests/Showcase/MessagingGrpc.g.cs b/Google.Api.Generator.Tests/ProtoTests/Showcase/MessagingGrpc.g.cs
index 5a37f164..c6c6977a 100644
--- a/Google.Api.Generator.Tests/ProtoTests/Showcase/MessagingGrpc.g.cs
+++ b/Google.Api.Generator.Tests/ProtoTests/Showcase/MessagingGrpc.g.cs
@@ -17,7 +17,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#pragma warning disable 0414, 1591, 8981
+#pragma warning disable 0414, 1591, 8981, 0612
 #region Designer generated code
 
 using grpc = global::Grpc.Core;
diff --git a/Google.Api.Generator.Tests/ProtoTests/Showcase/Sequence.g.cs b/Google.Api.Generator.Tests/ProtoTests/Showcase/Sequence.g.cs
index 606b0a7b..c3c37456 100644
--- a/Google.Api.Generator.Tests/ProtoTests/Showcase/Sequence.g.cs
+++ b/Google.Api.Generator.Tests/ProtoTests/Showcase/Sequence.g.cs
@@ -47,21 +47,21 @@ static SequenceReflection() {
             "cGlzLmNvbS9TZXF1ZW5jZVJlcG9ydBIjc2VxdWVuY2VzL3tzZXF1ZW5jZX0v",
             "c2VxdWVuY2VSZXBvcnQiTAoVQ3JlYXRlU2VxdWVuY2VSZXF1ZXN0EjMKCHNl",
             "cXVlbmNlGAEgASgLMiEuZ29vZ2xlLnNob3djYXNlLnYxYmV0YTEuU2VxdWVu",
-            "Y2UiUAoWQXR0ZW1wdFNlcXVlbmNlUmVxdWVzdBI2CgRuYW1lGAEgASgJQij6",
-            "QSIKIHNob3djYXNlLmdvb2dsZWFwaXMuY29tL1NlcXVlbmNl4EECIlgKGEdl",
-            "dFNlcXVlbmNlUmVwb3J0UmVxdWVzdBI8CgRuYW1lGAEgASgJQi76QSgKJnNo",
-            "b3djYXNlLmdvb2dsZWFwaXMuY29tL1NlcXVlbmNlUmVwb3J04EECMvQDCg9T",
+            "Y2UiUAoWQXR0ZW1wdFNlcXVlbmNlUmVxdWVzdBI2CgRuYW1lGAEgASgJQijg",
+            "QQL6QSIKIHNob3djYXNlLmdvb2dsZWFwaXMuY29tL1NlcXVlbmNlIlgKGEdl",
+            "dFNlcXVlbmNlUmVwb3J0UmVxdWVzdBI8CgRuYW1lGAEgASgJQi7gQQL6QSgK",
+            "JnNob3djYXNlLmdvb2dsZWFwaXMuY29tL1NlcXVlbmNlUmVwb3J0MvQDCg9T",
             "ZXF1ZW5jZVNlcnZpY2USlAEKDkNyZWF0ZVNlcXVlbmNlEi4uZ29vZ2xlLnNo",
             "b3djYXNlLnYxYmV0YTEuQ3JlYXRlU2VxdWVuY2VSZXF1ZXN0GiEuZ29vZ2xl",
-            "LnNob3djYXNlLnYxYmV0YTEuU2VxdWVuY2UiL4LT5JMCHiISL3YxYmV0YTEv",
-            "c2VxdWVuY2VzOghzZXF1ZW5jZdpBCHNlcXVlbmNlEqoBChFHZXRTZXF1ZW5j",
+            "LnNob3djYXNlLnYxYmV0YTEuU2VxdWVuY2UiL9pBCHNlcXVlbmNlgtPkkwIe",
+            "IhIvdjFiZXRhMS9zZXF1ZW5jZXM6CHNlcXVlbmNlEqoBChFHZXRTZXF1ZW5j",
             "ZVJlcG9ydBIxLmdvb2dsZS5zaG93Y2FzZS52MWJldGExLkdldFNlcXVlbmNl",
             "UmVwb3J0UmVxdWVzdBonLmdvb2dsZS5zaG93Y2FzZS52MWJldGExLlNlcXVl",
-            "bmNlUmVwb3J0IjmC0+STAiwSKi92MWJldGExL3tuYW1lPXNlcXVlbmNlcy8q",
-            "L3NlcXVlbmNlUmVwb3J0fdpBBG5hbWUSiQEKD0F0dGVtcHRTZXF1ZW5jZRIv",
+            "bmNlUmVwb3J0IjnaQQRuYW1lgtPkkwIsEiovdjFiZXRhMS97bmFtZT1zZXF1",
+            "ZW5jZXMvKi9zZXF1ZW5jZVJlcG9ydH0SiQEKD0F0dGVtcHRTZXF1ZW5jZRIv",
             "Lmdvb2dsZS5zaG93Y2FzZS52MWJldGExLkF0dGVtcHRTZXF1ZW5jZVJlcXVl",
-            "c3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiLYLT5JMCICIbL3YxYmV0YTEv",
-            "e25hbWU9c2VxdWVuY2VzLyp9OgEq2kEEbmFtZRoRykEObG9jYWxob3N0Ojc0",
+            "c3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiLdpBBG5hbWWC0+STAiAiGy92",
+            "MWJldGExL3tuYW1lPXNlcXVlbmNlcy8qfToBKhoRykEObG9jYWxob3N0Ojc0",
             "NjlCcQobY29tLmdvb2dsZS5zaG93Y2FzZS52MWJldGExUAFaNGdpdGh1Yi5j",
             "b20vZ29vZ2xlYXBpcy9nYXBpYy1zaG93Y2FzZS9zZXJ2ZXIvZ2VucHJvdG/q",
             "AhlHb29nbGU6OlNob3djYXNlOjpWMWJldGExYgZwcm90bzM="));
@@ -79,6 +79,7 @@ static SequenceReflection() {
 
   }
   #region Messages
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Sequence : pb::IMessage<Sequence>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -256,7 +257,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -279,7 +284,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -304,6 +313,7 @@ public static partial class Types {
       /// <summary>
       /// A server response to an RPC Attempt in a sequence.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Response : pb::IMessage<Response>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -500,7 +510,11 @@ public void MergeFrom(pb::CodedInputStream input) {
         #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
                 break;
@@ -529,7 +543,11 @@ public void MergeFrom(pb::CodedInputStream input) {
         void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
                 break;
@@ -559,6 +577,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SequenceReport : pb::IMessage<SequenceReport>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -735,7 +754,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -758,7 +781,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -783,6 +810,7 @@ public static partial class Types {
       /// <summary>
       /// Contains metrics on individual RPC Attempts in a sequence.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Attempt : pb::IMessage<Attempt>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -1083,7 +1111,11 @@ public void MergeFrom(pb::CodedInputStream input) {
         #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
                 break;
@@ -1130,7 +1162,11 @@ public void MergeFrom(pb::CodedInputStream input) {
         void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
                 break;
@@ -1178,6 +1214,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class CreateSequenceRequest : pb::IMessage<CreateSequenceRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1336,7 +1373,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1358,7 +1399,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1376,6 +1421,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class AttemptSequenceRequest : pb::IMessage<AttemptSequenceRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1531,7 +1577,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1550,7 +1600,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1565,6 +1619,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class GetSequenceReportRequest : pb::IMessage<GetSequenceReportRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1720,7 +1775,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1739,7 +1798,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
diff --git a/Google.Api.Generator.Tests/ProtoTests/Showcase/SequenceGrpc.g.cs b/Google.Api.Generator.Tests/ProtoTests/Showcase/SequenceGrpc.g.cs
index 376f9239..619abbb8 100644
--- a/Google.Api.Generator.Tests/ProtoTests/Showcase/SequenceGrpc.g.cs
+++ b/Google.Api.Generator.Tests/ProtoTests/Showcase/SequenceGrpc.g.cs
@@ -17,12 +17,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#pragma warning disable 0414, 1591, 8981
+#pragma warning disable 0414, 1591, 8981, 0612
 #region Designer generated code
 
 using grpc = global::Grpc.Core;
 
 namespace Google.Showcase.V1Beta1 {
+  /// <summary>
+  /// Sequence service
+  /// </summary>
   public static partial class SequenceService
   {
     static readonly string __ServiceName = "google.showcase.v1beta1.SequenceService";
diff --git a/Google.Api.Generator.Tests/ProtoTests/Showcase/Testing.g.cs b/Google.Api.Generator.Tests/ProtoTests/Showcase/Testing.g.cs
index 0b5b798e..704188a2 100644
--- a/Google.Api.Generator.Tests/ProtoTests/Showcase/Testing.g.cs
+++ b/Google.Api.Generator.Tests/ProtoTests/Showcase/Testing.g.cs
@@ -142,6 +142,7 @@ static TestingReflection() {
   /// A session defines tests it may expect, based on which version of the
   /// code generation spec is in use.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Session : pb::IMessage<Session>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -333,7 +334,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -356,7 +361,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -405,6 +414,7 @@ public enum Version {
   /// <summary>
   /// The request for the CreateSession method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class CreateSessionRequest : pb::IMessage<CreateSessionRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -568,7 +578,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -590,7 +604,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -611,6 +629,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// The request for the GetSession method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class GetSessionRequest : pb::IMessage<GetSessionRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -769,7 +788,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -788,7 +811,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -806,6 +833,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// The request for the ListSessions method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ListSessionsRequest : pb::IMessage<ListSessionsRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -996,7 +1024,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1019,7 +1051,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1041,6 +1077,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Response for the ListSessions method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ListSessionsResponse : pb::IMessage<ListSessionsResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1221,7 +1258,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1244,7 +1285,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1266,6 +1311,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Request for the DeleteSession method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class DeleteSessionRequest : pb::IMessage<DeleteSessionRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1424,7 +1470,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1443,7 +1493,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1461,6 +1515,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Request message for reporting on a session.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ReportSessionRequest : pb::IMessage<ReportSessionRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1619,7 +1674,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1638,7 +1697,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1656,6 +1719,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Response message for reporting on a session.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ReportSessionResponse : pb::IMessage<ReportSessionResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1835,7 +1899,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -1858,7 +1926,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -1904,6 +1976,7 @@ public enum Result {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Test : pb::IMessage<Test>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -2152,7 +2225,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -2183,7 +2260,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -2251,6 +2332,7 @@ public enum ExpectationLevel {
       /// by something more robust like CEL, but as of writing this, I am unsure if CEL
       /// is ready.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Blueprint : pb::IMessage<Blueprint>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -2497,7 +2579,11 @@ public void MergeFrom(pb::CodedInputStream input) {
         #else
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
                 break;
@@ -2531,7 +2617,11 @@ public void MergeFrom(pb::CodedInputStream input) {
         void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
           uint tag;
           while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
+          if ((tag & 7) == 4) {
+            // Abort on any end group tag.
+            return;
+          }
+          switch(tag) {
               default:
                 _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
                 break;
@@ -2567,6 +2657,7 @@ public static partial class Types {
           /// <summary>
           /// A message representing a method invocation.
           /// </summary>
+          [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
           public sealed partial class Invocation : pb::IMessage<Invocation>
           #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
               , pb::IBufferMessage
@@ -2757,7 +2848,11 @@ public void MergeFrom(pb::CodedInputStream input) {
             #else
               uint tag;
               while ((tag = input.ReadTag()) != 0) {
-                switch(tag) {
+              if ((tag & 7) == 4) {
+                // Abort on any end group tag.
+                return;
+              }
+              switch(tag) {
                   default:
                     _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
                     break;
@@ -2780,7 +2875,11 @@ public void MergeFrom(pb::CodedInputStream input) {
             void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
               uint tag;
               while ((tag = input.ReadTag()) != 0) {
-                switch(tag) {
+              if ((tag & 7) == 4) {
+                // Abort on any end group tag.
+                return;
+              }
+              switch(tag) {
                   default:
                     _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
                     break;
@@ -2812,6 +2911,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// An issue found in the test.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Issue : pb::IMessage<Issue>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3034,7 +3134,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -3061,7 +3165,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -3130,6 +3238,7 @@ public enum Severity {
   /// <summary>
   /// The request for the ListTests method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ListTestsRequest : pb::IMessage<ListTestsRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3352,7 +3461,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -3379,7 +3492,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -3405,6 +3522,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// The response for the ListTests method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ListTestsResponse : pb::IMessage<ListTestsResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3585,7 +3703,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -3608,7 +3730,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -3630,6 +3756,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// A TestRun is the result of running a Test.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class TestRun : pb::IMessage<TestRun>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3825,7 +3952,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -3851,7 +3982,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -3876,6 +4011,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Request message for deleting a test.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class DeleteTestRequest : pb::IMessage<DeleteTestRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -4034,7 +4170,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -4053,7 +4193,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -4068,6 +4212,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class VerifyTestRequest : pb::IMessage<VerifyTestRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -4279,7 +4424,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -4306,7 +4455,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
@@ -4329,6 +4482,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class VerifyTestResponse : pb::IMessage<VerifyTestResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -4490,7 +4644,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     #else
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
@@ -4512,7 +4670,11 @@ public void MergeFrom(pb::CodedInputStream input) {
     void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
       uint tag;
       while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
+      if ((tag & 7) == 4) {
+        // Abort on any end group tag.
+        return;
+      }
+      switch(tag) {
           default:
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
             break;
diff --git a/Google.Api.Generator.Tests/ProtoTests/Showcase/TestingGrpc.g.cs b/Google.Api.Generator.Tests/ProtoTests/Showcase/TestingGrpc.g.cs
index 5aaf1fb0..bde2a61b 100644
--- a/Google.Api.Generator.Tests/ProtoTests/Showcase/TestingGrpc.g.cs
+++ b/Google.Api.Generator.Tests/ProtoTests/Showcase/TestingGrpc.g.cs
@@ -17,7 +17,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#pragma warning disable 0414, 1591, 8981
+#pragma warning disable 0414, 1591, 8981, 0612
 #region Designer generated code
 
 using grpc = global::Grpc.Core;
diff --git a/tools/protoc b/tools/protoc
index c25fa73a..a47e3737 100755
Binary files a/tools/protoc and b/tools/protoc differ
diff --git a/tools/protoc.exe b/tools/protoc.exe
index a5229b1d..b7480c8c 100644
Binary files a/tools/protoc.exe and b/tools/protoc.exe differ
diff --git a/tools/protoc_macosx_x64 b/tools/protoc_macosx_x64
index 4a721fde..6e66382d 100755
Binary files a/tools/protoc_macosx_x64 and b/tools/protoc_macosx_x64 differ
diff --git a/tools/protos/google/protobuf/api.proto b/tools/protos/google/protobuf/api.proto
index 42223516..afc9cc15 100644
--- a/tools/protos/google/protobuf/api.proto
+++ b/tools/protos/google/protobuf/api.proto
@@ -166,7 +166,7 @@ message Method {
 // The mixin construct implies that all methods in `AccessControl` are
 // also declared with same name and request/response types in
 // `Storage`. A documentation generator or annotation processor will
-// see the effective `Storage.GetAcl` method after inherting
+// see the effective `Storage.GetAcl` method after inheriting
 // documentation and annotations as follows:
 //
 //     service Storage {
diff --git a/tools/protos/google/protobuf/descriptor.proto b/tools/protos/google/protobuf/descriptor.proto
index dfabac41..0be20ea7 100644
--- a/tools/protos/google/protobuf/descriptor.proto
+++ b/tools/protos/google/protobuf/descriptor.proto
@@ -55,6 +55,13 @@ option optimize_for = SPEED;
 // files it parses.
 message FileDescriptorSet {
   repeated FileDescriptorProto file = 1;
+
+  // Extensions for tooling.
+  extensions 536000000 [declaration = {
+    number: 536000000
+    type: ".buf.descriptor.v1.FileDescriptorSetExtension"
+    full_name: ".buf.descriptor.v1.buf_file_descriptor_set_extension"
+  }];
 }
 
 // The full set of known editions.
@@ -80,7 +87,7 @@ enum Edition {
   EDITION_2024 = 1001;
 
   // Placeholder editions for testing feature resolution.  These should not be
-  // used or relyed on outside of tests.
+  // used or relied on outside of tests.
   EDITION_1_TEST_ONLY = 1;
   EDITION_2_TEST_ONLY = 2;
   EDITION_99997_TEST_ONLY = 99997;
@@ -106,6 +113,10 @@ message FileDescriptorProto {
   // For Google-internal migration only. Do not use.
   repeated int32 weak_dependency = 11;
 
+  // Names of files imported by this file purely for the purpose of providing
+  // option extensions. These are excluded from the dependency list above.
+  repeated string option_dependency = 15;
+
   // All top-level definitions in this file.
   repeated DescriptorProto message_type = 4;
   repeated EnumDescriptorProto enum_type = 5;
@@ -124,9 +135,15 @@ message FileDescriptorProto {
   // The supported values are "proto2", "proto3", and "editions".
   //
   // If `edition` is present, this value must be "editions".
+  // WARNING: This field should only be used by protobuf plugins or special
+  // cases like the proto compiler. Other uses are discouraged and
+  // developers should rely on the protoreflect APIs for their client language.
   optional string syntax = 12;
 
   // The edition of the proto file.
+  // WARNING: This field should only be used by protobuf plugins or special
+  // cases like the proto compiler. Other uses are discouraged and
+  // developers should rely on the protoreflect APIs for their client language.
   optional Edition edition = 14;
 }
 
@@ -163,6 +180,9 @@ message DescriptorProto {
   // Reserved field names, which may not be used by fields in the same message.
   // A given name may only be reserved once.
   repeated string reserved_name = 10;
+
+  // Support for `export` and `local` keywords on enums.
+  optional SymbolVisibility visibility = 11;
 }
 
 message ExtensionRangeOptions {
@@ -359,6 +379,9 @@ message EnumDescriptorProto {
   // Reserved enum value names, which may not be reused. A given name may only
   // be reserved once.
   repeated string reserved_name = 5;
+
+  // Support for `export` and `local` keywords on enums.
+  optional SymbolVisibility visibility = 6;
 }
 
 // Describes a value within an enum.
@@ -539,6 +562,9 @@ message FileOptions {
   optional string ruby_package = 45;
 
   // Any features defined in the specific edition.
+  // WARNING: This field should only be used by protobuf plugins or special
+  // cases like the proto compiler. Other uses are discouraged and
+  // developers should rely on the protoreflect APIs for their client language.
   optional FeatureSet features = 50;
 
   // The parser stores options it doesn't recognize here.
@@ -625,6 +651,9 @@ message MessageOptions {
   optional bool deprecated_legacy_json_field_conflicts = 11 [deprecated = true];
 
   // Any features defined in the specific edition.
+  // WARNING: This field should only be used by protobuf plugins or special
+  // cases like the proto compiler. Other uses are discouraged and
+  // developers should rely on the protoreflect APIs for their client language.
   optional FeatureSet features = 12;
 
   // The parser stores options it doesn't recognize here. See above.
@@ -732,8 +761,6 @@ message FieldOptions {
   optional bool debug_redact = 16 [default = false];
 
   // If set to RETENTION_SOURCE, the option will be omitted from the binary.
-  // Note: as of January 2023, support for this is in progress and does not yet
-  // have an effect (b/264593489).
   enum OptionRetention {
     RETENTION_UNKNOWN = 0;
     RETENTION_RUNTIME = 1;
@@ -744,8 +771,7 @@ message FieldOptions {
 
   // This indicates the types of entities that the field may apply to when used
   // as an option. If it is unset, then the field may be freely used as an
-  // option on any kind of entity. Note: as of January 2023, support for this is
-  // in progress and does not yet have an effect (b/264593489).
+  // option on any kind of entity.
   enum OptionTargetType {
     TARGET_TYPE_UNKNOWN = 0;
     TARGET_TYPE_FILE = 1;
@@ -768,6 +794,9 @@ message FieldOptions {
   repeated EditionDefault edition_defaults = 20;
 
   // Any features defined in the specific edition.
+  // WARNING: This field should only be used by protobuf plugins or special
+  // cases like the proto compiler. Other uses are discouraged and
+  // developers should rely on the protoreflect APIs for their client language.
   optional FeatureSet features = 21;
 
   // Information about the support window of a feature.
@@ -804,6 +833,9 @@ message FieldOptions {
 
 message OneofOptions {
   // Any features defined in the specific edition.
+  // WARNING: This field should only be used by protobuf plugins or special
+  // cases like the proto compiler. Other uses are discouraged and
+  // developers should rely on the protoreflect APIs for their client language.
   optional FeatureSet features = 1;
 
   // The parser stores options it doesn't recognize here. See above.
@@ -836,6 +868,9 @@ message EnumOptions {
   optional bool deprecated_legacy_json_field_conflicts = 6 [deprecated = true];
 
   // Any features defined in the specific edition.
+  // WARNING: This field should only be used by protobuf plugins or special
+  // cases like the proto compiler. Other uses are discouraged and
+  // developers should rely on the protoreflect APIs for their client language.
   optional FeatureSet features = 7;
 
   // The parser stores options it doesn't recognize here. See above.
@@ -853,6 +888,9 @@ message EnumValueOptions {
   optional bool deprecated = 1 [default = false];
 
   // Any features defined in the specific edition.
+  // WARNING: This field should only be used by protobuf plugins or special
+  // cases like the proto compiler. Other uses are discouraged and
+  // developers should rely on the protoreflect APIs for their client language.
   optional FeatureSet features = 2;
 
   // Indicate that fields annotated with this enum value should not be printed
@@ -873,6 +911,9 @@ message EnumValueOptions {
 message ServiceOptions {
 
   // Any features defined in the specific edition.
+  // WARNING: This field should only be used by protobuf plugins or special
+  // cases like the proto compiler. Other uses are discouraged and
+  // developers should rely on the protoreflect APIs for their client language.
   optional FeatureSet features = 34;
 
   // Note:  Field numbers 1 through 32 are reserved for Google's internal RPC
@@ -918,6 +959,9 @@ message MethodOptions {
       [default = IDEMPOTENCY_UNKNOWN];
 
   // Any features defined in the specific edition.
+  // WARNING: This field should only be used by protobuf plugins or special
+  // cases like the proto compiler. Other uses are discouraged and
+  // developers should rely on the protoreflect APIs for their client language.
   optional FeatureSet features = 35;
 
   // The parser stores options it doesn't recognize here. See above.
@@ -1064,6 +1108,60 @@ message FeatureSet {
     edition_defaults = { edition: EDITION_PROTO3, value: "ALLOW" }
   ];
 
+  enum EnforceNamingStyle {
+    ENFORCE_NAMING_STYLE_UNKNOWN = 0;
+    STYLE2024 = 1;
+    STYLE_LEGACY = 2;
+  }
+  optional EnforceNamingStyle enforce_naming_style = 7 [
+    retention = RETENTION_SOURCE,
+    targets = TARGET_TYPE_FILE,
+    targets = TARGET_TYPE_EXTENSION_RANGE,
+    targets = TARGET_TYPE_MESSAGE,
+    targets = TARGET_TYPE_FIELD,
+    targets = TARGET_TYPE_ONEOF,
+    targets = TARGET_TYPE_ENUM,
+    targets = TARGET_TYPE_ENUM_ENTRY,
+    targets = TARGET_TYPE_SERVICE,
+    targets = TARGET_TYPE_METHOD,
+    feature_support = {
+      edition_introduced: EDITION_2024,
+    },
+    edition_defaults = { edition: EDITION_LEGACY, value: "STYLE_LEGACY" },
+    edition_defaults = { edition: EDITION_2024, value: "STYLE2024" }
+  ];
+
+  message VisibilityFeature {
+    enum DefaultSymbolVisibility {
+      DEFAULT_SYMBOL_VISIBILITY_UNKNOWN = 0;
+
+      // Default pre-EDITION_2024, all UNSET visibility are export.
+      EXPORT_ALL = 1;
+
+      // All top-level symbols default to export, nested default to local.
+      EXPORT_TOP_LEVEL = 2;
+
+      // All symbols default to local.
+      LOCAL_ALL = 3;
+
+      // All symbols local by default. Nested types cannot be exported.
+      // With special case caveat for message { enum {} reserved 1 to max; }
+      // This is the recommended setting for new protos.
+      STRICT = 4;
+    }
+    reserved 1 to max;
+  }
+  optional VisibilityFeature.DefaultSymbolVisibility default_symbol_visibility =
+      8 [
+        retention = RETENTION_SOURCE,
+        targets = TARGET_TYPE_FILE,
+        feature_support = {
+          edition_introduced: EDITION_2024,
+        },
+        edition_defaults = { edition: EDITION_LEGACY, value: "EXPORT_ALL" },
+        edition_defaults = { edition: EDITION_2024, value: "EXPORT_TOP_LEVEL" }
+      ];
+
   reserved 999;
 
   extensions 1000 to 9994 [
@@ -1078,6 +1176,11 @@ message FeatureSet {
       type: ".pb.JavaFeatures"
     },
     declaration = { number: 1002, full_name: ".pb.go", type: ".pb.GoFeatures" },
+    declaration = {
+      number: 1003,
+      full_name: ".pb.python",
+      type: ".pb.PythonFeatures"
+    },
     declaration = {
       number: 9990,
       full_name: ".pb.proto1",
@@ -1255,6 +1358,13 @@ message SourceCodeInfo {
     optional string trailing_comments = 4;
     repeated string leading_detached_comments = 6;
   }
+
+  // Extensions for tooling.
+  extensions 536000000 [declaration = {
+    number: 536000000
+    type: ".buf.descriptor.v1.SourceCodeInfoExtension"
+    full_name: ".buf.descriptor.v1.buf_source_code_info_extension"
+  }];
 }
 
 // Describes the relationship between generated code and its original source
@@ -1294,3 +1404,14 @@ message GeneratedCodeInfo {
     optional Semantic semantic = 5;
   }
 }
+
+// Describes the 'visibility' of a symbol with respect to the proto import
+// system. Symbols can only be imported when the visibility rules do not prevent
+// it (ex: local symbols cannot be imported).  Visibility modifiers can only set
+// on `message` and `enum` as they are the only types available to be referenced
+// from other files.
+enum SymbolVisibility {
+  VISIBILITY_UNSET = 0;
+  VISIBILITY_LOCAL = 1;
+  VISIBILITY_EXPORT = 2;
+}
diff --git a/tools/protos/google/protobuf/wrappers.proto b/tools/protos/google/protobuf/wrappers.proto
index 1959fa55..e583e7c4 100644
--- a/tools/protos/google/protobuf/wrappers.proto
+++ b/tools/protos/google/protobuf/wrappers.proto
@@ -28,10 +28,17 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
-// Wrappers for primitive (non-message) types. These types are useful
-// for embedding primitives in the `google.protobuf.Any` type and for places
-// where we need to distinguish between the absence of a primitive
-// typed field and its default value.
+// Wrappers for primitive (non-message) types. These types were needed
+// for legacy reasons and are not recommended for use in new APIs.
+//
+// Historically these wrappers were useful to have presence on proto3 primitive
+// fields, but proto3 syntax has been updated to support the `optional` keyword.
+// Using that keyword is now the strongly preferred way to add presence to
+// proto3 primitive fields.
+//
+// A secondary usecase was to embed primitives in the `google.protobuf.Any`
+// type: it is now recommended that you embed your value in your own wrapper
+// message which can be specifically documented.
 //
 // These wrappers have no meaningful use within repeated fields as they lack
 // the ability to detect presence on individual elements.
@@ -53,6 +60,9 @@ option csharp_namespace = "Google.Protobuf.WellKnownTypes";
 // Wrapper message for `double`.
 //
 // The JSON representation for `DoubleValue` is JSON number.
+//
+// Not recommended for use in new APIs, but still useful for legacy APIs and
+// has no plan to be removed.
 message DoubleValue {
   // The double value.
   double value = 1;
@@ -61,6 +71,9 @@ message DoubleValue {
 // Wrapper message for `float`.
 //
 // The JSON representation for `FloatValue` is JSON number.
+//
+// Not recommended for use in new APIs, but still useful for legacy APIs and
+// has no plan to be removed.
 message FloatValue {
   // The float value.
   float value = 1;
@@ -69,6 +82,9 @@ message FloatValue {
 // Wrapper message for `int64`.
 //
 // The JSON representation for `Int64Value` is JSON string.
+//
+// Not recommended for use in new APIs, but still useful for legacy APIs and
+// has no plan to be removed.
 message Int64Value {
   // The int64 value.
   int64 value = 1;
@@ -77,6 +93,9 @@ message Int64Value {
 // Wrapper message for `uint64`.
 //
 // The JSON representation for `UInt64Value` is JSON string.
+//
+// Not recommended for use in new APIs, but still useful for legacy APIs and
+// has no plan to be removed.
 message UInt64Value {
   // The uint64 value.
   uint64 value = 1;
@@ -85,6 +104,9 @@ message UInt64Value {
 // Wrapper message for `int32`.
 //
 // The JSON representation for `Int32Value` is JSON number.
+//
+// Not recommended for use in new APIs, but still useful for legacy APIs and
+// has no plan to be removed.
 message Int32Value {
   // The int32 value.
   int32 value = 1;
@@ -93,6 +115,9 @@ message Int32Value {
 // Wrapper message for `uint32`.
 //
 // The JSON representation for `UInt32Value` is JSON number.
+//
+// Not recommended for use in new APIs, but still useful for legacy APIs and
+// has no plan to be removed.
 message UInt32Value {
   // The uint32 value.
   uint32 value = 1;
@@ -101,6 +126,9 @@ message UInt32Value {
 // Wrapper message for `bool`.
 //
 // The JSON representation for `BoolValue` is JSON `true` and `false`.
+//
+// Not recommended for use in new APIs, but still useful for legacy APIs and
+// has no plan to be removed.
 message BoolValue {
   // The bool value.
   bool value = 1;
@@ -109,6 +137,9 @@ message BoolValue {
 // Wrapper message for `string`.
 //
 // The JSON representation for `StringValue` is JSON string.
+//
+// Not recommended for use in new APIs, but still useful for legacy APIs and
+// has no plan to be removed.
 message StringValue {
   // The string value.
   string value = 1;
@@ -117,6 +148,9 @@ message StringValue {
 // Wrapper message for `bytes`.
 //
 // The JSON representation for `BytesValue` is JSON string.
+//
+// Not recommended for use in new APIs, but still useful for legacy APIs and
+// has no plan to be removed.
 message BytesValue {
   // The bytes value.
   bytes value = 1;