diff --git a/Google.Api.CommonProtos/Api/Auth.g.cs b/Google.Api.CommonProtos/Api/Auth.g.cs
index d031b9ca..166a0640 100644
--- a/Google.Api.CommonProtos/Api/Auth.g.cs
+++ b/Google.Api.CommonProtos/Api/Auth.g.cs
@@ -84,6 +84,7 @@ static AuthReflection() {
   ///         oauth:
   ///           canonical_scopes: https://www.googleapis.com/auth/calendar.read
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Authentication : pb::IMessage<Authentication>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -307,6 +308,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// If a method doesn't have any auth requirements, request credentials will be
   /// ignored.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class AuthenticationRule : pb::IMessage<AuthenticationRule>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -624,6 +626,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Specifies a location to extract JWT from an API request.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class JwtLocation : pb::IMessage<JwtLocation>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1026,6 +1029,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// [JSON Web Token
   /// (JWT)](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32).
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class AuthProvider : pb::IMessage<AuthProvider>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1480,6 +1484,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// request to be accepted and passed to the backend, a request can still fail
   /// due to the backend requiring additional scopes or permissions.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class OAuthRequirements : pb::IMessage<OAuthRequirements>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1683,6 +1688,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// [JSON Web Token
   /// (JWT)](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32).
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class AuthRequirement : pb::IMessage<AuthRequirement>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Backend.g.cs b/Google.Api.CommonProtos/Api/Backend.g.cs
index dc05f1a5..02ca4e8b 100644
--- a/Google.Api.CommonProtos/Api/Backend.g.cs
+++ b/Google.Api.CommonProtos/Api/Backend.g.cs
@@ -63,6 +63,7 @@ static BackendReflection() {
   /// <summary>
   /// `Backend` defines the backend configuration for a service.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Backend : pb::IMessage<Backend>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -249,6 +250,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// A backend rule provides configuration for an individual API element.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class BackendRule : pb::IMessage<BackendRule>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Billing.g.cs b/Google.Api.CommonProtos/Api/Billing.g.cs
index 216e5e54..d75cc3be 100644
--- a/Google.Api.CommonProtos/Api/Billing.g.cs
+++ b/Google.Api.CommonProtos/Api/Billing.g.cs
@@ -81,6 +81,7 @@ static BillingReflection() {
   ///         metrics:
   ///         - library.googleapis.com/book/borrowed_count
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Billing : pb::IMessage<Billing>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -272,6 +273,7 @@ public static partial class Types {
       /// Configuration of a specific billing destination (Currently only support
       /// bill against consumer project).
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class BillingDestination : pb::IMessage<BillingDestination>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Client.g.cs b/Google.Api.CommonProtos/Api/Client.g.cs
index 3bac155e..cd454726 100644
--- a/Google.Api.CommonProtos/Api/Client.g.cs
+++ b/Google.Api.CommonProtos/Api/Client.g.cs
@@ -266,6 +266,7 @@ public enum ClientLibraryDestination {
   /// <summary>
   /// Required information for every language.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class CommonLanguageSettings : pb::IMessage<CommonLanguageSettings>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -494,6 +495,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Details about how and where to publish client libraries.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ClientLibrarySettings : pb::IMessage<ClientLibrarySettings>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1166,6 +1168,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// libraries](https://cloud.google.com/apis/docs/cloud-client-libraries)
   /// generated from the service config.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Publishing : pb::IMessage<Publishing>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1698,6 +1701,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Settings for Java client libraries.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class JavaSettings : pb::IMessage<JavaSettings>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1994,6 +1998,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Settings for C++ client libraries.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class CppSettings : pb::IMessage<CppSettings>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -2198,6 +2203,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Settings for Php client libraries.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class PhpSettings : pb::IMessage<PhpSettings>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -2402,6 +2408,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Settings for Python client libraries.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class PythonSettings : pb::IMessage<PythonSettings>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -2606,6 +2613,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Settings for Node client libraries.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class NodeSettings : pb::IMessage<NodeSettings>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -2810,6 +2818,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Settings for Dotnet client libraries.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class DotnetSettings : pb::IMessage<DotnetSettings>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3174,6 +3183,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Settings for Ruby client libraries.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class RubySettings : pb::IMessage<RubySettings>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3378,6 +3388,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Settings for Go client libraries.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class GoSettings : pb::IMessage<GoSettings>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3582,6 +3593,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Describes the generator configuration for a method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class MethodSettings : pb::IMessage<MethodSettings>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3850,6 +3862,7 @@ public static partial class Types {
       /// generators (e.g.
       /// [Java](https://github.com/googleapis/gapic-generator-java/blob/04c2faa191a9b5a10b92392fe8482279c4404803/src/main/java/com/google/api/generator/gapic/composer/common/RetrySettingsComposer.java)).
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class LongRunning : pb::IMessage<LongRunning>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/ConfigChange.g.cs b/Google.Api.CommonProtos/Api/ConfigChange.g.cs
index b87eb78a..a7b4d0fa 100644
--- a/Google.Api.CommonProtos/Api/ConfigChange.g.cs
+++ b/Google.Api.CommonProtos/Api/ConfigChange.g.cs
@@ -89,6 +89,7 @@ public enum ChangeType {
   /// applicable advice about potential consequences for the change, such as
   /// backwards-incompatibility.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ConfigChange : pb::IMessage<ConfigChange>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -445,6 +446,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// Generated advice about this change, used for providing more
   /// information about how a change will affect the existing service.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Advice : pb::IMessage<Advice>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Consumer.g.cs b/Google.Api.CommonProtos/Api/Consumer.g.cs
index 2369d863..3d2c1e4a 100644
--- a/Google.Api.CommonProtos/Api/Consumer.g.cs
+++ b/Google.Api.CommonProtos/Api/Consumer.g.cs
@@ -69,6 +69,7 @@ static ConsumerReflection() {
   ///      - name: EXTENDED_TILE_CACHE_PERIOD
   ///        type: INT64
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ProjectProperties : pb::IMessage<ProjectProperties>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -262,6 +263,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// These values can be set via API producer console. Only API providers can
   /// define and set these properties.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Property : pb::IMessage<Property>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Context.g.cs b/Google.Api.CommonProtos/Api/Context.g.cs
index d5c59646..015910cc 100644
--- a/Google.Api.CommonProtos/Api/Context.g.cs
+++ b/Google.Api.CommonProtos/Api/Context.g.cs
@@ -88,6 +88,7 @@ static ContextReflection() {
   /// You can also specify extension ID instead of fully qualified extension name
   /// here.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Context : pb::IMessage<Context>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -275,6 +276,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// A context rule provides information about the context for an individual API
   /// element.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ContextRule : pb::IMessage<ContextRule>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Control.g.cs b/Google.Api.CommonProtos/Api/Control.g.cs
index 0b4c420e..8da8ea36 100644
--- a/Google.Api.CommonProtos/Api/Control.g.cs
+++ b/Google.Api.CommonProtos/Api/Control.g.cs
@@ -55,6 +55,7 @@ static ControlReflection() {
   ///     control:
   ///       environment: servicecontrol.googleapis.com
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Control : pb::IMessage<Control>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Distribution.g.cs b/Google.Api.CommonProtos/Api/Distribution.g.cs
index c981f2d4..0e496d26 100644
--- a/Google.Api.CommonProtos/Api/Distribution.g.cs
+++ b/Google.Api.CommonProtos/Api/Distribution.g.cs
@@ -86,6 +86,7 @@ static DistributionReflection() {
   /// non-finite values (infinities or NaNs) in the population of values, as this
   /// will render the `mean` and `sum_of_squared_deviation` fields meaningless.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Distribution : pb::IMessage<Distribution>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -549,6 +550,7 @@ public static partial class Types {
       /// <summary>
       /// The range of the population values.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Range : pb::IMessage<Range>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -798,6 +800,7 @@ public void MergeFrom(pb::CodedInputStream input) {
       /// upper bound of the overflow bucket is +infinity. The finite buckets are
       /// so-called because both bounds are finite.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class BucketOptions : pb::IMessage<BucketOptions>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -1160,6 +1163,7 @@ public static partial class Types {
           ///
           ///    Lower bound (1 &lt;= i &lt; N):       offset + (width * (i - 1)).
           /// </summary>
+          [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
           public sealed partial class Linear : pb::IMessage<Linear>
           #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
               , pb::IBufferMessage
@@ -1444,6 +1448,7 @@ public void MergeFrom(pb::CodedInputStream input) {
           ///
           ///    Lower bound (1 &lt;= i &lt; N):       scale * (growth_factor ^ (i - 1)).
           /// </summary>
+          [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
           public sealed partial class Exponential : pb::IMessage<Exponential>
           #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
               , pb::IBufferMessage
@@ -1729,6 +1734,7 @@ public void MergeFrom(pb::CodedInputStream input) {
           /// only one element, then there are no finite buckets, and that single
           /// element is the common boundary of the overflow and underflow buckets.
           /// </summary>
+          [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
           public sealed partial class Explicit : pb::IMessage<Explicit>
           #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
               , pb::IBufferMessage
@@ -1924,6 +1930,7 @@ public void MergeFrom(pb::CodedInputStream input) {
       /// was active when a value was added. They may contain further information,
       /// such as a example values and timestamps, origin, etc.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Exemplar : pb::IMessage<Exemplar>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Documentation.g.cs b/Google.Api.CommonProtos/Api/Documentation.g.cs
index b1baddd8..04a1b105 100644
--- a/Google.Api.CommonProtos/Api/Documentation.g.cs
+++ b/Google.Api.CommonProtos/Api/Documentation.g.cs
@@ -112,6 +112,7 @@ static DocumentationReflection() {
   /// The directive `suppress_warning` does not directly affect documentation
   /// and is documented together with service config validation.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Documentation : pb::IMessage<Documentation>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -505,6 +506,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// A documentation rule provides information about individual API elements.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class DocumentationRule : pb::IMessage<DocumentationRule>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -790,6 +792,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// Represents a documentation page. A page can contain subpages to represent
   /// nested documentation set structure.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Page : pb::IMessage<Page>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Endpoint.g.cs b/Google.Api.CommonProtos/Api/Endpoint.g.cs
index 7a8c9e3b..e7f58472 100644
--- a/Google.Api.CommonProtos/Api/Endpoint.g.cs
+++ b/Google.Api.CommonProtos/Api/Endpoint.g.cs
@@ -70,6 +70,7 @@ static EndpointReflection() {
   ///       # to proceed.
   ///       allow_cors: true
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Endpoint : pb::IMessage<Endpoint>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/FieldInfo.g.cs b/Google.Api.CommonProtos/Api/FieldInfo.g.cs
index 1e45662c..c4b4512a 100644
--- a/Google.Api.CommonProtos/Api/FieldInfo.g.cs
+++ b/Google.Api.CommonProtos/Api/FieldInfo.g.cs
@@ -72,6 +72,7 @@ public static partial class FieldInfoExtensions {
   /// <summary>
   /// Rich semantic information of an API field beyond basic typing.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class FieldInfo : pb::IMessage<FieldInfo>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Http.g.cs b/Google.Api.CommonProtos/Api/Http.g.cs
index 8512c139..bb82e51e 100644
--- a/Google.Api.CommonProtos/Api/Http.g.cs
+++ b/Google.Api.CommonProtos/Api/Http.g.cs
@@ -61,6 +61,7 @@ static HttpReflection() {
   /// [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method
   /// to one or more HTTP REST API methods.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Http : pb::IMessage<Http>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -562,6 +563,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// the request or response body to a repeated field. However, some gRPC
   /// Transcoding implementations may not support this feature.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class HttpRule : pb::IMessage<HttpRule>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1253,6 +1255,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// A custom pattern is used for defining custom HTTP verb.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class CustomHttpPattern : pb::IMessage<CustomHttpPattern>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Httpbody.g.cs b/Google.Api.CommonProtos/Api/Httpbody.g.cs
index e002a750..4828c6fc 100644
--- a/Google.Api.CommonProtos/Api/Httpbody.g.cs
+++ b/Google.Api.CommonProtos/Api/Httpbody.g.cs
@@ -91,6 +91,7 @@ static HttpbodyReflection() {
   /// Use of this type only changes how the request and response bodies are
   /// handled, all other features will continue to work unchanged.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class HttpBody : pb::IMessage<HttpBody>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Label.g.cs b/Google.Api.CommonProtos/Api/Label.g.cs
index 2ead9700..0441c722 100644
--- a/Google.Api.CommonProtos/Api/Label.g.cs
+++ b/Google.Api.CommonProtos/Api/Label.g.cs
@@ -51,6 +51,7 @@ static LabelReflection() {
   /// <summary>
   /// A description of a label.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class LabelDescriptor : pb::IMessage<LabelDescriptor>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Log.g.cs b/Google.Api.CommonProtos/Api/Log.g.cs
index 1810c15c..aff88ab4 100644
--- a/Google.Api.CommonProtos/Api/Log.g.cs
+++ b/Google.Api.CommonProtos/Api/Log.g.cs
@@ -58,6 +58,7 @@ static LogReflection() {
   ///       - key: /customer_id
   ///         description: Identifier of a library customer
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class LogDescriptor : pb::IMessage<LogDescriptor>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Logging.g.cs b/Google.Api.CommonProtos/Api/Logging.g.cs
index 5862229c..4cdbedbb 100644
--- a/Google.Api.CommonProtos/Api/Logging.g.cs
+++ b/Google.Api.CommonProtos/Api/Logging.g.cs
@@ -81,6 +81,7 @@ static LoggingReflection() {
   ///         logs:
   ///         - activity_history
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Logging : pb::IMessage<Logging>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -304,6 +305,7 @@ public static partial class Types {
       /// Configuration of a specific logging destination (the producer project
       /// or the consumer project).
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class LoggingDestination : pb::IMessage<LoggingDestination>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Metric.g.cs b/Google.Api.CommonProtos/Api/Metric.g.cs
index 5521f135..dcd094a4 100644
--- a/Google.Api.CommonProtos/Api/Metric.g.cs
+++ b/Google.Api.CommonProtos/Api/Metric.g.cs
@@ -73,6 +73,7 @@ static MetricReflection() {
   /// deleting or altering it stops data collection and makes the metric type's
   /// existing data unusable.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class MetricDescriptor : pb::IMessage<MetricDescriptor>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -845,6 +846,7 @@ public enum ValueType {
       /// <summary>
       /// Additional annotations that can be used to guide the usage of a metric.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class MetricDescriptorMetadata : pb::IMessage<MetricDescriptorMetadata>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -1152,6 +1154,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// A specific metric, identified by specifying values for all of the
   /// labels of a [`MetricDescriptor`][google.api.MetricDescriptor].
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Metric : pb::IMessage<Metric>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/MonitoredResource.g.cs b/Google.Api.CommonProtos/Api/MonitoredResource.g.cs
index 779438fc..04c1f0bb 100644
--- a/Google.Api.CommonProtos/Api/MonitoredResource.g.cs
+++ b/Google.Api.CommonProtos/Api/MonitoredResource.g.cs
@@ -73,6 +73,7 @@ static MonitoredResourceReflection() {
   /// provide a `list` method that returns the monitored resource descriptors used
   /// by the API.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class MonitoredResourceDescriptor : pb::IMessage<MonitoredResourceDescriptor>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -488,6 +489,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   ///                   "instance_id": "12345678901234",
   ///                   "zone": "us-central1-a" }}
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class MonitoredResource : pb::IMessage<MonitoredResource>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -725,6 +727,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// Logging use an ingestion pipeline to extract metadata for cloud resources of
   /// all types, and store the metadata in this message.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class MonitoredResourceMetadata : pb::IMessage<MonitoredResourceMetadata>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Monitoring.g.cs b/Google.Api.CommonProtos/Api/Monitoring.g.cs
index 9386c071..967e3649 100644
--- a/Google.Api.CommonProtos/Api/Monitoring.g.cs
+++ b/Google.Api.CommonProtos/Api/Monitoring.g.cs
@@ -104,6 +104,7 @@ static MonitoringReflection() {
   ///         - library.googleapis.com/book/returned_count
   ///         - library.googleapis.com/book/num_overdue
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Monitoring : pb::IMessage<Monitoring>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -331,6 +332,7 @@ public static partial class Types {
       /// Configuration of a specific monitoring destination (the producer project
       /// or the consumer project).
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class MonitoringDestination : pb::IMessage<MonitoringDestination>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Policy.g.cs b/Google.Api.CommonProtos/Api/Policy.g.cs
index e8757e64..fa6857e0 100644
--- a/Google.Api.CommonProtos/Api/Policy.g.cs
+++ b/Google.Api.CommonProtos/Api/Policy.g.cs
@@ -78,6 +78,7 @@ public static partial class PolicyExtensions {
   /// generate the overall policy that will be used for automatic runtime
   /// policy enforcement and documentation generation.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class FieldPolicy : pb::IMessage<FieldPolicy>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -365,6 +366,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Defines policies applying to an RPC method.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class MethodPolicy : pb::IMessage<MethodPolicy>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Quota.g.cs b/Google.Api.CommonProtos/Api/Quota.g.cs
index 491371f3..ec42824c 100644
--- a/Google.Api.CommonProtos/Api/Quota.g.cs
+++ b/Google.Api.CommonProtos/Api/Quota.g.cs
@@ -109,6 +109,7 @@ static QuotaReflection() {
   ///        metric_kind: DELTA
   ///        value_type: INT64
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Quota : pb::IMessage<Quota>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -324,6 +325,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// Bind API methods to metrics. Binding a method to a metric causes that
   /// metric's configured quota behaviors to apply to the method call.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class MetricRule : pb::IMessage<MetricRule>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -558,6 +560,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// for a limit type. There can be at most one limit for a duration and limit
   /// type combination defined within a `QuotaGroup`.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class QuotaLimit : pb::IMessage<QuotaLimit>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Resource.g.cs b/Google.Api.CommonProtos/Api/Resource.g.cs
index 8039fa88..10f3cea6 100644
--- a/Google.Api.CommonProtos/Api/Resource.g.cs
+++ b/Google.Api.CommonProtos/Api/Resource.g.cs
@@ -133,6 +133,7 @@ public static partial class ResourceExtensions {
   ///       pattern: "organizations/{organization}/logs/{log}"
   ///       pattern: "billingAccounts/{billing_account}/logs/{log}"
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ResourceDescriptor : pb::IMessage<ResourceDescriptor>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -653,6 +654,7 @@ public enum Style {
   /// Defines a proto annotation that describes a string field that refers to
   /// an API resource.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ResourceReference : pb::IMessage<ResourceReference>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Routing.g.cs b/Google.Api.CommonProtos/Api/Routing.g.cs
index b0e3feea..eec68c86 100644
--- a/Google.Api.CommonProtos/Api/Routing.g.cs
+++ b/Google.Api.CommonProtos/Api/Routing.g.cs
@@ -421,6 +421,7 @@ public static partial class RoutingExtensions {
   ///     x-goog-request-params:
   ///     table_location=instances/instance_bar&amp;routing_id=prof_qux
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class RoutingRule : pb::IMessage<RoutingRule>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -610,6 +611,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// A projection from an input message to the GRPC or REST header.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class RoutingParameter : pb::IMessage<RoutingParameter>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Service.g.cs b/Google.Api.CommonProtos/Api/Service.g.cs
index e29b337c..9c55f562 100644
--- a/Google.Api.CommonProtos/Api/Service.g.cs
+++ b/Google.Api.CommonProtos/Api/Service.g.cs
@@ -116,6 +116,7 @@ static ServiceReflection() {
   ///         requirements:
   ///           provider_id: google_calendar_auth
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Service : pb::IMessage<Service>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/SourceInfo.g.cs b/Google.Api.CommonProtos/Api/SourceInfo.g.cs
index 50e21e08..4316ed61 100644
--- a/Google.Api.CommonProtos/Api/SourceInfo.g.cs
+++ b/Google.Api.CommonProtos/Api/SourceInfo.g.cs
@@ -50,6 +50,7 @@ static SourceInfoReflection() {
   /// <summary>
   /// Source information used to create a Service Config
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SourceInfo : pb::IMessage<SourceInfo>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/SystemParameter.g.cs b/Google.Api.CommonProtos/Api/SystemParameter.g.cs
index 7b4d36bb..197dbc7b 100644
--- a/Google.Api.CommonProtos/Api/SystemParameter.g.cs
+++ b/Google.Api.CommonProtos/Api/SystemParameter.g.cs
@@ -61,6 +61,7 @@ static SystemParameterReflection() {
   /// and/or a URL query parameter. This configuration specifies which methods
   /// change the names of the system parameters.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SystemParameters : pb::IMessage<SystemParameters>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -273,6 +274,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// Define a system parameter rule mapping system parameter definitions to
   /// methods.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SystemParameterRule : pb::IMessage<SystemParameterRule>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -507,6 +509,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// an HTTP header or a URL query parameter, and if both are passed the behavior
   /// is implementation-dependent.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SystemParameter : pb::IMessage<SystemParameter>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Usage.g.cs b/Google.Api.CommonProtos/Api/Usage.g.cs
index 7eec5993..647827a1 100644
--- a/Google.Api.CommonProtos/Api/Usage.g.cs
+++ b/Google.Api.CommonProtos/Api/Usage.g.cs
@@ -53,6 +53,7 @@ static UsageReflection() {
   /// <summary>
   /// Configuration controlling usage of a service.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Usage : pb::IMessage<Usage>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -346,6 +347,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   ///       - selector: "google.example.library.v1.LibraryService.CreateBook"
   ///         allow_unregistered_calls: true
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class UsageRule : pb::IMessage<UsageRule>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Api/Visibility.g.cs b/Google.Api.CommonProtos/Api/Visibility.g.cs
index 60066a02..86aa3502 100644
--- a/Google.Api.CommonProtos/Api/Visibility.g.cs
+++ b/Google.Api.CommonProtos/Api/Visibility.g.cs
@@ -120,6 +120,7 @@ public static partial class VisibilityExtensions {
   /// Here, all methods are publicly visible except for the restricted methods
   /// EnhancedSearch and Delegate.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Visibility : pb::IMessage<Visibility>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -307,6 +308,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// A visibility rule provides visibility configuration for an individual API
   /// element.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class VisibilityRule : pb::IMessage<VisibilityRule>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Rpc/Context/AttributeContext.g.cs b/Google.Api.CommonProtos/Rpc/Context/AttributeContext.g.cs
index acade2d7..f0a3c57a 100644
--- a/Google.Api.CommonProtos/Rpc/Context/AttributeContext.g.cs
+++ b/Google.Api.CommonProtos/Rpc/Context/AttributeContext.g.cs
@@ -119,6 +119,7 @@ static AttributeContextReflection() {
   /// verify the system specification before relying on an attribute generated
   /// a system.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class AttributeContext : pb::IMessage<AttributeContext>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -660,6 +661,7 @@ public static partial class Types {
       /// or receives the request. Service peers should fill in
       /// `principal` and `labels` as appropriate.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Peer : pb::IMessage<Peer>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -1010,6 +1012,7 @@ public void MergeFrom(pb::CodedInputStream input) {
       /// a network API request. The terminology is based on the conventions used
       /// by Google APIs, Istio, and OpenAPI.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Api : pb::IMessage<Api>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -1333,6 +1336,7 @@ public void MergeFrom(pb::CodedInputStream input) {
       /// based on the JSON Web Token (JWT) standard, but the terms also
       /// correlate to concepts in other standards.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Auth : pb::IMessage<Auth>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -1717,6 +1721,7 @@ public void MergeFrom(pb::CodedInputStream input) {
       /// request is not an HTTP request, the runtime system should try to map
       /// the actual request to an equivalent HTTP request.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Request : pb::IMessage<Request>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -2371,6 +2376,7 @@ public void MergeFrom(pb::CodedInputStream input) {
       /// This message defines attributes for a typical network response. It
       /// generally models semantics of an HTTP response.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Response : pb::IMessage<Response>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -2741,6 +2747,7 @@ public void MergeFrom(pb::CodedInputStream input) {
       /// addressable (named) entity provided by the destination service. For
       /// example, a file stored on a network storage service.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Resource : pb::IMessage<Resource>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Rpc/Context/AuditContext.g.cs b/Google.Api.CommonProtos/Rpc/Context/AuditContext.g.cs
index 97a05740..15c59517 100644
--- a/Google.Api.CommonProtos/Rpc/Context/AuditContext.g.cs
+++ b/Google.Api.CommonProtos/Rpc/Context/AuditContext.g.cs
@@ -54,6 +54,7 @@ static AuditContextReflection() {
   /// <summary>
   /// `AuditContext` provides information that is needed for audit logging.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class AuditContext : pb::IMessage<AuditContext>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Rpc/ErrorDetails.g.cs b/Google.Api.CommonProtos/Rpc/ErrorDetails.g.cs
index 4cca00b5..7a35b3e0 100644
--- a/Google.Api.CommonProtos/Rpc/ErrorDetails.g.cs
+++ b/Google.Api.CommonProtos/Rpc/ErrorDetails.g.cs
@@ -102,6 +102,7 @@ static ErrorDetailsReflection() {
   ///       }
   ///     }
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ErrorInfo : pb::IMessage<ErrorInfo>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -394,6 +395,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// number of retries have been reached or a maximum retry delay cap has been
   /// reached.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class RetryInfo : pb::IMessage<RetryInfo>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -598,6 +600,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Describes additional debugging info.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class DebugInfo : pb::IMessage<DebugInfo>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -832,6 +835,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// Also see RetryInfo and Help types for other details about handling a
   /// quota failure.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class QuotaFailure : pb::IMessage<QuotaFailure>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1020,6 +1024,7 @@ public static partial class Types {
       /// A message type used to describe a single quota violation.  For example, a
       /// daily quota or a custom quota that was exceeded.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Violation : pb::IMessage<Violation>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -1272,6 +1277,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// acknowledged, it could list the terms of service violation in the
   /// PreconditionFailure message.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class PreconditionFailure : pb::IMessage<PreconditionFailure>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1459,6 +1465,7 @@ public static partial class Types {
       /// <summary>
       /// A message type used to describe a single precondition failure.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Violation : pb::IMessage<Violation>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -1747,6 +1754,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// Describes violations in a client request. This error type focuses on the
   /// syntactic aspects of the request.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class BadRequest : pb::IMessage<BadRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1934,6 +1942,7 @@ public static partial class Types {
       /// <summary>
       /// A message type used to describe a single bad request field.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class FieldViolation : pb::IMessage<FieldViolation>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -2211,6 +2220,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// Contains metadata about the request that clients can attach when filing a bug
   /// or providing other forms of feedback.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class RequestInfo : pb::IMessage<RequestInfo>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -2448,6 +2458,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Describes the resource that is being accessed.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ResourceInfo : pb::IMessage<ResourceInfo>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -2776,6 +2787,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// project hasn't enabled the accessed service, this can contain a URL pointing
   /// directly to the right place in the developer console to flip the bit.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Help : pb::IMessage<Help>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -2963,6 +2975,7 @@ public static partial class Types {
       /// <summary>
       /// Describes a URL link.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Link : pb::IMessage<Link>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -3204,6 +3217,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// Provides a localized error message that is safe to return to the user
   /// which can be attached to an RPC error.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class LocalizedMessage : pb::IMessage<LocalizedMessage>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Rpc/Http.g.cs b/Google.Api.CommonProtos/Rpc/Http.g.cs
index 1fed29ce..385a5e3e 100644
--- a/Google.Api.CommonProtos/Rpc/Http.g.cs
+++ b/Google.Api.CommonProtos/Rpc/Http.g.cs
@@ -55,6 +55,7 @@ static HttpReflection() {
   /// <summary>
   /// Represents an HTTP request.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class HttpRequest : pb::IMessage<HttpRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -360,6 +361,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Represents an HTTP response.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class HttpResponse : pb::IMessage<HttpResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -665,6 +667,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Represents an HTTP header.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class HttpHeader : pb::IMessage<HttpHeader>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Rpc/Status.g.cs b/Google.Api.CommonProtos/Rpc/Status.g.cs
index 8826a5ec..d84575f2 100644
--- a/Google.Api.CommonProtos/Rpc/Status.g.cs
+++ b/Google.Api.CommonProtos/Rpc/Status.g.cs
@@ -56,6 +56,7 @@ static StatusReflection() {
   /// You can find out more about this error model and how to work with it in the
   /// [API Design Guide](https://cloud.google.com/apis/design/errors).
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Status : pb::IMessage<Status>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Type/Color.g.cs b/Google.Api.CommonProtos/Type/Color.g.cs
index 637f78da..297f6a1e 100644
--- a/Google.Api.CommonProtos/Type/Color.g.cs
+++ b/Google.Api.CommonProtos/Type/Color.g.cs
@@ -174,6 +174,7 @@ static ColorReflection() {
   ///
   ///     // ...
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Color : pb::IMessage<Color>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Type/Date.g.cs b/Google.Api.CommonProtos/Type/Date.g.cs
index 810b548f..95e80180 100644
--- a/Google.Api.CommonProtos/Type/Date.g.cs
+++ b/Google.Api.CommonProtos/Type/Date.g.cs
@@ -61,6 +61,7 @@ static DateReflection() {
   /// Related types are [google.type.TimeOfDay][google.type.TimeOfDay] and
   /// `google.protobuf.Timestamp`.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Date : pb::IMessage<Date>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Type/Datetime.g.cs b/Google.Api.CommonProtos/Type/Datetime.g.cs
index 14541f64..dc1af680 100644
--- a/Google.Api.CommonProtos/Type/Datetime.g.cs
+++ b/Google.Api.CommonProtos/Type/Datetime.g.cs
@@ -79,6 +79,7 @@ static DatetimeReflection() {
   /// This type is more flexible than some applications may want. Make sure to
   /// document and validate your application's limitations.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class DateTime : pb::IMessage<DateTime>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -662,6 +663,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// Represents a time zone from the
   /// [IANA Time Zone Database](https://www.iana.org/time-zones).
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class TimeZone : pb::IMessage<TimeZone>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Type/Decimal.g.cs b/Google.Api.CommonProtos/Type/Decimal.g.cs
index 5a53d133..7e046788 100644
--- a/Google.Api.CommonProtos/Type/Decimal.g.cs
+++ b/Google.Api.CommonProtos/Type/Decimal.g.cs
@@ -54,6 +54,7 @@ static DecimalReflection() {
   /// https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/math/BigDecimal.html
   /// [decimal.Decimal]: https://docs.python.org/3/library/decimal.html
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Decimal : pb::IMessage<Decimal>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Type/Expr.g.cs b/Google.Api.CommonProtos/Type/Expr.g.cs
index 4b10b7c8..0968276d 100644
--- a/Google.Api.CommonProtos/Type/Expr.g.cs
+++ b/Google.Api.CommonProtos/Type/Expr.g.cs
@@ -79,6 +79,7 @@ static ExprReflection() {
   /// are determined by the service that evaluates it. See the service
   /// documentation for additional information.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Expr : pb::IMessage<Expr>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Type/Fraction.g.cs b/Google.Api.CommonProtos/Type/Fraction.g.cs
index b2f2b33e..502be262 100644
--- a/Google.Api.CommonProtos/Type/Fraction.g.cs
+++ b/Google.Api.CommonProtos/Type/Fraction.g.cs
@@ -49,6 +49,7 @@ static FractionReflection() {
   /// <summary>
   /// Represents a fraction in terms of a numerator divided by a denominator.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Fraction : pb::IMessage<Fraction>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Type/Interval.g.cs b/Google.Api.CommonProtos/Type/Interval.g.cs
index 468ae4f1..87a9b006 100644
--- a/Google.Api.CommonProtos/Type/Interval.g.cs
+++ b/Google.Api.CommonProtos/Type/Interval.g.cs
@@ -56,6 +56,7 @@ static IntervalReflection() {
   /// When the start equals the end, the interval is empty (matches no time).
   /// When both start and end are unspecified, the interval matches any time.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Interval : pb::IMessage<Interval>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Type/Latlng.g.cs b/Google.Api.CommonProtos/Type/Latlng.g.cs
index 578a9261..64fff718 100644
--- a/Google.Api.CommonProtos/Type/Latlng.g.cs
+++ b/Google.Api.CommonProtos/Type/Latlng.g.cs
@@ -53,6 +53,7 @@ static LatlngReflection() {
   /// &lt;a href="http://www.unoosa.org/pdf/icg/2012/template/WGS_84.pdf">WGS84
   /// standard&lt;/a>. Values must be within normalized ranges.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class LatLng : pb::IMessage<LatLng>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Type/LocalizedText.g.cs b/Google.Api.CommonProtos/Type/LocalizedText.g.cs
index ab80c9de..350531fd 100644
--- a/Google.Api.CommonProtos/Type/LocalizedText.g.cs
+++ b/Google.Api.CommonProtos/Type/LocalizedText.g.cs
@@ -50,6 +50,7 @@ static LocalizedTextReflection() {
   /// <summary>
   /// Localized variant of a text in a particular language.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class LocalizedText : pb::IMessage<LocalizedText>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Type/Money.g.cs b/Google.Api.CommonProtos/Type/Money.g.cs
index 27c75459..6bb7a82a 100644
--- a/Google.Api.CommonProtos/Type/Money.g.cs
+++ b/Google.Api.CommonProtos/Type/Money.g.cs
@@ -49,6 +49,7 @@ static MoneyReflection() {
   /// <summary>
   /// Represents an amount of money with its currency type.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Money : pb::IMessage<Money>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Type/PhoneNumber.g.cs b/Google.Api.CommonProtos/Type/PhoneNumber.g.cs
index 39bf2839..0b992515 100644
--- a/Google.Api.CommonProtos/Type/PhoneNumber.g.cs
+++ b/Google.Api.CommonProtos/Type/PhoneNumber.g.cs
@@ -77,6 +77,7 @@ static PhoneNumberReflection() {
   ///  Reference(s):
   ///   - https://github.com/google/libphonenumber
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class PhoneNumber : pb::IMessage<PhoneNumber>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -448,6 +449,7 @@ public static partial class Types {
       /// with different usage and pricing, even if those regions share the same
       /// country calling code (e.g. US and CA).
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class ShortCode : pb::IMessage<ShortCode>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Type/PostalAddress.g.cs b/Google.Api.CommonProtos/Type/PostalAddress.g.cs
index 1444e9ee..d912f757 100644
--- a/Google.Api.CommonProtos/Type/PostalAddress.g.cs
+++ b/Google.Api.CommonProtos/Type/PostalAddress.g.cs
@@ -70,6 +70,7 @@ static PostalAddressReflection() {
   /// For more guidance on how to use this schema, please see:
   /// https://support.google.com/business/answer/6397478
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class PostalAddress : pb::IMessage<PostalAddress>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Type/Quaternion.g.cs b/Google.Api.CommonProtos/Type/Quaternion.g.cs
index 4217c9c6..807cbab4 100644
--- a/Google.Api.CommonProtos/Type/Quaternion.g.cs
+++ b/Google.Api.CommonProtos/Type/Quaternion.g.cs
@@ -103,6 +103,7 @@ static QuaternionReflection() {
   /// kept positive, which can be achieved by changing all the signs when `w` is
   /// negative.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Quaternion : pb::IMessage<Quaternion>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.CommonProtos/Type/Timeofday.g.cs b/Google.Api.CommonProtos/Type/Timeofday.g.cs
index 7a152cdf..17e387ef 100644
--- a/Google.Api.CommonProtos/Type/Timeofday.g.cs
+++ b/Google.Api.CommonProtos/Type/Timeofday.g.cs
@@ -53,6 +53,7 @@ static TimeofdayReflection() {
   /// types are [google.type.Date][google.type.Date] and
   /// `google.protobuf.Timestamp`.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class TimeOfDay : pb::IMessage<TimeOfDay>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.Gax.Grpc.IntegrationTests/ForwardingTestService.g.cs b/Google.Api.Gax.Grpc.IntegrationTests/ForwardingTestService.g.cs
index 0ebbaeb8..d62f4ee5 100644
--- a/Google.Api.Gax.Grpc.IntegrationTests/ForwardingTestService.g.cs
+++ b/Google.Api.Gax.Grpc.IntegrationTests/ForwardingTestService.g.cs
@@ -81,6 +81,7 @@ static ForwardingTestServiceReflection() {
   /// <summary>
   /// Note: unique field names to avoid any bugs around conversion going undetected.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ForwardingSourceMethod1Request : pb::IMessage<ForwardingSourceMethod1Request>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -270,6 +271,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ForwardingSourceMethod1Response : pb::IMessage<ForwardingSourceMethod1Response>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -496,6 +498,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ForwardingSourceMethod2Request : pb::IMessage<ForwardingSourceMethod2Request>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -685,6 +688,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ForwardingSourceMethod2Response : pb::IMessage<ForwardingSourceMethod2Response>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -874,6 +878,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ForwardingTargetMethod1Request : pb::IMessage<ForwardingTargetMethod1Request>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1063,6 +1068,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ForwardingTargetMethod1Response : pb::IMessage<ForwardingTargetMethod1Response>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1252,6 +1258,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ForwardingTargetMethod2Request : pb::IMessage<ForwardingTargetMethod2Request>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1441,6 +1448,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ForwardingTargetMethod2Response : pb::IMessage<ForwardingTargetMethod2Response>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1630,6 +1638,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Irrelevant : pb::IMessage<Irrelevant>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.Gax.Grpc.IntegrationTests/TestService.g.cs b/Google.Api.Gax.Grpc.IntegrationTests/TestService.g.cs
index bbbfd2bb..c8097e22 100644
--- a/Google.Api.Gax.Grpc.IntegrationTests/TestService.g.cs
+++ b/Google.Api.Gax.Grpc.IntegrationTests/TestService.g.cs
@@ -60,6 +60,7 @@ static TestServiceReflection() {
 
   }
   #region Messages
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SimpleRequest : pb::IMessage<SimpleRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -249,6 +250,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SimpleResponse : pb::IMessage<SimpleResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -438,6 +440,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class EchoHeadersRequest : pb::IMessage<EchoHeadersRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -590,6 +593,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class EchoHeadersResponse : pb::IMessage<EchoHeadersResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -771,6 +775,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 HeaderValue : pb::IMessage<HeaderValue>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
diff --git a/Google.Api.Gax.Grpc.Tests/Rest/BadService.g.cs b/Google.Api.Gax.Grpc.Tests/Rest/BadService.g.cs
index 54f5efcf..c28e6e91 100644
--- a/Google.Api.Gax.Grpc.Tests/Rest/BadService.g.cs
+++ b/Google.Api.Gax.Grpc.Tests/Rest/BadService.g.cs
@@ -43,6 +43,7 @@ static BadServiceReflection() {
 
   }
   #region Messages
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class BadSimpleRequest : pb::IMessage<BadSimpleRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -232,6 +233,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class BadSimpleResponse : pb::IMessage<BadSimpleResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.Gax.Grpc.Tests/Rest/TestService.g.cs b/Google.Api.Gax.Grpc.Tests/Rest/TestService.g.cs
index 896e382b..7166a283 100644
--- a/Google.Api.Gax.Grpc.Tests/Rest/TestService.g.cs
+++ b/Google.Api.Gax.Grpc.Tests/Rest/TestService.g.cs
@@ -71,6 +71,7 @@ static TestServiceReflection() {
   /// <summary>
   /// Used in HttpRulePathPatternTest. 
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class RuleTestRequest : pb::IMessage<RuleTestRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -435,6 +436,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 Nested : pb::IMessage<Nested>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -629,6 +631,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class BundlingRequest : pb::IMessage<BundlingRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -844,6 +847,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class BundlingResponse : pb::IMessage<BundlingResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1059,6 +1063,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SimpleRequest : pb::IMessage<SimpleRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1248,6 +1253,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SimpleResponse : pb::IMessage<SimpleResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1437,6 +1443,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class PageStreamingRequest : pb::IMessage<PageStreamingRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1700,6 +1707,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class PageStreamingResponse : pb::IMessage<PageStreamingResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.Gax.Grpc.Tests/Rest/TranscoderTest.g.cs b/Google.Api.Gax.Grpc.Tests/Rest/TranscoderTest.g.cs
index 59a8e271..6d592e3c 100644
--- a/Google.Api.Gax.Grpc.Tests/Rest/TranscoderTest.g.cs
+++ b/Google.Api.Gax.Grpc.Tests/Rest/TranscoderTest.g.cs
@@ -44,34 +44,34 @@ static TranscoderTestReflection() {
             "b2R5GAMgASgLMhcuZ29vZ2xlLnByb3RvYnVmLlN0cnVjdCIOCgxFbXB0eVJl",
             "cXVlc3QibQoMU2ltcGxlRmllbGRzEgwKBG5hbWUYASABKAkSDwoHaW50ZWdl",
             "chgCIAEoBRIPCgdib29sZWFuGAMgASgIEi0KCXRpbWVzdGFtcBgEIAEoCzIa",
-            "Lmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXAiLAoUUmVxdWlyZWRCb29sZWFu",
-            "RmllbGQSFAoHYm9vbGVhbhgBIAEoCEID4EECIsoDChBRdWVyeVRlc3RNZXNz",
-            "YWdlEh0KEHJlcXVpcmVkX2ludGVnZXIYASABKAVCA+BBAhIkChdwcm90bzNf",
-            "b3B0aW9uYWxfaW50ZWdlchgCIAEoBUgAiAEBEhcKD3JlcGVhdGVkX3N0cmlu",
-            "ZxgDIAMoCRJHCgZuZXN0ZWQYBCABKAsyNy5nb29nbGUuYXBpLmdheC5ncnBj",
-            "LnJlc3QudGVzdHMuUXVlcnlUZXN0TWVzc2FnZS5OZXN0ZWQSDwoHaW5fcGF0",
-            "aBgFIAEoCRJPCgplbnVtX2ZpZWxkGAYgASgOMjsuZ29vZ2xlLmFwaS5nYXgu",
-            "Z3JwYy5yZXN0LnRlc3RzLlF1ZXJ5VGVzdE1lc3NhZ2UuU2FtcGxlRW51bRpD",
-            "CgZOZXN0ZWQSCQoBeBgBIAEoBRIJCgF5GAIgASgFEgkKAXoYAyABKAUSEAoD",
-            "b3B0GAQgASgFSACIAQFCBgoEX29wdCJMCgpTYW1wbGVFbnVtEhsKF1NBTVBM",
-            "RV9FTlVNX1VOU1BFQ0lGSUVEEAASDwoLRklSU1RfVkFMVUUQARIQCgxTRUNP",
-            "TkRfVkFMVUUQAkIaChhfcHJvdG8zX29wdGlvbmFsX2ludGVnZXIi3QEKGERv",
-            "dWJsZU5lc3RpbmdUZXN0TWVzc2FnZRJKCgF4GAEgASgLMj8uZ29vZ2xlLmFw",
-            "aS5nYXguZ3JwYy5yZXN0LnRlc3RzLkRvdWJsZU5lc3RpbmdUZXN0TWVzc2Fn",
-            "ZS5OZXN0ZWQaGQoMRG91YmxlTmVzdGVkEgkKAXoYASABKAUaWgoGTmVzdGVk",
-            "ElAKAXkYASABKAsyRS5nb29nbGUuYXBpLmdheC5ncnBjLnJlc3QudGVzdHMu",
-            "RG91YmxlTmVzdGluZ1Rlc3RNZXNzYWdlLkRvdWJsZU5lc3RlZCKXAgobUmVx",
-            "dWVzdFdpdGhSZWN1cnNpdmVNZXNzYWdlElAKAXoYASABKAsyRS5nb29nbGUu",
-            "YXBpLmdheC5ncnBjLnJlc3QudGVzdHMuUmVxdWVzdFdpdGhSZWN1cnNpdmVN",
-            "ZXNzYWdlLlJlY3Vyc2l2ZRI8CgZzaW1wbGUYAiABKAsyLC5nb29nbGUuYXBp",
-            "LmdheC5ncnBjLnJlc3QudGVzdHMuU2ltcGxlRmllbGRzGmgKCVJlY3Vyc2l2",
-            "ZRJQCgF4GAEgASgLMkUuZ29vZ2xlLmFwaS5nYXguZ3JwYy5yZXN0LnRlc3Rz",
-            "LlJlcXVlc3RXaXRoUmVjdXJzaXZlTWVzc2FnZS5SZWN1cnNpdmUSCQoBeRgC",
-            "IAEoBSJ+ChNTZXBhcmF0ZUJvZHlSZXF1ZXN0EkYKBGJvZHkYASABKAsyOC5n",
-            "b29nbGUuYXBpLmdheC5ncnBjLnJlc3QudGVzdHMuU2VwYXJhdGVCb2R5UmVx",
-            "dWVzdC5Cb2R5EgwKBG5hbWUYAiABKAkaEQoEQm9keRIJCgF4GAEgASgFIjEK",
-            "EE11bHRpTmFtZVJlcXVlc3QSDQoFZmlyc3QYASABKAkSDgoGc2Vjb25kGAIg",
-            "ASgJYgZwcm90bzM="));
+            "Lmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXAiLQoUUmVxdWlyZWRCb29sZWFu",
+            "RmllbGQSFQoHYm9vbGVhbhgBIAEoCEIE4kEBAiLLAwoQUXVlcnlUZXN0TWVz",
+            "c2FnZRIeChByZXF1aXJlZF9pbnRlZ2VyGAEgASgFQgTiQQECEiQKF3Byb3Rv",
+            "M19vcHRpb25hbF9pbnRlZ2VyGAIgASgFSACIAQESFwoPcmVwZWF0ZWRfc3Ry",
+            "aW5nGAMgAygJEkcKBm5lc3RlZBgEIAEoCzI3Lmdvb2dsZS5hcGkuZ2F4Lmdy",
+            "cGMucmVzdC50ZXN0cy5RdWVyeVRlc3RNZXNzYWdlLk5lc3RlZBIPCgdpbl9w",
+            "YXRoGAUgASgJEk8KCmVudW1fZmllbGQYBiABKA4yOy5nb29nbGUuYXBpLmdh",
+            "eC5ncnBjLnJlc3QudGVzdHMuUXVlcnlUZXN0TWVzc2FnZS5TYW1wbGVFbnVt",
+            "GkMKBk5lc3RlZBIJCgF4GAEgASgFEgkKAXkYAiABKAUSCQoBehgDIAEoBRIQ",
+            "CgNvcHQYBCABKAVIAIgBAUIGCgRfb3B0IkwKClNhbXBsZUVudW0SGwoXU0FN",
+            "UExFX0VOVU1fVU5TUEVDSUZJRUQQABIPCgtGSVJTVF9WQUxVRRABEhAKDFNF",
+            "Q09ORF9WQUxVRRACQhoKGF9wcm90bzNfb3B0aW9uYWxfaW50ZWdlciLdAQoY",
+            "RG91YmxlTmVzdGluZ1Rlc3RNZXNzYWdlEkoKAXgYASABKAsyPy5nb29nbGUu",
+            "YXBpLmdheC5ncnBjLnJlc3QudGVzdHMuRG91YmxlTmVzdGluZ1Rlc3RNZXNz",
+            "YWdlLk5lc3RlZBoZCgxEb3VibGVOZXN0ZWQSCQoBehgBIAEoBRpaCgZOZXN0",
+            "ZWQSUAoBeRgBIAEoCzJFLmdvb2dsZS5hcGkuZ2F4LmdycGMucmVzdC50ZXN0",
+            "cy5Eb3VibGVOZXN0aW5nVGVzdE1lc3NhZ2UuRG91YmxlTmVzdGVkIpcCChtS",
+            "ZXF1ZXN0V2l0aFJlY3Vyc2l2ZU1lc3NhZ2USUAoBehgBIAEoCzJFLmdvb2ds",
+            "ZS5hcGkuZ2F4LmdycGMucmVzdC50ZXN0cy5SZXF1ZXN0V2l0aFJlY3Vyc2l2",
+            "ZU1lc3NhZ2UuUmVjdXJzaXZlEjwKBnNpbXBsZRgCIAEoCzIsLmdvb2dsZS5h",
+            "cGkuZ2F4LmdycGMucmVzdC50ZXN0cy5TaW1wbGVGaWVsZHMaaAoJUmVjdXJz",
+            "aXZlElAKAXgYASABKAsyRS5nb29nbGUuYXBpLmdheC5ncnBjLnJlc3QudGVz",
+            "dHMuUmVxdWVzdFdpdGhSZWN1cnNpdmVNZXNzYWdlLlJlY3Vyc2l2ZRIJCgF5",
+            "GAIgASgFIn4KE1NlcGFyYXRlQm9keVJlcXVlc3QSRgoEYm9keRgBIAEoCzI4",
+            "Lmdvb2dsZS5hcGkuZ2F4LmdycGMucmVzdC50ZXN0cy5TZXBhcmF0ZUJvZHlS",
+            "ZXF1ZXN0LkJvZHkSDAoEbmFtZRgCIAEoCRoRCgRCb2R5EgkKAXgYASABKAUi",
+            "MQoQTXVsdGlOYW1lUmVxdWVzdBINCgVmaXJzdBgBIAEoCRIOCgZzZWNvbmQY",
+            "AiABKAliBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.StructReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.TimestampReflection.Descriptor, global::Google.Api.FieldBehaviorReflection.Descriptor, global::Google.Api.HttpReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
@@ -96,6 +96,7 @@ static TranscoderTestReflection() {
   /// <summary>
   /// A collection of tests.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class TestFile : pb::IMessage<TestFile>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -304,6 +305,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// A single transcoding test. Most tests only exercise a single HttpRule,
   /// without any additional bindings, but the same test structure works for both.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class Test : pb::IMessage<Test>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -970,6 +972,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// The expected output of a successful transcoding operation.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class HttpRequest : pb::IMessage<HttpRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1256,6 +1259,7 @@ public void MergeFrom(pb::CodedInputStream input) {
   /// <summary>
   /// Request messages
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class EmptyRequest : pb::IMessage<EmptyRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1408,6 +1412,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SimpleFields : pb::IMessage<SimpleFields>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1717,6 +1722,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class RequiredBooleanField : pb::IMessage<RequiredBooleanField>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1909,6 +1915,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class QueryTestMessage : pb::IMessage<QueryTestMessage>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -2313,6 +2320,7 @@ public enum SampleEnum {
         [pbr::OriginalName("SECOND_VALUE")] SecondValue = 2,
       }
 
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Nested : pb::IMessage<Nested>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -2635,6 +2643,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class DoubleNestingTestMessage : pb::IMessage<DoubleNestingTestMessage>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -2836,6 +2845,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 DoubleNested : pb::IMessage<DoubleNested>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -3025,6 +3035,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
       }
 
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       public sealed partial class Nested : pb::IMessage<Nested>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -3228,6 +3239,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class RequestWithRecursiveMessage : pb::IMessage<RequestWithRecursiveMessage>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3475,6 +3487,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 Recursive : pb::IMessage<Recursive>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -3715,6 +3728,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SeparateBodyRequest : pb::IMessage<SeparateBodyRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -3953,6 +3967,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 Body : pb::IMessage<Body>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -4147,6 +4162,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class MultiNameRequest : pb::IMessage<MultiNameRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.Gax.Grpc.Tests/TestMessages.g.cs b/Google.Api.Gax.Grpc.Tests/TestMessages.g.cs
index 78580ad8..307da22f 100644
--- a/Google.Api.Gax.Grpc.Tests/TestMessages.g.cs
+++ b/Google.Api.Gax.Grpc.Tests/TestMessages.g.cs
@@ -50,6 +50,7 @@ static TestMessagesReflection() {
 
   }
   #region Messages
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class BundlingRequest : pb::IMessage<BundlingRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -265,6 +266,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class BundlingResponse : pb::IMessage<BundlingResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -480,6 +482,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SimpleRequest : pb::IMessage<SimpleRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -669,6 +672,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class SimpleResponse : pb::IMessage<SimpleResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -858,6 +862,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class PageStreamingRequest : pb::IMessage<PageStreamingRequest>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -1121,6 +1126,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class PageStreamingResponse : pb::IMessage<PageStreamingResponse>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.Gax.Grpc/Gcp/GrpcGcp.g.cs b/Google.Api.Gax.Grpc/Gcp/GrpcGcp.g.cs
index 22d6825b..ab0957ea 100644
--- a/Google.Api.Gax.Grpc/Gcp/GrpcGcp.g.cs
+++ b/Google.Api.Gax.Grpc/Gcp/GrpcGcp.g.cs
@@ -48,6 +48,7 @@ static GrpcGcpReflection() {
 
   }
   #region Messages
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ApiConfig : pb::IMessage<ApiConfig>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -278,6 +279,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class ChannelPoolConfig : pb::IMessage<ChannelPoolConfig>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -552,6 +554,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class MethodConfig : pb::IMessage<MethodConfig>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -784,6 +787,7 @@ public void MergeFrom(pb::CodedInputStream input) {
 
   }
 
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   public sealed partial class AffinityConfig : pb::IMessage<AffinityConfig>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
diff --git a/Google.Api.Gax.Grpc/Rest/ResponseMetadata.g.cs b/Google.Api.Gax.Grpc/Rest/ResponseMetadata.g.cs
index f06062f9..2e513471 100644
--- a/Google.Api.Gax.Grpc/Rest/ResponseMetadata.g.cs
+++ b/Google.Api.Gax.Grpc/Rest/ResponseMetadata.g.cs
@@ -47,6 +47,7 @@ static ResponseMetadataReflection() {
   /// <summary>
   /// This message defines the error schema for Google's JSON HTTP APIs.
   /// </summary>
+  [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
   internal sealed partial class Error : pb::IMessage<Error>
   #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
       , pb::IBufferMessage
@@ -257,6 +258,7 @@ public static partial class Types {
       /// <summary>
       /// Deprecated. This message is only used by error format v1.
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       internal sealed partial class ErrorProto : pb::IMessage<ErrorProto>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage
@@ -415,6 +417,7 @@ public void MergeFrom(pb::CodedInputStream input) {
       /// `errors` for backward compatibility with [Google API Client
       /// Libraries](https://developers.google.com/api-client-library).
       /// </summary>
+      [global::System.Diagnostics.DebuggerDisplayAttribute("{ToString(),nq}")]
       internal sealed partial class Status : pb::IMessage<Status>
       #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
           , pb::IBufferMessage