diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index bdcef2e26..a67582663 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -8,17 +8,21 @@ See [CONTRIBUTING.md](https://github.com/grpc/grpc-community/blob/master/CONTRIB
 for general contribution guidelines.
 
 ## Maintainers (in alphabetical order)
- 
- - [jtattermusch](https://github.com/jtattermusch), Google Inc.
+
+ - [gnossen](https://github.com/gnossen), Google Inc.
  - [murgatroid99](https://github.com/murgatroid99), Google Inc.
- - [nicolasnoble](https://github.com/nicolasnoble), Google Inc.
- - [srini100](https://github.com/srini100), Google Inc.
+ - [sergiitk](https://github.com/sergiitk), Google Inc.
+ - [temawi](https://github.com/temawi), Google Inc.
  - [wenbozhu](https://github.com/wenbozhu), Google Inc.
 
  ## Emeritus Maintainers (in alphabetical order)
- - [jiangtaoli2016](https://github.com/jiangtaoli2016), Google Inc.
- - [kjin](https://github.com/kjin), Google Inc.
- - [matt-kwong](https://github.com/matt-kwong), Google Inc.
- - [ofrobots](https://github.com/ofrobots), Google Inc.
- - [WeiranFang](https://github.com/WeiranFang), Google Inc.
+ - [jiangtaoli2016](https://github.com/jiangtaoli2016)
+ - [jtattermusch](https://github.com/jtattermusch)
+ - [kjin](https://github.com/kjin)
+ - [matt-kwong](https://github.com/matt-kwong)
+ - [nicolasnoble](https://github.com/nicolasnoble)
+ - [nimf](https://github.com/nimf)
+ - [ofrobots](https://github.com/ofrobots)
+ - [srini100](https://github.com/srini100)
+ - [WeiranFang](https://github.com/WeiranFang)
  
diff --git a/examples/interceptors/README.md b/examples/interceptors/README.md
new file mode 100644
index 000000000..fa5a746c7
--- /dev/null
+++ b/examples/interceptors/README.md
@@ -0,0 +1,120 @@
+# Interceptor
+
+Node gRPC provides simple APIs to implement and install interceptors on clients
+and servers. An interceptor intercepts the execution of each incoming/outgoing
+RPC call on the client or server where it is installed. Users can use
+interceptors to do logging, authentication/authorization, metrics collection,
+and many other functions that can be shared across RPCs.
+
+## Run the server
+
+```
+node server.js
+```
+
+## Run the client
+
+```
+node client.js
+```
+
+# Explanation
+
+In Node gRPC, clients and servers each have their own types of interceptors.
+
+## Client
+
+Node gRPC client interceptors are formally specified in [gRFC L5](https://github.com/grpc/proposal/blob/master/L5-node-client-interceptors.md).
+An interceptor is a function that can wrap a call object with an
+`InterceptingCall`, with intercepting functions for individual call operations.
+To illustrate, the following is a trivial interceptor with all interception
+methods:
+
+```js
+const interceptor = function(options, nextCall) {
+  const requester = {
+    start: function(metadata, listener, next) {
+      const listener = {
+          onReceiveMetadata: function(metadata, next) {
+            next(metadata);
+          },
+          onReceiveMessage: function(message, next) {
+            next(message);
+          },
+          onReceiveStatus: function(status, next) {
+            next(status);
+          }
+      };
+      next(metadata, listener);
+    },
+    sendMessage: function(message, next) {
+      next(messasge);
+    },
+    halfClose: function(next) {
+      next();
+    },
+    cancel: function(message, next) {
+      next();
+    }
+  };
+  return new InterceptingCall(nextCall(options), requester);
+};
+```
+
+The requester intercepts outgoing operations, and the listener intercepts
+incoming operations. Each intercepting method can read or modify the data for
+that operation before passing it along to the `next` callback.
+
+The `RequesterBuilder` and `ListenerBuilder` utility classes provide an
+alternative way to construct requester and listener objects
+
+## Server
+
+Node gRPC server interceptors are formally specified in [gRFC L112](https://github.com/grpc/proposal/blob/master/L112-node-server-interceptors.md).
+Similar to client interceptors, a server interceptor is a function that can
+wrap a call object with a `ServerInterceptingCall`, with intercepting functions
+for individual call operations. Server intercepting functions broadly mirror
+the client intercepting functions, with sending and receiving switched. To
+illustrate, the following is a trivial server interceptor with all interception
+methods:
+
+```js
+const interceptor = function(methodDescriptor, call) {
+  const responder = {
+    start: function(next) {
+      const listener = {
+        onReceiveMetadata: function(metadata, next) {
+          next(metadata);
+        },
+        onReceiveMessage: function(message, next) {
+          next(message);
+        },
+        onReceiveHalfClose: function(next) {
+          next();
+        },
+        onCancel: function() {
+        }
+      };
+      next(listener);
+    },
+    sendMetadata: function(metadata, next) {
+      next(metadata);
+    },
+    sendMessage: function(message, next) {
+      next(message);
+    },
+    sendStatus: function(status, next) {
+      next(status);
+    }
+  };
+  return new ServerInterceptingCall(call, responder);
+}
+```
+
+As with client interceptors, the responder intercepts outgoing operations and
+the listener intercepts incoming operations. Each intercepting method can read
+or modify the data for that operation before passing it along to the `next`
+callback.
+
+The `ResponderBuilder` and `ServerListenerBuilder` utility classes provide an
+alternative way to build responder and server listener objects.
diff --git a/examples/interceptors/client.js b/examples/interceptors/client.js
new file mode 100644
index 000000000..0b33b0fff
--- /dev/null
+++ b/examples/interceptors/client.js
@@ -0,0 +1,113 @@
+/*
+ *
+ * Copyright 2024 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+const grpc = require('@grpc/grpc-js');
+const protoLoader = require('@grpc/proto-loader');
+const parseArgs = require('minimist');
+
+const PROTO_PATH = __dirname + '/../protos/echo.proto';
+
+const packageDefinition = protoLoader.loadSync(
+  PROTO_PATH,
+  {keepCase: true,
+   longs: String,
+   enums: String,
+   defaults: true,
+   oneofs: true
+  });
+const echoProto = grpc.loadPackageDefinition(packageDefinition).grpc.examples.echo;
+
+function authInterceptor(options, nextCall) {
+  const requester = (new grpc.RequesterBuilder())
+    .withStart((metadata, listener, next) => {
+      metadata.set('authorization', 'some-secret-token');
+      next(metadata, listener);
+    }).build();
+  return new grpc.InterceptingCall(nextCall(options), requester);
+}
+
+// logger is to mock a sophisticated logging system. To simplify the example, we just print out the content.
+function logger(format, ...args) {
+  console.log(`LOG (client):\t${format}\n`, ...args);
+}
+
+function loggingInterceptor(options, nextCall) {
+  const listener = (new grpc.ListenerBuilder())
+    .withOnReceiveMessage((message, next) => {
+      logger(`Receive a message ${JSON.stringify(message)} at ${(new Date()).toISOString()}`);
+      next(message);
+    }).build();
+  const requester = (new grpc.RequesterBuilder())
+    .withSendMessage((message, next) => {
+      logger(`Send a message ${JSON.stringify(message)} at ${(new Date()).toISOString()}`);
+      next(message);
+    }).build();
+  return new grpc.InterceptingCall(nextCall(options), requester);
+}
+
+function callUnaryEcho(client, message) {
+  return new Promise((resolve, reject) => {
+    const deadline = new Date();
+    deadline.setSeconds(deadline.getSeconds() + 10);
+    client.unaryEcho({message: message}, {deadline}, (error, value) => {
+      if (error) {
+        reject(error);
+        return;
+      }
+      console.log(`UnaryEcho: ${JSON.stringify(value)}`);
+      resolve();
+    });
+  });
+}
+
+function callBidiStreamingEcho(client) {
+  return new Promise((resolve, reject) => {
+    const deadline = new Date();
+    deadline.setSeconds(deadline.getSeconds() + 10);
+    const call = client.bidirectionalStreamingEcho({deadline});
+    call.on('data', value => {
+      console.log(`BidiStreamingEcho: ${JSON.stringify(value)}`);
+    });
+    call.on('status', status => {
+      if (status.code === grpc.status.OK) {
+        resolve();
+      } else {
+        reject(status);
+      }
+    });
+    call.on('error', () => {
+      // Ignore error event
+    });
+    for (let i = 0; i < 5; i++) {
+      call.write({message: `Request ${i + 1}`});
+    }
+    call.end();
+  });
+}
+
+async function main() {
+  let argv = parseArgs(process.argv.slice(2), {
+    string: 'target',
+    default: {target: 'localhost:50051'}
+  });
+  const client = new echoProto.Echo(argv.target, grpc.credentials.createInsecure(), {interceptors: [authInterceptor, loggingInterceptor]});
+  await callUnaryEcho(client, 'hello world');
+  await callBidiStreamingEcho(client);
+}
+
+main();
diff --git a/examples/interceptors/server.js b/examples/interceptors/server.js
new file mode 100644
index 000000000..b6f5a5eaa
--- /dev/null
+++ b/examples/interceptors/server.js
@@ -0,0 +1,120 @@
+/*
+ *
+ * Copyright 2024 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+const grpc = require('@grpc/grpc-js');
+const protoLoader = require('@grpc/proto-loader');
+const parseArgs = require('minimist');
+
+const PROTO_PATH = __dirname + '/../protos/echo.proto';
+
+const packageDefinition = protoLoader.loadSync(
+  PROTO_PATH,
+  {keepCase: true,
+   longs: String,
+   enums: String,
+   defaults: true,
+   oneofs: true
+  });
+const echoProto = grpc.loadPackageDefinition(packageDefinition).grpc.examples.echo;
+
+function unaryEcho(call, callback) {
+  console.log(`unary echoing message ${call.request.message}`);
+  callback(null, call.request);
+}
+
+function bidirectionalStreamingEcho(call) {
+  call.on('data', request => {
+    console.log(`bidi echoing message ${request.message}`);
+    call.write(request);
+  });
+  call.on('end', () => {
+    call.end();
+  });
+}
+
+const serviceImplementation = {
+  unaryEcho,
+  bidirectionalStreamingEcho
+}
+
+function validateAuthorizationMetadata(metadata) {
+  const authorization = metadata.get('authorization');
+  if (authorization.length < 1) {
+    return false;
+  }
+  return authorization[0] === 'some-secret-token';
+}
+
+function authInterceptor(methodDescriptor, call) {
+const listener = (new grpc.ServerListenerBuilder())
+  .withOnReceiveMetadata((metadata, next) => {
+    if (validateAuthorizationMetadata(metadata)) {
+      next(metadata);
+    } else {
+      call.sendStatus({
+        code: grpc.status.UNAUTHENTICATED,
+        details: 'Auth metadata not correct'
+      });
+    }
+  }).build();
+  const responder = (new grpc.ResponderBuilder())
+    .withStart(next => {
+        next(listener);
+    }).build();
+  return new grpc.ServerInterceptingCall(call, responder);
+}
+
+// logger is to mock a sophisticated logging system. To simplify the example, we just print out the content.
+function logger(format, ...args) {
+  console.log(`LOG (server):\t${format}\n`, ...args);
+}
+
+function loggingInterceptor(methodDescriptor, call) {
+  const listener = new grpc.ServerListenerBuilder()
+    .withOnReceiveMessage((message, next) => {
+      logger(`Receive a message ${JSON.stringify(message)} at ${(new Date()).toISOString()}`);
+      next(message);
+    }).build();
+  const responder = new grpc.ResponderBuilder()
+    .withStart(next => {
+      next(listener);
+    })
+    .withSendMessage((message, next) => {
+      logger(`Send a message ${JSON.stringify(message)} at ${(new Date()).toISOString()}`);
+      next(message);
+    }).build();
+  return new grpc.ServerInterceptingCall(call, responder);
+}
+
+function main() {
+  const argv = parseArgs(process.argv.slice(2), {
+    string: 'port',
+    default: {port: '50051'}
+  });
+  const server = new grpc.Server({interceptors: [authInterceptor, loggingInterceptor]});
+  server.addService(echoProto.Echo.service, serviceImplementation);
+  server.bindAsync(`0.0.0.0:${argv.port}`, grpc.ServerCredentials.createInsecure(), (err, port) => {
+    if (err != null) {
+      return console.error(err);
+    }
+    console.log(`gRPC listening on ${port}`)
+  });
+  client = new echoProto.Echo(`localhost:${argv.port}`, grpc.credentials.createInsecure());
+}
+
+main();
diff --git a/examples/keepalive/README.md b/examples/keepalive/README.md
new file mode 100644
index 000000000..0552d7285
--- /dev/null
+++ b/examples/keepalive/README.md
@@ -0,0 +1,16 @@
+# Keepalive
+
+This example illustrates how to set up client-side keepalive pings and
+server-side keepalive pings and connection age and idleness settings.
+
+## Start the server
+
+```
+node server.js
+```
+
+## Start the client
+
+```
+GRPC_TRACE=transport,keepalive GRPC_VERBOSITY=DEBUG node client.js
+```
diff --git a/examples/keepalive/client.js b/examples/keepalive/client.js
new file mode 100644
index 000000000..b985c305f
--- /dev/null
+++ b/examples/keepalive/client.js
@@ -0,0 +1,61 @@
+/*
+ *
+ * Copyright 2024 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+const grpc = require('@grpc/grpc-js');
+const protoLoader = require('@grpc/proto-loader');
+const parseArgs = require('minimist');
+
+const PROTO_PATH = __dirname + '/../protos/echo.proto';
+
+const packageDefinition = protoLoader.loadSync(
+  PROTO_PATH,
+  {keepCase: true,
+   longs: String,
+   enums: String,
+   defaults: true,
+   oneofs: true
+  });
+const echoProto = grpc.loadPackageDefinition(packageDefinition).grpc.examples.echo;
+
+const keepaliveOptions = {
+  // Ping the server every 10 seconds to ensure the connection is still active
+  'grpc.keepalive_time_ms': 10_000,
+  // Wait 1 second for the ping ack before assuming the connection is dead
+  'grpc.keepalive_timeout_ms': 1_000,
+  // send pings even without active streams
+  'grpc.keepalive_permit_without_calls': 1
+}
+
+function main() {
+  let argv = parseArgs(process.argv.slice(2), {
+    string: 'target',
+    default: {target: 'localhost:50052'}
+  });
+  const client = new echoProto.Echo(argv.target, grpc.credentials.createInsecure(), keepaliveOptions);
+  client.unaryEcho({message: 'keepalive demo'}, (error, value) => {
+    if (error) {
+      console.log(`Unexpected error from UnaryEcho: ${error}`);
+      return;
+    }
+    console.log(`RPC response: ${JSON.stringify(value)}`);
+  });
+  // Keep process alive forever; run with GRPC_TRACE=transport,keepalive GRPC_VERBOSITY=DEBUG to observe ping frames and GOAWAYs due to idleness.
+  setInterval(() => {}, 1000);
+}
+
+main();
diff --git a/examples/keepalive/server.js b/examples/keepalive/server.js
new file mode 100644
index 000000000..24a7ee778
--- /dev/null
+++ b/examples/keepalive/server.js
@@ -0,0 +1,71 @@
+/*
+ *
+ * Copyright 2024 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+const grpc = require('@grpc/grpc-js');
+const protoLoader = require('@grpc/proto-loader');
+const parseArgs = require('minimist');
+
+const PROTO_PATH = __dirname + '/../protos/echo.proto';
+
+const packageDefinition = protoLoader.loadSync(
+  PROTO_PATH,
+  {keepCase: true,
+   longs: String,
+   enums: String,
+   defaults: true,
+   oneofs: true
+  });
+const echoProto = grpc.loadPackageDefinition(packageDefinition).grpc.examples.echo;
+
+const keepaliveOptions = {
+  // If a client is idle for 15 seconds, send a GOAWAY
+  'grpc.max_connection_idle_ms': 15_000,
+  // If any connection is alive for more than 30 seconds, send a GOAWAY
+  'grpc.max_connection_age_ms': 30_000,
+  // Allow 5 seconds for pending RPCs to complete before forcibly closing connections
+  'grpc.max_connection_age_grace_ms': 5_000,
+  // Ping the client every 5 seconds to ensure the connection is still active
+  'grpc.keepalive_time_ms': 5_000,
+  // Wait 1 second for the ping ack before assuming the connection is dead
+  'grpc.keepalive_timeout_ms': 1_000
+}
+
+function unaryEcho(call, callback) {
+  callback(null, call.request);
+}
+
+const serviceImplementation = {
+  unaryEcho
+};
+
+function main() {
+  const argv = parseArgs(process.argv.slice(2), {
+    string: 'port',
+    default: {port: '50052'}
+  });
+  const server = new grpc.Server(keepaliveOptions);
+  server.addService(echoProto.Echo.service, serviceImplementation);
+  server.bindAsync(`0.0.0.0:${argv.port}`, grpc.ServerCredentials.createInsecure(), (err, port) => {
+    if (err != null) {
+      return console.error(err);
+    }
+    console.log(`gRPC listening on ${port}`)
+  });
+}
+
+main();
diff --git a/examples/package.json b/examples/package.json
index 6857aa5d9..6e717dadb 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -5,8 +5,8 @@
     "@grpc/proto-loader": "^0.6.0",
     "async": "^1.5.2",
     "google-protobuf": "^3.0.0",
-    "@grpc/grpc-js": "^1.8.0",
-    "@grpc/grpc-js-xds": "^1.8.0",
+    "@grpc/grpc-js": "^1.10.2",
+    "@grpc/grpc-js-xds": "^1.10.0",
     "@grpc/reflection": "^1.0.0",
     "lodash": "^4.6.1",
     "minimist": "^1.2.0"
diff --git a/gulpfile.ts b/gulpfile.ts
index 2c2c2e374..9a2f76347 100644
--- a/gulpfile.ts
+++ b/gulpfile.ts
@@ -23,15 +23,15 @@ import * as reflection from './packages/grpc-reflection/gulpfile';
 import * as protobuf from './packages/proto-loader/gulpfile';
 import * as internalTest from './test/gulpfile';
 
-const installAll = gulp.series(jsCore.install, healthCheck.install, protobuf.install, internalTest.install, jsXds.install, reflection.install);
+const installAll = gulp.series(protobuf.install, jsCore.install, healthCheck.install, internalTest.install, jsXds.install, reflection.install);
 
 const lint = gulp.parallel(jsCore.lint);
 
-const build = gulp.series(jsCore.compile, protobuf.compile, jsXds.compile);
+const build = gulp.series(protobuf.compile, jsCore.compile, jsXds.compile);
 
 const setup = gulp.series(installAll);
 
-const setupPureJSInterop = gulp.series(jsCore.install, protobuf.install, internalTest.install);
+const setupPureJSInterop = gulp.series(protobuf.install, jsCore.install, internalTest.install);
 
 const clean = gulp.series(jsCore.clean, protobuf.clean, jsXds.clean);
 
diff --git a/package.json b/package.json
index a1fd3d59e..a5733f377 100644
--- a/package.json
+++ b/package.json
@@ -20,14 +20,13 @@
     "del": "^3.0.0",
     "execa": "^0.8.0",
     "gulp": "^4.0.1",
-    "gulp-jsdoc3": "^1.0.1",
     "gulp-jshint": "^2.0.4",
     "gulp-mocha": "^4.3.1",
     "gulp-sourcemaps": "^2.6.1",
     "gulp-tslint": "^8.1.1",
     "gulp-typescript": "^3.2.2",
     "gulp-util": "^3.0.8",
-    "jsdoc": "^3.3.2",
+    "jsdoc": "^4.0.3",
     "jshint": "^2.9.5",
     "make-dir": "^1.1.0",
     "merge2": "^1.1.0",
diff --git a/packages/grpc-health-check/package.json b/packages/grpc-health-check/package.json
index 745f65282..181057d6d 100644
--- a/packages/grpc-health-check/package.json
+++ b/packages/grpc-health-check/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grpc-health-check",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "author": "Google Inc.",
   "description": "Health check client and service for use with gRPC-node",
   "repository": {
@@ -21,7 +21,7 @@
     "generate-test-types": "proto-loader-gen-types --keepCase --longs String --enums String --defaults --oneofs --includeComments --includeDirs proto/ -O test/generated --grpcLib=@grpc/grpc-js health/v1/health.proto"
   },
   "dependencies": {
-    "@grpc/proto-loader": "^0.7.10"
+    "@grpc/proto-loader": "^0.7.13"
   },
   "files": [
     "LICENSE",
diff --git a/packages/grpc-js-xds/README.md b/packages/grpc-js-xds/README.md
index c1db440cf..5b7a5400a 100644
--- a/packages/grpc-js-xds/README.md
+++ b/packages/grpc-js-xds/README.md
@@ -1,6 +1,6 @@
 # @grpc/grpc-js xDS plugin
 
-This package provides support for the `xds://` URL scheme to the `@grpc/grpc-js` library. The latest version of this package is compatible with `@grpc/grpc-js` version 1.9.x.
+This package provides support for the `xds://` URL scheme to the `@grpc/grpc-js` library. The latest version of this package is compatible with `@grpc/grpc-js` version 1.10.x.
 
 ## Installation
 
@@ -30,5 +30,8 @@ const client = new MyServiceClient('xds:///example.com:123');
  - [Client Status Discovery Service](https://github.com/grpc/proposal/blob/master/A40-csds-support.md)
  - [Outlier Detection](https://github.com/grpc/proposal/blob/master/A50-xds-outlier-detection.md)
  - [xDS Retry Support](https://github.com/grpc/proposal/blob/master/A44-xds-retry.md)
- - [xDS Aggregate and Logical DNS Clusters](https://github.com/grpc/proposal/blob/master/A37-xds-aggregate-and-logical-dns-clusters.md)'
+ - [xDS Aggregate and Logical DNS Clusters](https://github.com/grpc/proposal/blob/master/A37-xds-aggregate-and-logical-dns-clusters.md)
  - [xDS Federation](https://github.com/grpc/proposal/blob/master/A47-xds-federation.md) (Currently experimental, enabled by environment variable `GRPC_EXPERIMENTAL_XDS_FEDERATION`)
+ - [xDS Custom Load Balancer Configuration](https://github.com/grpc/proposal/blob/master/A52-xds-custom-lb-policies.md) (Custom load balancer registration not currently supported)
+ - [xDS Ring Hash LB Policy](https://github.com/grpc/proposal/blob/master/A42-xds-ring-hash-lb-policy.md)
+ - [`pick_first` via xDS](https://github.com/grpc/proposal/blob/master/A62-pick-first.md#pick_first-via-xds-1) (Currently experimental, enabled by environment variable `GRPC_EXPERIMENTAL_PICKFIRST_LB_CONFIG`)
diff --git a/packages/grpc-js-xds/gulpfile.ts b/packages/grpc-js-xds/gulpfile.ts
index becf109a6..47ca71324 100644
--- a/packages/grpc-js-xds/gulpfile.ts
+++ b/packages/grpc-js-xds/gulpfile.ts
@@ -62,10 +62,9 @@ const compile = checkTask(() => execNpmCommand('compile'));
 
 const runTests = checkTask(() => {
   process.env.GRPC_EXPERIMENTAL_XDS_FEDERATION = 'true';
-  process.env.GRPC_EXPERIMENTAL_XDS_CUSTOM_LB_CONFIG = 'true';
   process.env.GRPC_EXPERIMENTAL_PICKFIRST_LB_CONFIG = 'true';
-  if (Number(process.versions.node.split('.')[0]) > 14) {
-    process.env.GRPC_XDS_EXPERIMENTAL_ENABLE_RING_HASH = 'true';
+  if (Number(process.versions.node.split('.')[0]) <= 14) {
+    process.env.GRPC_XDS_EXPERIMENTAL_ENABLE_RING_HASH = 'false';
   }
   return gulp.src(`${outDir}/test/**/*.js`)
     .pipe(mocha({reporter: 'mocha-jenkins-reporter',
diff --git a/packages/grpc-js-xds/interop/Dockerfile b/packages/grpc-js-xds/interop/Dockerfile
index 6239b5f22..98f3cbad6 100644
--- a/packages/grpc-js-xds/interop/Dockerfile
+++ b/packages/grpc-js-xds/interop/Dockerfile
@@ -22,6 +22,8 @@ FROM node:18-slim as build
 WORKDIR /node/src/grpc-node
 COPY . .
 
+WORKDIR /node/src/grpc-node/packages/proto-loader
+RUN npm install
 WORKDIR /node/src/grpc-node/packages/grpc-js
 RUN npm install
 WORKDIR /node/src/grpc-node/packages/grpc-js-xds
@@ -29,6 +31,7 @@ RUN npm install
 
 FROM gcr.io/distroless/nodejs18-debian11:latest
 WORKDIR /node/src/grpc-node
+COPY --from=build /node/src/grpc-node/packages/proto-loader ./packages/proto-loader/
 COPY --from=build /node/src/grpc-node/packages/grpc-js ./packages/grpc-js/
 COPY --from=build /node/src/grpc-node/packages/grpc-js-xds ./packages/grpc-js-xds/
 
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/ClientConfigureRequest.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/ClientConfigureRequest.ts
index 7f07e8966..4128fdda4 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/ClientConfigureRequest.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/ClientConfigureRequest.ts
@@ -5,7 +5,7 @@
  * Metadata to be attached for the given type of RPCs.
  */
 export interface _grpc_testing_ClientConfigureRequest_Metadata {
-  'type'?: (_grpc_testing_ClientConfigureRequest_RpcType | keyof typeof _grpc_testing_ClientConfigureRequest_RpcType);
+  'type'?: (_grpc_testing_ClientConfigureRequest_RpcType);
   'key'?: (string);
   'value'?: (string);
 }
@@ -14,7 +14,7 @@ export interface _grpc_testing_ClientConfigureRequest_Metadata {
  * Metadata to be attached for the given type of RPCs.
  */
 export interface _grpc_testing_ClientConfigureRequest_Metadata__Output {
-  'type': (keyof typeof _grpc_testing_ClientConfigureRequest_RpcType);
+  'type': (_grpc_testing_ClientConfigureRequest_RpcType__Output);
   'key': (string);
   'value': (string);
 }
@@ -24,10 +24,24 @@ export interface _grpc_testing_ClientConfigureRequest_Metadata__Output {
 /**
  * Type of RPCs to send.
  */
-export enum _grpc_testing_ClientConfigureRequest_RpcType {
-  EMPTY_CALL = 0,
-  UNARY_CALL = 1,
-}
+export const _grpc_testing_ClientConfigureRequest_RpcType = {
+  EMPTY_CALL: 'EMPTY_CALL',
+  UNARY_CALL: 'UNARY_CALL',
+} as const;
+
+/**
+ * Type of RPCs to send.
+ */
+export type _grpc_testing_ClientConfigureRequest_RpcType =
+  | 'EMPTY_CALL'
+  | 0
+  | 'UNARY_CALL'
+  | 1
+
+/**
+ * Type of RPCs to send.
+ */
+export type _grpc_testing_ClientConfigureRequest_RpcType__Output = typeof _grpc_testing_ClientConfigureRequest_RpcType[keyof typeof _grpc_testing_ClientConfigureRequest_RpcType]
 
 /**
  * Configurations for a test client.
@@ -36,7 +50,7 @@ export interface ClientConfigureRequest {
   /**
    * The types of RPCs the client sends.
    */
-  'types'?: (_grpc_testing_ClientConfigureRequest_RpcType | keyof typeof _grpc_testing_ClientConfigureRequest_RpcType)[];
+  'types'?: (_grpc_testing_ClientConfigureRequest_RpcType)[];
   /**
    * The collection of custom metadata to be attached to RPCs sent by the client.
    */
@@ -55,7 +69,7 @@ export interface ClientConfigureRequest__Output {
   /**
    * The types of RPCs the client sends.
    */
-  'types': (keyof typeof _grpc_testing_ClientConfigureRequest_RpcType)[];
+  'types': (_grpc_testing_ClientConfigureRequest_RpcType__Output)[];
   /**
    * The collection of custom metadata to be attached to RPCs sent by the client.
    */
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/GrpclbRouteType.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/GrpclbRouteType.ts
index 8ab0146b7..667442b41 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/GrpclbRouteType.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/GrpclbRouteType.ts
@@ -8,17 +8,52 @@
  * the address of this server from the gRPCLB server BalanceLoad RPC). Exactly
  * how this detection is done is context and server dependent.
  */
-export enum GrpclbRouteType {
+export const GrpclbRouteType = {
   /**
    * Server didn't detect the route that a client took to reach it.
    */
-  GRPCLB_ROUTE_TYPE_UNKNOWN = 0,
+  GRPCLB_ROUTE_TYPE_UNKNOWN: 'GRPCLB_ROUTE_TYPE_UNKNOWN',
   /**
    * Indicates that a client reached a server via gRPCLB fallback.
    */
-  GRPCLB_ROUTE_TYPE_FALLBACK = 1,
+  GRPCLB_ROUTE_TYPE_FALLBACK: 'GRPCLB_ROUTE_TYPE_FALLBACK',
   /**
    * Indicates that a client reached a server as a gRPCLB-given backend.
    */
-  GRPCLB_ROUTE_TYPE_BACKEND = 2,
-}
+  GRPCLB_ROUTE_TYPE_BACKEND: 'GRPCLB_ROUTE_TYPE_BACKEND',
+} as const;
+
+/**
+ * The type of route that a client took to reach a server w.r.t. gRPCLB.
+ * The server must fill in "fallback" if it detects that the RPC reached
+ * the server via the "gRPCLB fallback" path, and "backend" if it detects
+ * that the RPC reached the server via "gRPCLB backend" path (i.e. if it got
+ * the address of this server from the gRPCLB server BalanceLoad RPC). Exactly
+ * how this detection is done is context and server dependent.
+ */
+export type GrpclbRouteType =
+  /**
+   * Server didn't detect the route that a client took to reach it.
+   */
+  | 'GRPCLB_ROUTE_TYPE_UNKNOWN'
+  | 0
+  /**
+   * Indicates that a client reached a server via gRPCLB fallback.
+   */
+  | 'GRPCLB_ROUTE_TYPE_FALLBACK'
+  | 1
+  /**
+   * Indicates that a client reached a server as a gRPCLB-given backend.
+   */
+  | 'GRPCLB_ROUTE_TYPE_BACKEND'
+  | 2
+
+/**
+ * The type of route that a client took to reach a server w.r.t. gRPCLB.
+ * The server must fill in "fallback" if it detects that the RPC reached
+ * the server via the "gRPCLB fallback" path, and "backend" if it detects
+ * that the RPC reached the server via "gRPCLB backend" path (i.e. if it got
+ * the address of this server from the gRPCLB server BalanceLoad RPC). Exactly
+ * how this detection is done is context and server dependent.
+ */
+export type GrpclbRouteType__Output = typeof GrpclbRouteType[keyof typeof GrpclbRouteType]
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/LoadBalancerAccumulatedStatsResponse.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/LoadBalancerAccumulatedStatsResponse.ts
index 91157ac4e..000ef9ecf 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/LoadBalancerAccumulatedStatsResponse.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/LoadBalancerAccumulatedStatsResponse.ts
@@ -32,16 +32,19 @@ export interface LoadBalancerAccumulatedStatsResponse {
   /**
    * The total number of RPCs have ever issued for each type.
    * Deprecated: use stats_per_method.rpcs_started instead.
+   * @deprecated
    */
   'num_rpcs_started_by_method'?: ({[key: string]: number});
   /**
    * The total number of RPCs have ever completed successfully for each type.
    * Deprecated: use stats_per_method.result instead.
+   * @deprecated
    */
   'num_rpcs_succeeded_by_method'?: ({[key: string]: number});
   /**
    * The total number of RPCs have ever failed for each type.
    * Deprecated: use stats_per_method.result instead.
+   * @deprecated
    */
   'num_rpcs_failed_by_method'?: ({[key: string]: number});
   /**
@@ -58,21 +61,24 @@ export interface LoadBalancerAccumulatedStatsResponse__Output {
   /**
    * The total number of RPCs have ever issued for each type.
    * Deprecated: use stats_per_method.rpcs_started instead.
+   * @deprecated
    */
   'num_rpcs_started_by_method': ({[key: string]: number});
   /**
    * The total number of RPCs have ever completed successfully for each type.
    * Deprecated: use stats_per_method.result instead.
+   * @deprecated
    */
   'num_rpcs_succeeded_by_method': ({[key: string]: number});
   /**
    * The total number of RPCs have ever failed for each type.
    * Deprecated: use stats_per_method.result instead.
+   * @deprecated
    */
   'num_rpcs_failed_by_method': ({[key: string]: number});
   /**
    * Per-method RPC statistics.  The key is the RpcType in string form; e.g.
    * 'EMPTY_CALL' or 'UNARY_CALL'
    */
-  'stats_per_method'?: ({[key: string]: _grpc_testing_LoadBalancerAccumulatedStatsResponse_MethodStats__Output});
+  'stats_per_method': ({[key: string]: _grpc_testing_LoadBalancerAccumulatedStatsResponse_MethodStats__Output});
 }
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/LoadBalancerStatsResponse.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/LoadBalancerStatsResponse.ts
index 184a6e258..ab33612c3 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/LoadBalancerStatsResponse.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/LoadBalancerStatsResponse.ts
@@ -36,5 +36,5 @@ export interface LoadBalancerStatsResponse__Output {
    * The number of RPCs that failed to record a remote peer.
    */
   'num_failures': (number);
-  'rpcs_by_method'?: ({[key: string]: _grpc_testing_LoadBalancerStatsResponse_RpcsByPeer__Output});
+  'rpcs_by_method': ({[key: string]: _grpc_testing_LoadBalancerStatsResponse_RpcsByPeer__Output});
 }
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/LoadBalancerStatsService.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/LoadBalancerStatsService.ts
index 26cfee9d7..9d11d9418 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/LoadBalancerStatsService.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/LoadBalancerStatsService.ts
@@ -1,6 +1,7 @@
 // Original file: proto/grpc/testing/test.proto
 
 import type * as grpc from '@grpc/grpc-js'
+import type { MethodDefinition } from '@grpc/proto-loader'
 import type { LoadBalancerAccumulatedStatsRequest as _grpc_testing_LoadBalancerAccumulatedStatsRequest, LoadBalancerAccumulatedStatsRequest__Output as _grpc_testing_LoadBalancerAccumulatedStatsRequest__Output } from '../../grpc/testing/LoadBalancerAccumulatedStatsRequest';
 import type { LoadBalancerAccumulatedStatsResponse as _grpc_testing_LoadBalancerAccumulatedStatsResponse, LoadBalancerAccumulatedStatsResponse__Output as _grpc_testing_LoadBalancerAccumulatedStatsResponse__Output } from '../../grpc/testing/LoadBalancerAccumulatedStatsResponse';
 import type { LoadBalancerStatsRequest as _grpc_testing_LoadBalancerStatsRequest, LoadBalancerStatsRequest__Output as _grpc_testing_LoadBalancerStatsRequest__Output } from '../../grpc/testing/LoadBalancerStatsRequest';
@@ -13,32 +14,32 @@ export interface LoadBalancerStatsServiceClient extends grpc.Client {
   /**
    * Gets the accumulated stats for RPCs sent by a test client.
    */
-  GetClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerAccumulatedStatsResponse__Output) => void): grpc.ClientUnaryCall;
-  GetClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerAccumulatedStatsResponse__Output) => void): grpc.ClientUnaryCall;
-  GetClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerAccumulatedStatsResponse__Output) => void): grpc.ClientUnaryCall;
-  GetClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerAccumulatedStatsResponse__Output) => void): grpc.ClientUnaryCall;
+  GetClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_LoadBalancerAccumulatedStatsResponse__Output>): grpc.ClientUnaryCall;
+  GetClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_LoadBalancerAccumulatedStatsResponse__Output>): grpc.ClientUnaryCall;
+  GetClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_LoadBalancerAccumulatedStatsResponse__Output>): grpc.ClientUnaryCall;
+  GetClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, callback: grpc.requestCallback<_grpc_testing_LoadBalancerAccumulatedStatsResponse__Output>): grpc.ClientUnaryCall;
   /**
    * Gets the accumulated stats for RPCs sent by a test client.
    */
-  getClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerAccumulatedStatsResponse__Output) => void): grpc.ClientUnaryCall;
-  getClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerAccumulatedStatsResponse__Output) => void): grpc.ClientUnaryCall;
-  getClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerAccumulatedStatsResponse__Output) => void): grpc.ClientUnaryCall;
-  getClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerAccumulatedStatsResponse__Output) => void): grpc.ClientUnaryCall;
+  getClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_LoadBalancerAccumulatedStatsResponse__Output>): grpc.ClientUnaryCall;
+  getClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_LoadBalancerAccumulatedStatsResponse__Output>): grpc.ClientUnaryCall;
+  getClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_LoadBalancerAccumulatedStatsResponse__Output>): grpc.ClientUnaryCall;
+  getClientAccumulatedStats(argument: _grpc_testing_LoadBalancerAccumulatedStatsRequest, callback: grpc.requestCallback<_grpc_testing_LoadBalancerAccumulatedStatsResponse__Output>): grpc.ClientUnaryCall;
   
   /**
    * Gets the backend distribution for RPCs sent by a test client.
    */
-  GetClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerStatsResponse__Output) => void): grpc.ClientUnaryCall;
-  GetClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerStatsResponse__Output) => void): grpc.ClientUnaryCall;
-  GetClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerStatsResponse__Output) => void): grpc.ClientUnaryCall;
-  GetClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerStatsResponse__Output) => void): grpc.ClientUnaryCall;
+  GetClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_LoadBalancerStatsResponse__Output>): grpc.ClientUnaryCall;
+  GetClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_LoadBalancerStatsResponse__Output>): grpc.ClientUnaryCall;
+  GetClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_LoadBalancerStatsResponse__Output>): grpc.ClientUnaryCall;
+  GetClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, callback: grpc.requestCallback<_grpc_testing_LoadBalancerStatsResponse__Output>): grpc.ClientUnaryCall;
   /**
    * Gets the backend distribution for RPCs sent by a test client.
    */
-  getClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerStatsResponse__Output) => void): grpc.ClientUnaryCall;
-  getClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerStatsResponse__Output) => void): grpc.ClientUnaryCall;
-  getClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerStatsResponse__Output) => void): grpc.ClientUnaryCall;
-  getClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, callback: (error?: grpc.ServiceError, result?: _grpc_testing_LoadBalancerStatsResponse__Output) => void): grpc.ClientUnaryCall;
+  getClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_LoadBalancerStatsResponse__Output>): grpc.ClientUnaryCall;
+  getClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_LoadBalancerStatsResponse__Output>): grpc.ClientUnaryCall;
+  getClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_LoadBalancerStatsResponse__Output>): grpc.ClientUnaryCall;
+  getClientStats(argument: _grpc_testing_LoadBalancerStatsRequest, callback: grpc.requestCallback<_grpc_testing_LoadBalancerStatsResponse__Output>): grpc.ClientUnaryCall;
   
 }
 
@@ -57,3 +58,8 @@ export interface LoadBalancerStatsServiceHandlers extends grpc.UntypedServiceImp
   GetClientStats: grpc.handleUnaryCall<_grpc_testing_LoadBalancerStatsRequest__Output, _grpc_testing_LoadBalancerStatsResponse>;
   
 }
+
+export interface LoadBalancerStatsServiceDefinition extends grpc.ServiceDefinition {
+  GetClientAccumulatedStats: MethodDefinition<_grpc_testing_LoadBalancerAccumulatedStatsRequest, _grpc_testing_LoadBalancerAccumulatedStatsResponse, _grpc_testing_LoadBalancerAccumulatedStatsRequest__Output, _grpc_testing_LoadBalancerAccumulatedStatsResponse__Output>
+  GetClientStats: MethodDefinition<_grpc_testing_LoadBalancerStatsRequest, _grpc_testing_LoadBalancerStatsResponse, _grpc_testing_LoadBalancerStatsRequest__Output, _grpc_testing_LoadBalancerStatsResponse__Output>
+}
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/Payload.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/Payload.ts
index 79102d2bf..17eb9e60a 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/Payload.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/Payload.ts
@@ -1,6 +1,6 @@
 // Original file: proto/grpc/testing/messages.proto
 
-import type { PayloadType as _grpc_testing_PayloadType } from '../../grpc/testing/PayloadType';
+import type { PayloadType as _grpc_testing_PayloadType, PayloadType__Output as _grpc_testing_PayloadType__Output } from '../../grpc/testing/PayloadType';
 
 /**
  * A block of data, to simply increase gRPC message size.
@@ -9,7 +9,7 @@ export interface Payload {
   /**
    * The type of data in body.
    */
-  'type'?: (_grpc_testing_PayloadType | keyof typeof _grpc_testing_PayloadType);
+  'type'?: (_grpc_testing_PayloadType);
   /**
    * Primary contents of payload.
    */
@@ -23,7 +23,7 @@ export interface Payload__Output {
   /**
    * The type of data in body.
    */
-  'type': (keyof typeof _grpc_testing_PayloadType);
+  'type': (_grpc_testing_PayloadType__Output);
   /**
    * Primary contents of payload.
    */
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/PayloadType.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/PayloadType.ts
index 3cf9d375a..64e526090 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/PayloadType.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/PayloadType.ts
@@ -3,9 +3,24 @@
 /**
  * The type of payload that should be returned.
  */
-export enum PayloadType {
+export const PayloadType = {
   /**
    * Compressable text format.
    */
-  COMPRESSABLE = 0,
-}
+  COMPRESSABLE: 'COMPRESSABLE',
+} as const;
+
+/**
+ * The type of payload that should be returned.
+ */
+export type PayloadType =
+  /**
+   * Compressable text format.
+   */
+  | 'COMPRESSABLE'
+  | 0
+
+/**
+ * The type of payload that should be returned.
+ */
+export type PayloadType__Output = typeof PayloadType[keyof typeof PayloadType]
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/ReconnectService.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/ReconnectService.ts
index e489e2849..2e3f25680 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/ReconnectService.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/ReconnectService.ts
@@ -1,6 +1,7 @@
 // Original file: proto/grpc/testing/test.proto
 
 import type * as grpc from '@grpc/grpc-js'
+import type { MethodDefinition } from '@grpc/proto-loader'
 import type { Empty as _grpc_testing_Empty, Empty__Output as _grpc_testing_Empty__Output } from '../../grpc/testing/Empty';
 import type { ReconnectInfo as _grpc_testing_ReconnectInfo, ReconnectInfo__Output as _grpc_testing_ReconnectInfo__Output } from '../../grpc/testing/ReconnectInfo';
 import type { ReconnectParams as _grpc_testing_ReconnectParams, ReconnectParams__Output as _grpc_testing_ReconnectParams__Output } from '../../grpc/testing/ReconnectParams';
@@ -9,23 +10,23 @@ import type { ReconnectParams as _grpc_testing_ReconnectParams, ReconnectParams_
  * A service used to control reconnect server.
  */
 export interface ReconnectServiceClient extends grpc.Client {
-  Start(argument: _grpc_testing_ReconnectParams, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  Start(argument: _grpc_testing_ReconnectParams, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  Start(argument: _grpc_testing_ReconnectParams, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  Start(argument: _grpc_testing_ReconnectParams, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  start(argument: _grpc_testing_ReconnectParams, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  start(argument: _grpc_testing_ReconnectParams, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  start(argument: _grpc_testing_ReconnectParams, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  start(argument: _grpc_testing_ReconnectParams, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
+  Start(argument: _grpc_testing_ReconnectParams, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  Start(argument: _grpc_testing_ReconnectParams, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  Start(argument: _grpc_testing_ReconnectParams, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  Start(argument: _grpc_testing_ReconnectParams, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  start(argument: _grpc_testing_ReconnectParams, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  start(argument: _grpc_testing_ReconnectParams, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  start(argument: _grpc_testing_ReconnectParams, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  start(argument: _grpc_testing_ReconnectParams, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
   
-  Stop(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ReconnectInfo__Output) => void): grpc.ClientUnaryCall;
-  Stop(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ReconnectInfo__Output) => void): grpc.ClientUnaryCall;
-  Stop(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ReconnectInfo__Output) => void): grpc.ClientUnaryCall;
-  Stop(argument: _grpc_testing_Empty, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ReconnectInfo__Output) => void): grpc.ClientUnaryCall;
-  stop(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ReconnectInfo__Output) => void): grpc.ClientUnaryCall;
-  stop(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ReconnectInfo__Output) => void): grpc.ClientUnaryCall;
-  stop(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ReconnectInfo__Output) => void): grpc.ClientUnaryCall;
-  stop(argument: _grpc_testing_Empty, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ReconnectInfo__Output) => void): grpc.ClientUnaryCall;
+  Stop(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_ReconnectInfo__Output>): grpc.ClientUnaryCall;
+  Stop(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_ReconnectInfo__Output>): grpc.ClientUnaryCall;
+  Stop(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_ReconnectInfo__Output>): grpc.ClientUnaryCall;
+  Stop(argument: _grpc_testing_Empty, callback: grpc.requestCallback<_grpc_testing_ReconnectInfo__Output>): grpc.ClientUnaryCall;
+  stop(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_ReconnectInfo__Output>): grpc.ClientUnaryCall;
+  stop(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_ReconnectInfo__Output>): grpc.ClientUnaryCall;
+  stop(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_ReconnectInfo__Output>): grpc.ClientUnaryCall;
+  stop(argument: _grpc_testing_Empty, callback: grpc.requestCallback<_grpc_testing_ReconnectInfo__Output>): grpc.ClientUnaryCall;
   
 }
 
@@ -38,3 +39,8 @@ export interface ReconnectServiceHandlers extends grpc.UntypedServiceImplementat
   Stop: grpc.handleUnaryCall<_grpc_testing_Empty__Output, _grpc_testing_ReconnectInfo>;
   
 }
+
+export interface ReconnectServiceDefinition extends grpc.ServiceDefinition {
+  Start: MethodDefinition<_grpc_testing_ReconnectParams, _grpc_testing_Empty, _grpc_testing_ReconnectParams__Output, _grpc_testing_Empty__Output>
+  Stop: MethodDefinition<_grpc_testing_Empty, _grpc_testing_ReconnectInfo, _grpc_testing_Empty__Output, _grpc_testing_ReconnectInfo__Output>
+}
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/ResponseParameters.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/ResponseParameters.ts
index 04ca94ced..15f2f01f4 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/ResponseParameters.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/ResponseParameters.ts
@@ -21,7 +21,7 @@ export interface ResponseParameters {
    * implement the full compression tests by introspecting the call to verify
    * the response's compression status.
    */
-  'compressed'?: (_grpc_testing_BoolValue);
+  'compressed'?: (_grpc_testing_BoolValue | null);
 }
 
 /**
@@ -43,5 +43,5 @@ export interface ResponseParameters__Output {
    * implement the full compression tests by introspecting the call to verify
    * the response's compression status.
    */
-  'compressed'?: (_grpc_testing_BoolValue__Output);
+  'compressed': (_grpc_testing_BoolValue__Output | null);
 }
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/SimpleRequest.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/SimpleRequest.ts
index 056eb10b2..21843af69 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/SimpleRequest.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/SimpleRequest.ts
@@ -1,6 +1,6 @@
 // Original file: proto/grpc/testing/messages.proto
 
-import type { PayloadType as _grpc_testing_PayloadType } from '../../grpc/testing/PayloadType';
+import type { PayloadType as _grpc_testing_PayloadType, PayloadType__Output as _grpc_testing_PayloadType__Output } from '../../grpc/testing/PayloadType';
 import type { Payload as _grpc_testing_Payload, Payload__Output as _grpc_testing_Payload__Output } from '../../grpc/testing/Payload';
 import type { BoolValue as _grpc_testing_BoolValue, BoolValue__Output as _grpc_testing_BoolValue__Output } from '../../grpc/testing/BoolValue';
 import type { EchoStatus as _grpc_testing_EchoStatus, EchoStatus__Output as _grpc_testing_EchoStatus__Output } from '../../grpc/testing/EchoStatus';
@@ -13,7 +13,7 @@ export interface SimpleRequest {
    * Desired payload type in the response from the server.
    * If response_type is RANDOM, server randomly chooses one from other formats.
    */
-  'response_type'?: (_grpc_testing_PayloadType | keyof typeof _grpc_testing_PayloadType);
+  'response_type'?: (_grpc_testing_PayloadType);
   /**
    * Desired payload size in the response from the server.
    */
@@ -21,7 +21,7 @@ export interface SimpleRequest {
   /**
    * Optional input payload sent along with the request.
    */
-  'payload'?: (_grpc_testing_Payload);
+  'payload'?: (_grpc_testing_Payload | null);
   /**
    * Whether SimpleResponse should include username.
    */
@@ -36,15 +36,15 @@ export interface SimpleRequest {
    * implement the full compression tests by introspecting the call to verify
    * the response's compression status.
    */
-  'response_compressed'?: (_grpc_testing_BoolValue);
+  'response_compressed'?: (_grpc_testing_BoolValue | null);
   /**
    * Whether server should return a given status
    */
-  'response_status'?: (_grpc_testing_EchoStatus);
+  'response_status'?: (_grpc_testing_EchoStatus | null);
   /**
    * Whether the server should expect this request to be compressed.
    */
-  'expect_compressed'?: (_grpc_testing_BoolValue);
+  'expect_compressed'?: (_grpc_testing_BoolValue | null);
   /**
    * Whether SimpleResponse should include server_id.
    */
@@ -63,7 +63,7 @@ export interface SimpleRequest__Output {
    * Desired payload type in the response from the server.
    * If response_type is RANDOM, server randomly chooses one from other formats.
    */
-  'response_type': (keyof typeof _grpc_testing_PayloadType);
+  'response_type': (_grpc_testing_PayloadType__Output);
   /**
    * Desired payload size in the response from the server.
    */
@@ -71,7 +71,7 @@ export interface SimpleRequest__Output {
   /**
    * Optional input payload sent along with the request.
    */
-  'payload'?: (_grpc_testing_Payload__Output);
+  'payload': (_grpc_testing_Payload__Output | null);
   /**
    * Whether SimpleResponse should include username.
    */
@@ -86,15 +86,15 @@ export interface SimpleRequest__Output {
    * implement the full compression tests by introspecting the call to verify
    * the response's compression status.
    */
-  'response_compressed'?: (_grpc_testing_BoolValue__Output);
+  'response_compressed': (_grpc_testing_BoolValue__Output | null);
   /**
    * Whether server should return a given status
    */
-  'response_status'?: (_grpc_testing_EchoStatus__Output);
+  'response_status': (_grpc_testing_EchoStatus__Output | null);
   /**
    * Whether the server should expect this request to be compressed.
    */
-  'expect_compressed'?: (_grpc_testing_BoolValue__Output);
+  'expect_compressed': (_grpc_testing_BoolValue__Output | null);
   /**
    * Whether SimpleResponse should include server_id.
    */
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/SimpleResponse.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/SimpleResponse.ts
index 661f336ce..b737c31fa 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/SimpleResponse.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/SimpleResponse.ts
@@ -1,7 +1,7 @@
 // Original file: proto/grpc/testing/messages.proto
 
 import type { Payload as _grpc_testing_Payload, Payload__Output as _grpc_testing_Payload__Output } from '../../grpc/testing/Payload';
-import type { GrpclbRouteType as _grpc_testing_GrpclbRouteType } from '../../grpc/testing/GrpclbRouteType';
+import type { GrpclbRouteType as _grpc_testing_GrpclbRouteType, GrpclbRouteType__Output as _grpc_testing_GrpclbRouteType__Output } from '../../grpc/testing/GrpclbRouteType';
 
 /**
  * Unary response, as configured by the request.
@@ -10,7 +10,7 @@ export interface SimpleResponse {
   /**
    * Payload to increase message size.
    */
-  'payload'?: (_grpc_testing_Payload);
+  'payload'?: (_grpc_testing_Payload | null);
   /**
    * The user the request came from, for verifying authentication was
    * successful when the client expected it.
@@ -28,7 +28,7 @@ export interface SimpleResponse {
   /**
    * gRPCLB Path.
    */
-  'grpclb_route_type'?: (_grpc_testing_GrpclbRouteType | keyof typeof _grpc_testing_GrpclbRouteType);
+  'grpclb_route_type'?: (_grpc_testing_GrpclbRouteType);
   /**
    * Server hostname.
    */
@@ -42,7 +42,7 @@ export interface SimpleResponse__Output {
   /**
    * Payload to increase message size.
    */
-  'payload'?: (_grpc_testing_Payload__Output);
+  'payload': (_grpc_testing_Payload__Output | null);
   /**
    * The user the request came from, for verifying authentication was
    * successful when the client expected it.
@@ -60,7 +60,7 @@ export interface SimpleResponse__Output {
   /**
    * gRPCLB Path.
    */
-  'grpclb_route_type': (keyof typeof _grpc_testing_GrpclbRouteType);
+  'grpclb_route_type': (_grpc_testing_GrpclbRouteType__Output);
   /**
    * Server hostname.
    */
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/StreamingInputCallRequest.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/StreamingInputCallRequest.ts
index 56ad2b217..f45568849 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/StreamingInputCallRequest.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/StreamingInputCallRequest.ts
@@ -10,14 +10,14 @@ export interface StreamingInputCallRequest {
   /**
    * Optional input payload sent along with the request.
    */
-  'payload'?: (_grpc_testing_Payload);
+  'payload'?: (_grpc_testing_Payload | null);
   /**
    * Whether the server should expect this request to be compressed. This field
    * is "nullable" in order to interoperate seamlessly with servers not able to
    * implement the full compression tests by introspecting the call to verify
    * the request's compression status.
    */
-  'expect_compressed'?: (_grpc_testing_BoolValue);
+  'expect_compressed'?: (_grpc_testing_BoolValue | null);
 }
 
 /**
@@ -27,12 +27,12 @@ export interface StreamingInputCallRequest__Output {
   /**
    * Optional input payload sent along with the request.
    */
-  'payload'?: (_grpc_testing_Payload__Output);
+  'payload': (_grpc_testing_Payload__Output | null);
   /**
    * Whether the server should expect this request to be compressed. This field
    * is "nullable" in order to interoperate seamlessly with servers not able to
    * implement the full compression tests by introspecting the call to verify
    * the request's compression status.
    */
-  'expect_compressed'?: (_grpc_testing_BoolValue__Output);
+  'expect_compressed': (_grpc_testing_BoolValue__Output | null);
 }
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/StreamingOutputCallRequest.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/StreamingOutputCallRequest.ts
index 52922062d..0d812b74f 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/StreamingOutputCallRequest.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/StreamingOutputCallRequest.ts
@@ -1,6 +1,6 @@
 // Original file: proto/grpc/testing/messages.proto
 
-import type { PayloadType as _grpc_testing_PayloadType } from '../../grpc/testing/PayloadType';
+import type { PayloadType as _grpc_testing_PayloadType, PayloadType__Output as _grpc_testing_PayloadType__Output } from '../../grpc/testing/PayloadType';
 import type { ResponseParameters as _grpc_testing_ResponseParameters, ResponseParameters__Output as _grpc_testing_ResponseParameters__Output } from '../../grpc/testing/ResponseParameters';
 import type { Payload as _grpc_testing_Payload, Payload__Output as _grpc_testing_Payload__Output } from '../../grpc/testing/Payload';
 import type { EchoStatus as _grpc_testing_EchoStatus, EchoStatus__Output as _grpc_testing_EchoStatus__Output } from '../../grpc/testing/EchoStatus';
@@ -15,7 +15,7 @@ export interface StreamingOutputCallRequest {
    * might be of different types. This is to simulate a mixed type of payload
    * stream.
    */
-  'response_type'?: (_grpc_testing_PayloadType | keyof typeof _grpc_testing_PayloadType);
+  'response_type'?: (_grpc_testing_PayloadType);
   /**
    * Configuration for each expected response message.
    */
@@ -23,11 +23,11 @@ export interface StreamingOutputCallRequest {
   /**
    * Optional input payload sent along with the request.
    */
-  'payload'?: (_grpc_testing_Payload);
+  'payload'?: (_grpc_testing_Payload | null);
   /**
    * Whether server should return a given status
    */
-  'response_status'?: (_grpc_testing_EchoStatus);
+  'response_status'?: (_grpc_testing_EchoStatus | null);
 }
 
 /**
@@ -40,7 +40,7 @@ export interface StreamingOutputCallRequest__Output {
    * might be of different types. This is to simulate a mixed type of payload
    * stream.
    */
-  'response_type': (keyof typeof _grpc_testing_PayloadType);
+  'response_type': (_grpc_testing_PayloadType__Output);
   /**
    * Configuration for each expected response message.
    */
@@ -48,9 +48,9 @@ export interface StreamingOutputCallRequest__Output {
   /**
    * Optional input payload sent along with the request.
    */
-  'payload'?: (_grpc_testing_Payload__Output);
+  'payload': (_grpc_testing_Payload__Output | null);
   /**
    * Whether server should return a given status
    */
-  'response_status'?: (_grpc_testing_EchoStatus__Output);
+  'response_status': (_grpc_testing_EchoStatus__Output | null);
 }
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/StreamingOutputCallResponse.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/StreamingOutputCallResponse.ts
index 19ab306dd..e2eb435cd 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/StreamingOutputCallResponse.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/StreamingOutputCallResponse.ts
@@ -9,7 +9,7 @@ export interface StreamingOutputCallResponse {
   /**
    * Payload to increase response size.
    */
-  'payload'?: (_grpc_testing_Payload);
+  'payload'?: (_grpc_testing_Payload | null);
 }
 
 /**
@@ -19,5 +19,5 @@ export interface StreamingOutputCallResponse__Output {
   /**
    * Payload to increase response size.
    */
-  'payload'?: (_grpc_testing_Payload__Output);
+  'payload': (_grpc_testing_Payload__Output | null);
 }
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/TestService.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/TestService.ts
index dbb606c83..139d3c0ef 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/TestService.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/TestService.ts
@@ -1,6 +1,7 @@
 // Original file: proto/grpc/testing/test.proto
 
 import type * as grpc from '@grpc/grpc-js'
+import type { MethodDefinition } from '@grpc/proto-loader'
 import type { Empty as _grpc_testing_Empty, Empty__Output as _grpc_testing_Empty__Output } from '../../grpc/testing/Empty';
 import type { SimpleRequest as _grpc_testing_SimpleRequest, SimpleRequest__Output as _grpc_testing_SimpleRequest__Output } from '../../grpc/testing/SimpleRequest';
 import type { SimpleResponse as _grpc_testing_SimpleResponse, SimpleResponse__Output as _grpc_testing_SimpleResponse__Output } from '../../grpc/testing/SimpleResponse';
@@ -19,34 +20,34 @@ export interface TestServiceClient extends grpc.Client {
    * headers set such that a caching HTTP proxy (such as GFE) can
    * satisfy subsequent requests.
    */
-  CacheableUnaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
-  CacheableUnaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
-  CacheableUnaryCall(argument: _grpc_testing_SimpleRequest, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
-  CacheableUnaryCall(argument: _grpc_testing_SimpleRequest, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
+  CacheableUnaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
+  CacheableUnaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
+  CacheableUnaryCall(argument: _grpc_testing_SimpleRequest, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
+  CacheableUnaryCall(argument: _grpc_testing_SimpleRequest, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
   /**
    * One request followed by one response. Response has cache control
    * headers set such that a caching HTTP proxy (such as GFE) can
    * satisfy subsequent requests.
    */
-  cacheableUnaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
-  cacheableUnaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
-  cacheableUnaryCall(argument: _grpc_testing_SimpleRequest, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
-  cacheableUnaryCall(argument: _grpc_testing_SimpleRequest, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
+  cacheableUnaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
+  cacheableUnaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
+  cacheableUnaryCall(argument: _grpc_testing_SimpleRequest, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
+  cacheableUnaryCall(argument: _grpc_testing_SimpleRequest, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
   
   /**
    * One empty request followed by one empty response.
    */
-  EmptyCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  EmptyCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  EmptyCall(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  EmptyCall(argument: _grpc_testing_Empty, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
+  EmptyCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  EmptyCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  EmptyCall(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  EmptyCall(argument: _grpc_testing_Empty, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
   /**
    * One empty request followed by one empty response.
    */
-  emptyCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  emptyCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  emptyCall(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  emptyCall(argument: _grpc_testing_Empty, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
+  emptyCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  emptyCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  emptyCall(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  emptyCall(argument: _grpc_testing_Empty, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
   
   /**
    * A sequence of requests with each request served by the server immediately.
@@ -84,18 +85,18 @@ export interface TestServiceClient extends grpc.Client {
    * A sequence of requests followed by one response (streamed upload).
    * The server returns the aggregated size of client payload as the result.
    */
-  StreamingInputCall(metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_StreamingInputCallResponse__Output) => void): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
-  StreamingInputCall(metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_StreamingInputCallResponse__Output) => void): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
-  StreamingInputCall(options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_StreamingInputCallResponse__Output) => void): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
-  StreamingInputCall(callback: (error?: grpc.ServiceError, result?: _grpc_testing_StreamingInputCallResponse__Output) => void): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
+  StreamingInputCall(metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_StreamingInputCallResponse__Output>): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
+  StreamingInputCall(metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_StreamingInputCallResponse__Output>): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
+  StreamingInputCall(options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_StreamingInputCallResponse__Output>): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
+  StreamingInputCall(callback: grpc.requestCallback<_grpc_testing_StreamingInputCallResponse__Output>): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
   /**
    * A sequence of requests followed by one response (streamed upload).
    * The server returns the aggregated size of client payload as the result.
    */
-  streamingInputCall(metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_StreamingInputCallResponse__Output) => void): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
-  streamingInputCall(metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_StreamingInputCallResponse__Output) => void): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
-  streamingInputCall(options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_StreamingInputCallResponse__Output) => void): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
-  streamingInputCall(callback: (error?: grpc.ServiceError, result?: _grpc_testing_StreamingInputCallResponse__Output) => void): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
+  streamingInputCall(metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_StreamingInputCallResponse__Output>): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
+  streamingInputCall(metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_StreamingInputCallResponse__Output>): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
+  streamingInputCall(options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_StreamingInputCallResponse__Output>): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
+  streamingInputCall(callback: grpc.requestCallback<_grpc_testing_StreamingInputCallResponse__Output>): grpc.ClientWritableStream<_grpc_testing_StreamingInputCallRequest>;
   
   /**
    * One request followed by a sequence of responses (streamed download).
@@ -113,34 +114,34 @@ export interface TestServiceClient extends grpc.Client {
   /**
    * One request followed by one response.
    */
-  UnaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
-  UnaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
-  UnaryCall(argument: _grpc_testing_SimpleRequest, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
-  UnaryCall(argument: _grpc_testing_SimpleRequest, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
+  UnaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
+  UnaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
+  UnaryCall(argument: _grpc_testing_SimpleRequest, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
+  UnaryCall(argument: _grpc_testing_SimpleRequest, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
   /**
    * One request followed by one response.
    */
-  unaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
-  unaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
-  unaryCall(argument: _grpc_testing_SimpleRequest, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
-  unaryCall(argument: _grpc_testing_SimpleRequest, callback: (error?: grpc.ServiceError, result?: _grpc_testing_SimpleResponse__Output) => void): grpc.ClientUnaryCall;
+  unaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
+  unaryCall(argument: _grpc_testing_SimpleRequest, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
+  unaryCall(argument: _grpc_testing_SimpleRequest, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
+  unaryCall(argument: _grpc_testing_SimpleRequest, callback: grpc.requestCallback<_grpc_testing_SimpleResponse__Output>): grpc.ClientUnaryCall;
   
   /**
    * The test server will not implement this method. It will be used
    * to test the behavior when clients call unimplemented methods.
    */
-  UnimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  UnimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  UnimplementedCall(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  UnimplementedCall(argument: _grpc_testing_Empty, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
+  UnimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  UnimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  UnimplementedCall(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  UnimplementedCall(argument: _grpc_testing_Empty, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
   /**
    * The test server will not implement this method. It will be used
    * to test the behavior when clients call unimplemented methods.
    */
-  unimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  unimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  unimplementedCall(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  unimplementedCall(argument: _grpc_testing_Empty, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
+  unimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  unimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  unimplementedCall(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  unimplementedCall(argument: _grpc_testing_Empty, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
   
 }
 
@@ -200,3 +201,14 @@ export interface TestServiceHandlers extends grpc.UntypedServiceImplementation {
   UnimplementedCall: grpc.handleUnaryCall<_grpc_testing_Empty__Output, _grpc_testing_Empty>;
   
 }
+
+export interface TestServiceDefinition extends grpc.ServiceDefinition {
+  CacheableUnaryCall: MethodDefinition<_grpc_testing_SimpleRequest, _grpc_testing_SimpleResponse, _grpc_testing_SimpleRequest__Output, _grpc_testing_SimpleResponse__Output>
+  EmptyCall: MethodDefinition<_grpc_testing_Empty, _grpc_testing_Empty, _grpc_testing_Empty__Output, _grpc_testing_Empty__Output>
+  FullDuplexCall: MethodDefinition<_grpc_testing_StreamingOutputCallRequest, _grpc_testing_StreamingOutputCallResponse, _grpc_testing_StreamingOutputCallRequest__Output, _grpc_testing_StreamingOutputCallResponse__Output>
+  HalfDuplexCall: MethodDefinition<_grpc_testing_StreamingOutputCallRequest, _grpc_testing_StreamingOutputCallResponse, _grpc_testing_StreamingOutputCallRequest__Output, _grpc_testing_StreamingOutputCallResponse__Output>
+  StreamingInputCall: MethodDefinition<_grpc_testing_StreamingInputCallRequest, _grpc_testing_StreamingInputCallResponse, _grpc_testing_StreamingInputCallRequest__Output, _grpc_testing_StreamingInputCallResponse__Output>
+  StreamingOutputCall: MethodDefinition<_grpc_testing_StreamingOutputCallRequest, _grpc_testing_StreamingOutputCallResponse, _grpc_testing_StreamingOutputCallRequest__Output, _grpc_testing_StreamingOutputCallResponse__Output>
+  UnaryCall: MethodDefinition<_grpc_testing_SimpleRequest, _grpc_testing_SimpleResponse, _grpc_testing_SimpleRequest__Output, _grpc_testing_SimpleResponse__Output>
+  UnimplementedCall: MethodDefinition<_grpc_testing_Empty, _grpc_testing_Empty, _grpc_testing_Empty__Output, _grpc_testing_Empty__Output>
+}
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/UnimplementedService.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/UnimplementedService.ts
index d21dfcd0f..aea5d8b4a 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/UnimplementedService.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/UnimplementedService.ts
@@ -1,6 +1,7 @@
 // Original file: proto/grpc/testing/test.proto
 
 import type * as grpc from '@grpc/grpc-js'
+import type { MethodDefinition } from '@grpc/proto-loader'
 import type { Empty as _grpc_testing_Empty, Empty__Output as _grpc_testing_Empty__Output } from '../../grpc/testing/Empty';
 
 /**
@@ -11,17 +12,17 @@ export interface UnimplementedServiceClient extends grpc.Client {
   /**
    * A call that no server should implement
    */
-  UnimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  UnimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  UnimplementedCall(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  UnimplementedCall(argument: _grpc_testing_Empty, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
+  UnimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  UnimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  UnimplementedCall(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  UnimplementedCall(argument: _grpc_testing_Empty, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
   /**
    * A call that no server should implement
    */
-  unimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  unimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  unimplementedCall(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  unimplementedCall(argument: _grpc_testing_Empty, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
+  unimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  unimplementedCall(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  unimplementedCall(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  unimplementedCall(argument: _grpc_testing_Empty, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
   
 }
 
@@ -36,3 +37,7 @@ export interface UnimplementedServiceHandlers extends grpc.UntypedServiceImpleme
   UnimplementedCall: grpc.handleUnaryCall<_grpc_testing_Empty__Output, _grpc_testing_Empty>;
   
 }
+
+export interface UnimplementedServiceDefinition extends grpc.ServiceDefinition {
+  UnimplementedCall: MethodDefinition<_grpc_testing_Empty, _grpc_testing_Empty, _grpc_testing_Empty__Output, _grpc_testing_Empty__Output>
+}
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/XdsUpdateClientConfigureService.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/XdsUpdateClientConfigureService.ts
index 22947619c..76826b812 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/XdsUpdateClientConfigureService.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/XdsUpdateClientConfigureService.ts
@@ -1,6 +1,7 @@
 // Original file: proto/grpc/testing/test.proto
 
 import type * as grpc from '@grpc/grpc-js'
+import type { MethodDefinition } from '@grpc/proto-loader'
 import type { ClientConfigureRequest as _grpc_testing_ClientConfigureRequest, ClientConfigureRequest__Output as _grpc_testing_ClientConfigureRequest__Output } from '../../grpc/testing/ClientConfigureRequest';
 import type { ClientConfigureResponse as _grpc_testing_ClientConfigureResponse, ClientConfigureResponse__Output as _grpc_testing_ClientConfigureResponse__Output } from '../../grpc/testing/ClientConfigureResponse';
 
@@ -11,17 +12,17 @@ export interface XdsUpdateClientConfigureServiceClient extends grpc.Client {
   /**
    * Update the tes client's configuration.
    */
-  Configure(argument: _grpc_testing_ClientConfigureRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ClientConfigureResponse__Output) => void): grpc.ClientUnaryCall;
-  Configure(argument: _grpc_testing_ClientConfigureRequest, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ClientConfigureResponse__Output) => void): grpc.ClientUnaryCall;
-  Configure(argument: _grpc_testing_ClientConfigureRequest, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ClientConfigureResponse__Output) => void): grpc.ClientUnaryCall;
-  Configure(argument: _grpc_testing_ClientConfigureRequest, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ClientConfigureResponse__Output) => void): grpc.ClientUnaryCall;
+  Configure(argument: _grpc_testing_ClientConfigureRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_ClientConfigureResponse__Output>): grpc.ClientUnaryCall;
+  Configure(argument: _grpc_testing_ClientConfigureRequest, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_ClientConfigureResponse__Output>): grpc.ClientUnaryCall;
+  Configure(argument: _grpc_testing_ClientConfigureRequest, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_ClientConfigureResponse__Output>): grpc.ClientUnaryCall;
+  Configure(argument: _grpc_testing_ClientConfigureRequest, callback: grpc.requestCallback<_grpc_testing_ClientConfigureResponse__Output>): grpc.ClientUnaryCall;
   /**
    * Update the tes client's configuration.
    */
-  configure(argument: _grpc_testing_ClientConfigureRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ClientConfigureResponse__Output) => void): grpc.ClientUnaryCall;
-  configure(argument: _grpc_testing_ClientConfigureRequest, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ClientConfigureResponse__Output) => void): grpc.ClientUnaryCall;
-  configure(argument: _grpc_testing_ClientConfigureRequest, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ClientConfigureResponse__Output) => void): grpc.ClientUnaryCall;
-  configure(argument: _grpc_testing_ClientConfigureRequest, callback: (error?: grpc.ServiceError, result?: _grpc_testing_ClientConfigureResponse__Output) => void): grpc.ClientUnaryCall;
+  configure(argument: _grpc_testing_ClientConfigureRequest, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_ClientConfigureResponse__Output>): grpc.ClientUnaryCall;
+  configure(argument: _grpc_testing_ClientConfigureRequest, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_ClientConfigureResponse__Output>): grpc.ClientUnaryCall;
+  configure(argument: _grpc_testing_ClientConfigureRequest, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_ClientConfigureResponse__Output>): grpc.ClientUnaryCall;
+  configure(argument: _grpc_testing_ClientConfigureRequest, callback: grpc.requestCallback<_grpc_testing_ClientConfigureResponse__Output>): grpc.ClientUnaryCall;
   
 }
 
@@ -35,3 +36,7 @@ export interface XdsUpdateClientConfigureServiceHandlers extends grpc.UntypedSer
   Configure: grpc.handleUnaryCall<_grpc_testing_ClientConfigureRequest__Output, _grpc_testing_ClientConfigureResponse>;
   
 }
+
+export interface XdsUpdateClientConfigureServiceDefinition extends grpc.ServiceDefinition {
+  Configure: MethodDefinition<_grpc_testing_ClientConfigureRequest, _grpc_testing_ClientConfigureResponse, _grpc_testing_ClientConfigureRequest__Output, _grpc_testing_ClientConfigureResponse__Output>
+}
diff --git a/packages/grpc-js-xds/interop/generated/grpc/testing/XdsUpdateHealthService.ts b/packages/grpc-js-xds/interop/generated/grpc/testing/XdsUpdateHealthService.ts
index aa1e35dca..aa3d6e9c6 100644
--- a/packages/grpc-js-xds/interop/generated/grpc/testing/XdsUpdateHealthService.ts
+++ b/packages/grpc-js-xds/interop/generated/grpc/testing/XdsUpdateHealthService.ts
@@ -1,29 +1,30 @@
 // Original file: proto/grpc/testing/test.proto
 
 import type * as grpc from '@grpc/grpc-js'
+import type { MethodDefinition } from '@grpc/proto-loader'
 import type { Empty as _grpc_testing_Empty, Empty__Output as _grpc_testing_Empty__Output } from '../../grpc/testing/Empty';
 
 /**
  * A service to remotely control health status of an xDS test server.
  */
 export interface XdsUpdateHealthServiceClient extends grpc.Client {
-  SetNotServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  SetNotServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  SetNotServing(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  SetNotServing(argument: _grpc_testing_Empty, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  setNotServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  setNotServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  setNotServing(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  setNotServing(argument: _grpc_testing_Empty, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
+  SetNotServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  SetNotServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  SetNotServing(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  SetNotServing(argument: _grpc_testing_Empty, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  setNotServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  setNotServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  setNotServing(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  setNotServing(argument: _grpc_testing_Empty, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
   
-  SetServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  SetServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  SetServing(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  SetServing(argument: _grpc_testing_Empty, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  setServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  setServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  setServing(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
-  setServing(argument: _grpc_testing_Empty, callback: (error?: grpc.ServiceError, result?: _grpc_testing_Empty__Output) => void): grpc.ClientUnaryCall;
+  SetServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  SetServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  SetServing(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  SetServing(argument: _grpc_testing_Empty, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  setServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  setServing(argument: _grpc_testing_Empty, metadata: grpc.Metadata, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  setServing(argument: _grpc_testing_Empty, options: grpc.CallOptions, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
+  setServing(argument: _grpc_testing_Empty, callback: grpc.requestCallback<_grpc_testing_Empty__Output>): grpc.ClientUnaryCall;
   
 }
 
@@ -36,3 +37,8 @@ export interface XdsUpdateHealthServiceHandlers extends grpc.UntypedServiceImple
   SetServing: grpc.handleUnaryCall<_grpc_testing_Empty__Output, _grpc_testing_Empty>;
   
 }
+
+export interface XdsUpdateHealthServiceDefinition extends grpc.ServiceDefinition {
+  SetNotServing: MethodDefinition<_grpc_testing_Empty, _grpc_testing_Empty, _grpc_testing_Empty__Output, _grpc_testing_Empty__Output>
+  SetServing: MethodDefinition<_grpc_testing_Empty, _grpc_testing_Empty, _grpc_testing_Empty__Output, _grpc_testing_Empty__Output>
+}
diff --git a/packages/grpc-js-xds/interop/generated/test.ts b/packages/grpc-js-xds/interop/generated/test.ts
index f91f0c970..722f8fe28 100644
--- a/packages/grpc-js-xds/interop/generated/test.ts
+++ b/packages/grpc-js-xds/interop/generated/test.ts
@@ -1,12 +1,12 @@
 import type * as grpc from '@grpc/grpc-js';
-import type { ServiceDefinition, EnumTypeDefinition, MessageTypeDefinition } from '@grpc/proto-loader';
+import type { EnumTypeDefinition, MessageTypeDefinition } from '@grpc/proto-loader';
 
-import type { LoadBalancerStatsServiceClient as _grpc_testing_LoadBalancerStatsServiceClient } from './grpc/testing/LoadBalancerStatsService';
-import type { ReconnectServiceClient as _grpc_testing_ReconnectServiceClient } from './grpc/testing/ReconnectService';
-import type { TestServiceClient as _grpc_testing_TestServiceClient } from './grpc/testing/TestService';
-import type { UnimplementedServiceClient as _grpc_testing_UnimplementedServiceClient } from './grpc/testing/UnimplementedService';
-import type { XdsUpdateClientConfigureServiceClient as _grpc_testing_XdsUpdateClientConfigureServiceClient } from './grpc/testing/XdsUpdateClientConfigureService';
-import type { XdsUpdateHealthServiceClient as _grpc_testing_XdsUpdateHealthServiceClient } from './grpc/testing/XdsUpdateHealthService';
+import type { LoadBalancerStatsServiceClient as _grpc_testing_LoadBalancerStatsServiceClient, LoadBalancerStatsServiceDefinition as _grpc_testing_LoadBalancerStatsServiceDefinition } from './grpc/testing/LoadBalancerStatsService';
+import type { ReconnectServiceClient as _grpc_testing_ReconnectServiceClient, ReconnectServiceDefinition as _grpc_testing_ReconnectServiceDefinition } from './grpc/testing/ReconnectService';
+import type { TestServiceClient as _grpc_testing_TestServiceClient, TestServiceDefinition as _grpc_testing_TestServiceDefinition } from './grpc/testing/TestService';
+import type { UnimplementedServiceClient as _grpc_testing_UnimplementedServiceClient, UnimplementedServiceDefinition as _grpc_testing_UnimplementedServiceDefinition } from './grpc/testing/UnimplementedService';
+import type { XdsUpdateClientConfigureServiceClient as _grpc_testing_XdsUpdateClientConfigureServiceClient, XdsUpdateClientConfigureServiceDefinition as _grpc_testing_XdsUpdateClientConfigureServiceDefinition } from './grpc/testing/XdsUpdateClientConfigureService';
+import type { XdsUpdateHealthServiceClient as _grpc_testing_XdsUpdateHealthServiceClient, XdsUpdateHealthServiceDefinition as _grpc_testing_XdsUpdateHealthServiceDefinition } from './grpc/testing/XdsUpdateHealthService';
 
 type SubtypeConstructor<Constructor extends new (...args: any) => any, Subtype> = {
   new(...args: ConstructorParameters<Constructor>): Subtype;
@@ -28,7 +28,7 @@ export interface ProtoGrpcType {
       /**
        * A service used to obtain stats for verifying LB behavior.
        */
-      LoadBalancerStatsService: SubtypeConstructor<typeof grpc.Client, _grpc_testing_LoadBalancerStatsServiceClient> & { service: ServiceDefinition }
+      LoadBalancerStatsService: SubtypeConstructor<typeof grpc.Client, _grpc_testing_LoadBalancerStatsServiceClient> & { service: _grpc_testing_LoadBalancerStatsServiceDefinition }
       Payload: MessageTypeDefinition
       PayloadType: EnumTypeDefinition
       ReconnectInfo: MessageTypeDefinition
@@ -36,7 +36,7 @@ export interface ProtoGrpcType {
       /**
        * A service used to control reconnect server.
        */
-      ReconnectService: SubtypeConstructor<typeof grpc.Client, _grpc_testing_ReconnectServiceClient> & { service: ServiceDefinition }
+      ReconnectService: SubtypeConstructor<typeof grpc.Client, _grpc_testing_ReconnectServiceClient> & { service: _grpc_testing_ReconnectServiceDefinition }
       ResponseParameters: MessageTypeDefinition
       SimpleRequest: MessageTypeDefinition
       SimpleResponse: MessageTypeDefinition
@@ -48,20 +48,20 @@ export interface ProtoGrpcType {
        * A simple service to test the various types of RPCs and experiment with
        * performance with various types of payload.
        */
-      TestService: SubtypeConstructor<typeof grpc.Client, _grpc_testing_TestServiceClient> & { service: ServiceDefinition }
+      TestService: SubtypeConstructor<typeof grpc.Client, _grpc_testing_TestServiceClient> & { service: _grpc_testing_TestServiceDefinition }
       /**
        * A simple service NOT implemented at servers so clients can test for
        * that case.
        */
-      UnimplementedService: SubtypeConstructor<typeof grpc.Client, _grpc_testing_UnimplementedServiceClient> & { service: ServiceDefinition }
+      UnimplementedService: SubtypeConstructor<typeof grpc.Client, _grpc_testing_UnimplementedServiceClient> & { service: _grpc_testing_UnimplementedServiceDefinition }
       /**
        * A service to dynamically update the configuration of an xDS test client.
        */
-      XdsUpdateClientConfigureService: SubtypeConstructor<typeof grpc.Client, _grpc_testing_XdsUpdateClientConfigureServiceClient> & { service: ServiceDefinition }
+      XdsUpdateClientConfigureService: SubtypeConstructor<typeof grpc.Client, _grpc_testing_XdsUpdateClientConfigureServiceClient> & { service: _grpc_testing_XdsUpdateClientConfigureServiceDefinition }
       /**
        * A service to remotely control health status of an xDS test server.
        */
-      XdsUpdateHealthService: SubtypeConstructor<typeof grpc.Client, _grpc_testing_XdsUpdateHealthServiceClient> & { service: ServiceDefinition }
+      XdsUpdateHealthService: SubtypeConstructor<typeof grpc.Client, _grpc_testing_XdsUpdateHealthServiceClient> & { service: _grpc_testing_XdsUpdateHealthServiceDefinition }
     }
   }
 }
diff --git a/packages/grpc-js-xds/interop/xds-interop-client.ts b/packages/grpc-js-xds/interop/xds-interop-client.ts
index 1fdaa3a69..a245ad09f 100644
--- a/packages/grpc-js-xds/interop/xds-interop-client.ts
+++ b/packages/grpc-js-xds/interop/xds-interop-client.ts
@@ -398,7 +398,7 @@ function makeSingleRequest(client: TestServiceClient, type: CallType, failOnFail
   const startTime = process.hrtime.bigint();
   const deadline = new Date();
   deadline.setSeconds(deadline.getSeconds() + currentConfig.timeoutSec);
-  const callback = (error: grpc.ServiceError | undefined, value: Empty__Output | undefined) => {
+  const callback = (error: grpc.ServiceError | null, value: Empty__Output | undefined) => {
     const statusCode = error?.code ?? grpc.status.OK;
     const duration = process.hrtime.bigint() - startTime;
     const durationSeconds = Number(duration / TIMESTAMP_ONE_SECOND) | 0;
diff --git a/packages/grpc-js-xds/package.json b/packages/grpc-js-xds/package.json
index b3e524488..c2b421cec 100644
--- a/packages/grpc-js-xds/package.json
+++ b/packages/grpc-js-xds/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/grpc-js-xds",
-  "version": "1.9.2",
+  "version": "1.10.1",
   "description": "Plugin for @grpc/grpc-js. Adds the xds:// URL scheme and associated features.",
   "main": "build/src/index.js",
   "scripts": {
@@ -12,7 +12,7 @@
     "prepare": "npm run generate-types && npm run compile",
     "pretest": "npm run compile",
     "posttest": "npm run check",
-    "generate-types": "proto-loader-gen-types --keepCase --longs String --enums String --defaults --oneofs --includeComments --includeDirs deps/envoy-api/ deps/xds/ deps/googleapis/ deps/protoc-gen-validate/ -O src/generated/ --grpcLib @grpc/grpc-js envoy/service/discovery/v3/ads.proto envoy/service/load_stats/v3/lrs.proto envoy/config/listener/v3/listener.proto envoy/config/route/v3/route.proto envoy/config/cluster/v3/cluster.proto envoy/config/endpoint/v3/endpoint.proto envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto udpa/type/v1/typed_struct.proto xds/type/v3/typed_struct.proto envoy/extensions/filters/http/fault/v3/fault.proto envoy/service/status/v3/csds.proto envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto",
+    "generate-types": "proto-loader-gen-types --keepCase --longs String --enums String --defaults --oneofs --includeComments --includeDirs deps/envoy-api/ deps/xds/ deps/googleapis/ deps/protoc-gen-validate/ -O src/generated/ --grpcLib @grpc/grpc-js envoy/service/discovery/v3/ads.proto envoy/service/load_stats/v3/lrs.proto envoy/config/listener/v3/listener.proto envoy/config/route/v3/route.proto envoy/config/cluster/v3/cluster.proto envoy/config/endpoint/v3/endpoint.proto envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto udpa/type/v1/typed_struct.proto xds/type/v3/typed_struct.proto envoy/extensions/filters/http/fault/v3/fault.proto envoy/service/status/v3/csds.proto envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.proto envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.proto envoy/extensions/clusters/aggregate/v3/cluster.proto",
     "generate-interop-types": "proto-loader-gen-types --keep-case --longs String --enums String --defaults --oneofs --json --includeComments --includeDirs proto/ -O interop/generated --grpcLib @grpc/grpc-js grpc/testing/test.proto",
     "generate-test-types": "proto-loader-gen-types --keep-case --longs String --enums String --defaults --oneofs --json --includeComments --includeDirs proto/ -O test/generated --grpcLib @grpc/grpc-js grpc/testing/echo.proto"
   },
@@ -33,6 +33,7 @@
   "homepage": "https://github.com/grpc/grpc-node#readme",
   "devDependencies": {
     "@grpc/grpc-js": "file:../grpc-js",
+    "@grpc/proto-loader": "file:../proto-loader",
     "@types/gulp": "^4.0.6",
     "@types/gulp-mocha": "0.0.32",
     "@types/mocha": "^5.2.6",
@@ -40,18 +41,18 @@
     "@types/yargs": "^15.0.5",
     "find-free-ports": "^3.1.1",
     "gts": "^5.0.1",
-    "typescript": "^4.9.5",
+    "typescript": "^5.1.3",
     "yargs": "^15.4.1"
   },
   "dependencies": {
-    "@grpc/proto-loader": "^0.6.0",
+    "@grpc/proto-loader": "^0.7.13",
     "google-auth-library": "^7.0.2",
     "re2-wasm": "^1.0.1",
     "vscode-uri": "^3.0.7",
     "xxhash-wasm": "^1.0.2"
   },
   "peerDependencies": {
-    "@grpc/grpc-js": "~1.9.0"
+    "@grpc/grpc-js": "~1.10.0"
   },
   "engines": {
     "node": ">=10.10.0"
diff --git a/packages/grpc-js-xds/scripts/psm-interop-build-node.sh b/packages/grpc-js-xds/scripts/psm-interop-build-node.sh
new file mode 100755
index 000000000..d52206f0e
--- /dev/null
+++ b/packages/grpc-js-xds/scripts/psm-interop-build-node.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Copyright 2024 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+set -eo pipefail
+
+#######################################
+# Builds test app Docker images and pushes them to GCR.
+# Called from psm_interop_kokoro_lib.sh.
+#
+# Globals:
+#   SRC_DIR: Absolute path to the source repo on Kokoro VM
+#   SERVER_IMAGE_NAME: Test server Docker image name
+#   CLIENT_IMAGE_NAME: Test client Docker image name
+#   GIT_COMMIT: SHA-1 of git commit being built
+#   DOCKER_REGISTRY: Docker registry to push to
+# Outputs:
+#   Writes the output of docker image build stdout, stderr
+#######################################
+psm::lang::build_docker_images() {
+  local client_dockerfile="packages/grpc-js-xds/interop/Dockerfile"
+
+  cd "${SRC_DIR}"
+  psm::tools::run_verbose git submodule update --init --recursive
+  psm::tools::run_verbose git submodule status
+
+  psm::build::docker_images_generic "${client_dockerfile}"
+}
diff --git a/packages/grpc-js-xds/scripts/psm-interop-test-node.sh b/packages/grpc-js-xds/scripts/psm-interop-test-node.sh
new file mode 100755
index 000000000..169cf06f2
--- /dev/null
+++ b/packages/grpc-js-xds/scripts/psm-interop-test-node.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+# Copyright 2024 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+set -eo pipefail
+
+# Input parameters to psm:: methods of the install script.
+readonly GRPC_LANGUAGE="node"
+readonly BUILD_SCRIPT_DIR="$(dirname "$0")"
+
+# Used locally.
+readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh"
+
+psm::lang::source_install_lib() {
+  echo "Sourcing test driver install script from: ${TEST_DRIVER_INSTALL_SCRIPT_URL}"
+  local install_lib
+  # Download to a tmp file.
+  install_lib="$(mktemp -d)/psm_interop_kokoro_lib.sh"
+  curl -s --retry-connrefused --retry 5 -o "${install_lib}" "${TEST_DRIVER_INSTALL_SCRIPT_URL}"
+  # Checksum.
+  if command -v sha256sum &> /dev/null; then
+    echo "Install script checksum:"
+    sha256sum "${install_lib}"
+  fi
+  source "${install_lib}"
+}
+
+psm::lang::source_install_lib
+source "${BUILD_SCRIPT_DIR}/psm-interop-build-${GRPC_LANGUAGE}.sh"
+psm::run "${PSM_TEST_SUITE}"
diff --git a/packages/grpc-js-xds/scripts/xds.sh b/packages/grpc-js-xds/scripts/xds.sh
index 85124cdc1..679d123fa 100755
--- a/packages/grpc-js-xds/scripts/xds.sh
+++ b/packages/grpc-js-xds/scripts/xds.sh
@@ -34,6 +34,9 @@ echo "source $NVM_DIR/nvm.sh" > ~/.profile
 echo "source $NVM_DIR/nvm.sh" > ~/.shrc
 export ENV=~/.shrc
 
+cd $base/../proto-loader
+npm install
+
 cd $base/../grpc-js
 npm install
 
diff --git a/packages/grpc-js-xds/scripts/xds_k8s_lb.sh b/packages/grpc-js-xds/scripts/xds_k8s_lb.sh
deleted file mode 100755
index 504c3ff37..000000000
--- a/packages/grpc-js-xds/scripts/xds_k8s_lb.sh
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2022 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -eo pipefail
-
-# Constants
-readonly GITHUB_REPOSITORY_NAME="grpc-node"
-readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh"
-## xDS test client Docker images
-readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-server:558b5b0bfac8e21755c223063274a779b3898afe"
-readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/node-client"
-readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}"
-readonly BUILD_APP_PATH="packages/grpc-js-xds/interop/Dockerfile"
-readonly LANGUAGE_NAME="Node"
-
-#######################################
-# Builds test app Docker images and pushes them to GCR
-# Globals:
-#   BUILD_APP_PATH
-#   CLIENT_IMAGE_NAME: Test client Docker image name
-#   GIT_COMMIT: SHA-1 of git commit being built
-#   TESTING_VERSION: version branch under test, f.e. v1.42.x, master
-# Arguments:
-#   None
-# Outputs:
-#   Writes the output of `gcloud builds submit` to stdout, stderr
-#######################################
-build_test_app_docker_images() {
-  echo "Building ${LANGUAGE_NAME} xDS interop test app Docker images"
-
-  pushd "${SRC_DIR}"
-  docker build \
-    -f "${BUILD_APP_PATH}" \
-    -t "${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" \
-    .
-
-  gcloud -q auth configure-docker
-  docker push "${CLIENT_IMAGE_NAME}:${GIT_COMMIT}"
-  if is_version_branch "${TESTING_VERSION}"; then
-    tag_and_push_docker_image "${CLIENT_IMAGE_NAME}" "${GIT_COMMIT}" "${TESTING_VERSION}"
-  fi
-  popd
-}
-
-#######################################
-# Builds test app and its docker images unless they already exist
-# Globals:
-#   CLIENT_IMAGE_NAME: Test client Docker image name
-#   GIT_COMMIT: SHA-1 of git commit being built
-#   FORCE_IMAGE_BUILD
-# Arguments:
-#   None
-# Outputs:
-#   Writes the output to stdout, stderr
-#######################################
-build_docker_images_if_needed() {
-  # Check if images already exist
-  client_tags="$(gcloud_gcr_list_image_tags "${CLIENT_IMAGE_NAME}" "${GIT_COMMIT}")"
-  printf "Client image: %s:%s\n" "${CLIENT_IMAGE_NAME}" "${GIT_COMMIT}"
-  echo "${client_tags:-Client image not found}"
-
-  # Build if any of the images are missing, or FORCE_IMAGE_BUILD=1
-  if [[ "${FORCE_IMAGE_BUILD}" == "1" || -z "${client_tags}" ]]; then
-    build_test_app_docker_images
-  else
-    echo "Skipping ${LANGUAGE_NAME} test app build"
-  fi
-}
-
-#######################################
-# Executes the test case
-# Globals:
-#   TEST_DRIVER_FLAGFILE: Relative path to test driver flagfile
-#   KUBE_CONTEXT: The name of kubectl context with GKE cluster access
-#   SECONDARY_KUBE_CONTEXT: The name of kubectl context with secondary GKE cluster access, if any
-#   TEST_XML_OUTPUT_DIR: Output directory for the test xUnit XML report
-#   CLIENT_IMAGE_NAME: Test client Docker image name
-#   GIT_COMMIT: SHA-1 of git commit being built
-# Arguments:
-#   Test case name
-# Outputs:
-#   Writes the output of test execution to stdout, stderr
-#   Test xUnit report to ${TEST_XML_OUTPUT_DIR}/${test_name}/sponge_log.xml
-#######################################
-run_test() {
-  # Test driver usage:
-  # https://github.com/grpc/grpc/tree/master/tools/run_tests/xds_k8s_test_driver#basic-usage
-  local test_name="${1:?Usage: run_test test_name}"
-  local out_dir="${TEST_XML_OUTPUT_DIR}/${test_name}"
-  mkdir -pv "${out_dir}"
-  # testing_version is used by the framework to determine the supported PSM
-  # features. It's captured from Kokoro job name of the Node repo, which takes
-  # the form:
-  #   grpc/node/<branch name>/<job name>
-  python3 -m "tests.${test_name}" \
-    --flagfile="${TEST_DRIVER_FLAGFILE}" \
-    --kube_context="${KUBE_CONTEXT}" \
-    --secondary_kube_context="${SECONDARY_KUBE_CONTEXT}" \
-    --client_image="${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" \
-    --server_image="${SERVER_IMAGE_NAME}" \
-    --testing_version="${TESTING_VERSION}" \
-    --force_cleanup \
-    --collect_app_logs \
-    --log_dir="${out_dir}" \
-    --xml_output_file="${out_dir}/sponge_log.xml" \
-    |& tee "${out_dir}/sponge_log.log"
-}
-
-#######################################
-# Main function: provision software necessary to execute tests, and run them
-# Globals:
-#   KOKORO_ARTIFACTS_DIR
-#   GITHUB_REPOSITORY_NAME
-#   SRC_DIR: Populated with absolute path to the source repo
-#   TEST_DRIVER_REPO_DIR: Populated with the path to the repo containing
-#                         the test driver
-#   TEST_DRIVER_FULL_DIR: Populated with the path to the test driver source code
-#   TEST_DRIVER_FLAGFILE: Populated with relative path to test driver flagfile
-#   TEST_XML_OUTPUT_DIR: Populated with the path to test xUnit XML report
-#   GIT_ORIGIN_URL: Populated with the origin URL of git repo used for the build
-#   GIT_COMMIT: Populated with the SHA-1 of git commit being built
-#   GIT_COMMIT_SHORT: Populated with the short SHA-1 of git commit being built
-#   KUBE_CONTEXT: Populated with name of kubectl context with GKE cluster access
-#   SECONDARY_KUBE_CONTEXT: Populated with name of kubectl context with secondary GKE cluster access, if any
-# Arguments:
-#   None
-# Outputs:
-#   Writes the output of test execution to stdout, stderr
-#######################################
-main() {
-  local script_dir
-  script_dir="$(dirname "$0")"
-
-  cd "${script_dir}"
-
-  git submodule update --init --recursive
-
-  # Source the test driver from the master branch.
-  echo "Sourcing test driver install script from: ${TEST_DRIVER_INSTALL_SCRIPT_URL}"
-  source /dev/stdin <<< "$(curl -s "${TEST_DRIVER_INSTALL_SCRIPT_URL}")"
-
-  activate_gke_cluster GKE_CLUSTER_PSM_LB
-  activate_secondary_gke_cluster GKE_CLUSTER_PSM_LB
-
-  set -x
-  if [[ -n "${KOKORO_ARTIFACTS_DIR}" ]]; then
-    kokoro_setup_test_driver "${GITHUB_REPOSITORY_NAME}"
-  else
-    local_setup_test_driver "${script_dir}"
-  fi
-  build_docker_images_if_needed
-
-  # Run tests
-  cd "${TEST_DRIVER_FULL_DIR}"
-  local failed_tests=0
-  test_suites=(
-    "affinity_test"
-    "api_listener_test"
-    "baseline_test"
-    "change_backend_service_test"
-    "custom_lb_test"
-    "failover_test"
-    "outlier_detection_test"
-    "remove_neg_test"
-    "round_robin_test"
-  )
-  for test in "${test_suites[@]}"; do
-    run_test $test || (( ++failed_tests ))
-  done
-  echo "Failed test suites: ${failed_tests}"
-}
-
-main "$@"
diff --git a/packages/grpc-js-xds/scripts/xds_k8s_url_map.sh b/packages/grpc-js-xds/scripts/xds_k8s_url_map.sh
deleted file mode 100644
index 9344d054b..000000000
--- a/packages/grpc-js-xds/scripts/xds_k8s_url_map.sh
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2022 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -eo pipefail
-
-# Constants
-readonly GITHUB_REPOSITORY_NAME="grpc-node"
-readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh"
-## xDS test client Docker images
-readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/node-client"
-readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}"
-readonly BUILD_APP_PATH="packages/grpc-js-xds/interop/Dockerfile"
-readonly LANGUAGE_NAME="Node"
-
-#######################################
-# Builds test app Docker images and pushes them to GCR
-# Globals:
-#   BUILD_APP_PATH
-#   CLIENT_IMAGE_NAME: Test client Docker image name
-#   GIT_COMMIT: SHA-1 of git commit being built
-#   TESTING_VERSION: version branch under test, f.e. v1.42.x, master
-# Arguments:
-#   None
-# Outputs:
-#   Writes the output of `gcloud builds submit` to stdout, stderr
-#######################################
-build_test_app_docker_images() {
-  echo "Building ${LANGUAGE_NAME} xDS interop test app Docker images"
-
-  pushd "${SRC_DIR}"
-  docker build \
-    -f "${BUILD_APP_PATH}" \
-    -t "${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" \
-    .
-
-  gcloud -q auth configure-docker
-  docker push "${CLIENT_IMAGE_NAME}:${GIT_COMMIT}"
-  if is_version_branch "${TESTING_VERSION}"; then
-    tag_and_push_docker_image "${CLIENT_IMAGE_NAME}" "${GIT_COMMIT}" "${TESTING_VERSION}"
-  fi
-  popd
-}
-
-#######################################
-# Builds test app and its docker images unless they already exist
-# Globals:
-#   CLIENT_IMAGE_NAME: Test client Docker image name
-#   GIT_COMMIT: SHA-1 of git commit being built
-#   FORCE_IMAGE_BUILD
-# Arguments:
-#   None
-# Outputs:
-#   Writes the output to stdout, stderr
-#######################################
-build_docker_images_if_needed() {
-  # Check if images already exist
-  client_tags="$(gcloud_gcr_list_image_tags "${CLIENT_IMAGE_NAME}" "${GIT_COMMIT}")"
-  printf "Client image: %s:%s\n" "${CLIENT_IMAGE_NAME}" "${GIT_COMMIT}"
-  echo "${client_tags:-Client image not found}"
-
-  # Build if any of the images are missing, or FORCE_IMAGE_BUILD=1
-  if [[ "${FORCE_IMAGE_BUILD}" == "1" || -z "${client_tags}" ]]; then
-    build_test_app_docker_images
-  else
-    echo "Skipping ${LANGUAGE_NAME} test app build"
-  fi
-}
-
-#######################################
-# Executes the test case
-# Globals:
-#   TEST_DRIVER_FLAGFILE: Relative path to test driver flagfile
-#   KUBE_CONTEXT: The name of kubectl context with GKE cluster access
-#   TEST_XML_OUTPUT_DIR: Output directory for the test xUnit XML report
-#   CLIENT_IMAGE_NAME: Test client Docker image name
-#   GIT_COMMIT: SHA-1 of git commit being built
-#   TESTING_VERSION: version branch under test: used by the framework to determine the supported PSM
-#                    features.
-# Arguments:
-#   Test case name
-# Outputs:
-#   Writes the output of test execution to stdout, stderr
-#   Test xUnit report to ${TEST_XML_OUTPUT_DIR}/${test_name}/sponge_log.xml
-#######################################
-run_test() {
-  # Test driver usage:
-  # https://github.com/grpc/grpc/tree/master/tools/run_tests/xds_k8s_test_driver#basic-usage
-  local test_name="${1:?Usage: run_test test_name}"
-  local out_dir="${TEST_XML_OUTPUT_DIR}/${test_name}"
-  mkdir -pv "${out_dir}"
-  set -x
-  python3 -m "tests.${test_name}" \
-    --flagfile="${TEST_DRIVER_FLAGFILE}" \
-    --flagfile="config/url-map.cfg" \
-    --kube_context="${KUBE_CONTEXT}" \
-    --client_image="${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" \
-    --testing_version="${TESTING_VERSION}" \
-    --collect_app_logs \
-    --log_dir="${out_dir}" \
-    --xml_output_file="${out_dir}/sponge_log.xml" \
-    |& tee "${out_dir}/sponge_log.log"
-}
-
-#######################################
-# Main function: provision software necessary to execute tests, and run them
-# Globals:
-#   KOKORO_ARTIFACTS_DIR
-#   GITHUB_REPOSITORY_NAME
-#   SRC_DIR: Populated with absolute path to the source repo
-#   TEST_DRIVER_REPO_DIR: Populated with the path to the repo containing
-#                         the test driver
-#   TEST_DRIVER_FULL_DIR: Populated with the path to the test driver source code
-#   TEST_DRIVER_FLAGFILE: Populated with relative path to test driver flagfile
-#   TEST_XML_OUTPUT_DIR: Populated with the path to test xUnit XML report
-#   GIT_ORIGIN_URL: Populated with the origin URL of git repo used for the build
-#   GIT_COMMIT: Populated with the SHA-1 of git commit being built
-#   GIT_COMMIT_SHORT: Populated with the short SHA-1 of git commit being built
-#   KUBE_CONTEXT: Populated with name of kubectl context with GKE cluster access
-# Arguments:
-#   None
-# Outputs:
-#   Writes the output of test execution to stdout, stderr
-#######################################
-main() {
-  local script_dir
-  script_dir="$(dirname "$0")"
-
-  cd "${script_dir}"
-
-  git submodule update --init --recursive
-
-  # Source the test driver from the master branch.
-  echo "Sourcing test driver install script from: ${TEST_DRIVER_INSTALL_SCRIPT_URL}"
-  source /dev/stdin <<< "$(curl -s "${TEST_DRIVER_INSTALL_SCRIPT_URL}")"
-
-  activate_gke_cluster GKE_CLUSTER_PSM_BASIC
-
-  set -x
-  if [[ -n "${KOKORO_ARTIFACTS_DIR}" ]]; then
-    kokoro_setup_test_driver "${GITHUB_REPOSITORY_NAME}"
-  else
-    local_setup_test_driver "${script_dir}"
-  fi
-  build_docker_images_if_needed
-  # Run tests
-  cd "${TEST_DRIVER_FULL_DIR}"
-  run_test url_map || echo "Failed url_map test"
-}
-
-main "$@"
diff --git a/packages/grpc-js-xds/src/environment.ts b/packages/grpc-js-xds/src/environment.ts
index 5adc3d3eb..7d6396720 100644
--- a/packages/grpc-js-xds/src/environment.ts
+++ b/packages/grpc-js-xds/src/environment.ts
@@ -15,11 +15,14 @@
  *
  */
 
+/* Switches to enable or disable experimental features. If the default is
+ * 'true', the feature is enabled by default, if the default is 'false' the
+ * feature is disabled by default. */
 export const EXPERIMENTAL_FAULT_INJECTION = (process.env.GRPC_XDS_EXPERIMENTAL_FAULT_INJECTION ?? 'true') === 'true';
 export const EXPERIMENTAL_OUTLIER_DETECTION = (process.env.GRPC_EXPERIMENTAL_ENABLE_OUTLIER_DETECTION ?? 'true') === 'true';
 export const EXPERIMENTAL_RETRY = (process.env.GRPC_XDS_EXPERIMENTAL_ENABLE_RETRY ?? 'true') === 'true';
 export const EXPERIMENTAL_FEDERATION = (process.env.GRPC_EXPERIMENTAL_XDS_FEDERATION ?? 'false') === 'true';
-export const EXPERIMENTAL_CUSTOM_LB_CONFIG = (process.env.GRPC_EXPERIMENTAL_XDS_CUSTOM_LB_CONFIG ?? 'false') === 'true';
-export const EXPERIMENTAL_RING_HASH = (process.env.GRPC_XDS_EXPERIMENTAL_ENABLE_RING_HASH ?? 'false') === 'true';
+export const EXPERIMENTAL_CUSTOM_LB_CONFIG = (process.env.GRPC_EXPERIMENTAL_XDS_CUSTOM_LB_CONFIG ?? 'true') === 'true';
+export const EXPERIMENTAL_RING_HASH = (process.env.GRPC_XDS_EXPERIMENTAL_ENABLE_RING_HASH ?? 'true') === 'true';
 export const EXPERIMENTAL_PICK_FIRST = (process.env.GRPC_EXPERIMENTAL_PICKFIRST_LB_CONFIG ?? 'false') === 'true';
 export const EXPERIMENTAL_DUALSTACK_ENDPOINTS = (process.env.GRPC_EXPERIMENTAL_XDS_DUALSTACK_ENDPOINTS ?? 'false') === 'true';
diff --git a/packages/grpc-js-xds/src/generated/cluster.ts b/packages/grpc-js-xds/src/generated/cluster.ts
index 361e6d8da..6e6a4e981 100644
--- a/packages/grpc-js-xds/src/generated/cluster.ts
+++ b/packages/grpc-js-xds/src/generated/cluster.ts
@@ -101,6 +101,15 @@ export interface ProtoGrpcType {
         }
       }
     }
+    extensions: {
+      clusters: {
+        aggregate: {
+          v3: {
+            ClusterConfig: MessageTypeDefinition
+          }
+        }
+      }
+    }
     type: {
       matcher: {
         v3: {
diff --git a/packages/grpc-js-xds/src/generated/envoy/admin/v3/BootstrapConfigDump.ts b/packages/grpc-js-xds/src/generated/envoy/admin/v3/BootstrapConfigDump.ts
deleted file mode 100644
index d47f00ef3..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/admin/v3/BootstrapConfigDump.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-// Original file: deps/envoy-api/envoy/admin/v3/config_dump.proto
-
-import type { Bootstrap as _envoy_config_bootstrap_v3_Bootstrap, Bootstrap__Output as _envoy_config_bootstrap_v3_Bootstrap__Output } from '../../../envoy/config/bootstrap/v3/Bootstrap';
-import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp';
-
-/**
- * This message describes the bootstrap configuration that Envoy was started with. This includes
- * any CLI overrides that were merged. Bootstrap configuration information can be used to recreate
- * the static portions of an Envoy configuration by reusing the output as the bootstrap
- * configuration for another Envoy.
- */
-export interface BootstrapConfigDump {
-  'bootstrap'?: (_envoy_config_bootstrap_v3_Bootstrap | null);
-  /**
-   * The timestamp when the BootstrapConfig was last updated.
-   */
-  'last_updated'?: (_google_protobuf_Timestamp | null);
-}
-
-/**
- * This message describes the bootstrap configuration that Envoy was started with. This includes
- * any CLI overrides that were merged. Bootstrap configuration information can be used to recreate
- * the static portions of an Envoy configuration by reusing the output as the bootstrap
- * configuration for another Envoy.
- */
-export interface BootstrapConfigDump__Output {
-  'bootstrap': (_envoy_config_bootstrap_v3_Bootstrap__Output | null);
-  /**
-   * The timestamp when the BootstrapConfig was last updated.
-   */
-  'last_updated': (_google_protobuf_Timestamp__Output | null);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/admin/v3/ClientResourceStatus.ts b/packages/grpc-js-xds/src/generated/envoy/admin/v3/ClientResourceStatus.ts
index 8488bbdd7..b7a78a338 100644
--- a/packages/grpc-js-xds/src/generated/envoy/admin/v3/ClientResourceStatus.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/admin/v3/ClientResourceStatus.ts
@@ -4,17 +4,17 @@
  * Resource status from the view of a xDS client, which tells the synchronization
  * status between the xDS client and the xDS server.
  */
-export enum ClientResourceStatus {
+export const ClientResourceStatus = {
   /**
    * Resource status is not available/unknown.
    */
-  UNKNOWN = 0,
+  UNKNOWN: 'UNKNOWN',
   /**
    * Client requested this resource but hasn't received any update from management
    * server. The client will not fail requests, but will queue them until update
    * arrives or the client times out waiting for the resource.
    */
-  REQUESTED = 1,
+  REQUESTED: 'REQUESTED',
   /**
    * This resource has been requested by the client but has either not been
    * delivered by the server or was previously delivered by the server and then
@@ -22,13 +22,56 @@ export enum ClientResourceStatus {
    * information, please refer to the :ref:`"Knowing When a Requested Resource
    * Does Not Exist" <xds_protocol_resource_not_existed>` section.
    */
-  DOES_NOT_EXIST = 2,
+  DOES_NOT_EXIST: 'DOES_NOT_EXIST',
   /**
    * Client received this resource and replied with ACK.
    */
-  ACKED = 3,
+  ACKED: 'ACKED',
   /**
    * Client received this resource and replied with NACK.
    */
-  NACKED = 4,
-}
+  NACKED: 'NACKED',
+} as const;
+
+/**
+ * Resource status from the view of a xDS client, which tells the synchronization
+ * status between the xDS client and the xDS server.
+ */
+export type ClientResourceStatus =
+  /**
+   * Resource status is not available/unknown.
+   */
+  | 'UNKNOWN'
+  | 0
+  /**
+   * Client requested this resource but hasn't received any update from management
+   * server. The client will not fail requests, but will queue them until update
+   * arrives or the client times out waiting for the resource.
+   */
+  | 'REQUESTED'
+  | 1
+  /**
+   * This resource has been requested by the client but has either not been
+   * delivered by the server or was previously delivered by the server and then
+   * subsequently removed from resources provided by the server. For more
+   * information, please refer to the :ref:`"Knowing When a Requested Resource
+   * Does Not Exist" <xds_protocol_resource_not_existed>` section.
+   */
+  | 'DOES_NOT_EXIST'
+  | 2
+  /**
+   * Client received this resource and replied with ACK.
+   */
+  | 'ACKED'
+  | 3
+  /**
+   * Client received this resource and replied with NACK.
+   */
+  | 'NACKED'
+  | 4
+
+/**
+ * Resource status from the view of a xDS client, which tells the synchronization
+ * status between the xDS client and the xDS server.
+ */
+export type ClientResourceStatus__Output = typeof ClientResourceStatus[keyof typeof ClientResourceStatus]
diff --git a/packages/grpc-js-xds/src/generated/envoy/admin/v3/ClustersConfigDump.ts b/packages/grpc-js-xds/src/generated/envoy/admin/v3/ClustersConfigDump.ts
index aabcd212a..2c3b4f8a5 100644
--- a/packages/grpc-js-xds/src/generated/envoy/admin/v3/ClustersConfigDump.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/admin/v3/ClustersConfigDump.ts
@@ -3,7 +3,7 @@
 import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../google/protobuf/Any';
 import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp';
 import type { UpdateFailureState as _envoy_admin_v3_UpdateFailureState, UpdateFailureState__Output as _envoy_admin_v3_UpdateFailureState__Output } from '../../../envoy/admin/v3/UpdateFailureState';
-import type { ClientResourceStatus as _envoy_admin_v3_ClientResourceStatus } from '../../../envoy/admin/v3/ClientResourceStatus';
+import type { ClientResourceStatus as _envoy_admin_v3_ClientResourceStatus, ClientResourceStatus__Output as _envoy_admin_v3_ClientResourceStatus__Output } from '../../../envoy/admin/v3/ClientResourceStatus';
 
 /**
  * Describes a dynamically loaded cluster via the CDS API.
@@ -37,7 +37,7 @@ export interface _envoy_admin_v3_ClustersConfigDump_DynamicCluster {
    * The client status of this resource.
    * [#not-implemented-hide:]
    */
-  'client_status'?: (_envoy_admin_v3_ClientResourceStatus | keyof typeof _envoy_admin_v3_ClientResourceStatus);
+  'client_status'?: (_envoy_admin_v3_ClientResourceStatus);
 }
 
 /**
@@ -72,7 +72,7 @@ export interface _envoy_admin_v3_ClustersConfigDump_DynamicCluster__Output {
    * The client status of this resource.
    * [#not-implemented-hide:]
    */
-  'client_status': (keyof typeof _envoy_admin_v3_ClientResourceStatus);
+  'client_status': (_envoy_admin_v3_ClientResourceStatus__Output);
 }
 
 /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/admin/v3/ConfigDump.ts b/packages/grpc-js-xds/src/generated/envoy/admin/v3/ConfigDump.ts
deleted file mode 100644
index 8a0ab65c2..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/admin/v3/ConfigDump.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-// Original file: deps/envoy-api/envoy/admin/v3/config_dump.proto
-
-import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../google/protobuf/Any';
-
-/**
- * The :ref:`/config_dump <operations_admin_interface_config_dump>` admin endpoint uses this wrapper
- * message to maintain and serve arbitrary configuration information from any component in Envoy.
- */
-export interface ConfigDump {
-  /**
-   * This list is serialized and dumped in its entirety at the
-   * :ref:`/config_dump <operations_admin_interface_config_dump>` endpoint.
-   * 
-   * The following configurations are currently supported and will be dumped in the order given
-   * below:
-   * 
-   * * *bootstrap*: :ref:`BootstrapConfigDump <envoy_v3_api_msg_admin.v3.BootstrapConfigDump>`
-   * * *clusters*: :ref:`ClustersConfigDump <envoy_v3_api_msg_admin.v3.ClustersConfigDump>`
-   * * *endpoints*:  :ref:`EndpointsConfigDump <envoy_v3_api_msg_admin.v3.EndpointsConfigDump>`
-   * * *listeners*: :ref:`ListenersConfigDump <envoy_v3_api_msg_admin.v3.ListenersConfigDump>`
-   * * *scoped_routes*: :ref:`ScopedRoutesConfigDump <envoy_v3_api_msg_admin.v3.ScopedRoutesConfigDump>`
-   * * *routes*:  :ref:`RoutesConfigDump <envoy_v3_api_msg_admin.v3.RoutesConfigDump>`
-   * * *secrets*:  :ref:`SecretsConfigDump <envoy_v3_api_msg_admin.v3.SecretsConfigDump>`
-   * 
-   * EDS Configuration will only be dumped by using parameter `?include_eds`
-   * 
-   * You can filter output with the resource and mask query parameters.
-   * See :ref:`/config_dump?resource={} <operations_admin_interface_config_dump_by_resource>`,
-   * :ref:`/config_dump?mask={} <operations_admin_interface_config_dump_by_mask>`,
-   * or :ref:`/config_dump?resource={},mask={}
-   * <operations_admin_interface_config_dump_by_resource_and_mask>` for more information.
-   */
-  'configs'?: (_google_protobuf_Any)[];
-}
-
-/**
- * The :ref:`/config_dump <operations_admin_interface_config_dump>` admin endpoint uses this wrapper
- * message to maintain and serve arbitrary configuration information from any component in Envoy.
- */
-export interface ConfigDump__Output {
-  /**
-   * This list is serialized and dumped in its entirety at the
-   * :ref:`/config_dump <operations_admin_interface_config_dump>` endpoint.
-   * 
-   * The following configurations are currently supported and will be dumped in the order given
-   * below:
-   * 
-   * * *bootstrap*: :ref:`BootstrapConfigDump <envoy_v3_api_msg_admin.v3.BootstrapConfigDump>`
-   * * *clusters*: :ref:`ClustersConfigDump <envoy_v3_api_msg_admin.v3.ClustersConfigDump>`
-   * * *endpoints*:  :ref:`EndpointsConfigDump <envoy_v3_api_msg_admin.v3.EndpointsConfigDump>`
-   * * *listeners*: :ref:`ListenersConfigDump <envoy_v3_api_msg_admin.v3.ListenersConfigDump>`
-   * * *scoped_routes*: :ref:`ScopedRoutesConfigDump <envoy_v3_api_msg_admin.v3.ScopedRoutesConfigDump>`
-   * * *routes*:  :ref:`RoutesConfigDump <envoy_v3_api_msg_admin.v3.RoutesConfigDump>`
-   * * *secrets*:  :ref:`SecretsConfigDump <envoy_v3_api_msg_admin.v3.SecretsConfigDump>`
-   * 
-   * EDS Configuration will only be dumped by using parameter `?include_eds`
-   * 
-   * You can filter output with the resource and mask query parameters.
-   * See :ref:`/config_dump?resource={} <operations_admin_interface_config_dump_by_resource>`,
-   * :ref:`/config_dump?mask={} <operations_admin_interface_config_dump_by_mask>`,
-   * or :ref:`/config_dump?resource={},mask={}
-   * <operations_admin_interface_config_dump_by_resource_and_mask>` for more information.
-   */
-  'configs': (_google_protobuf_Any__Output)[];
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/admin/v3/EcdsConfigDump.ts b/packages/grpc-js-xds/src/generated/envoy/admin/v3/EcdsConfigDump.ts
index e63307cb5..70562962b 100644
--- a/packages/grpc-js-xds/src/generated/envoy/admin/v3/EcdsConfigDump.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/admin/v3/EcdsConfigDump.ts
@@ -3,7 +3,7 @@
 import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../google/protobuf/Any';
 import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp';
 import type { UpdateFailureState as _envoy_admin_v3_UpdateFailureState, UpdateFailureState__Output as _envoy_admin_v3_UpdateFailureState__Output } from '../../../envoy/admin/v3/UpdateFailureState';
-import type { ClientResourceStatus as _envoy_admin_v3_ClientResourceStatus } from '../../../envoy/admin/v3/ClientResourceStatus';
+import type { ClientResourceStatus as _envoy_admin_v3_ClientResourceStatus, ClientResourceStatus__Output as _envoy_admin_v3_ClientResourceStatus__Output } from '../../../envoy/admin/v3/ClientResourceStatus';
 
 /**
  * [#next-free-field: 6]
@@ -36,7 +36,7 @@ export interface _envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig {
    * The client status of this resource.
    * [#not-implemented-hide:]
    */
-  'client_status'?: (_envoy_admin_v3_ClientResourceStatus | keyof typeof _envoy_admin_v3_ClientResourceStatus);
+  'client_status'?: (_envoy_admin_v3_ClientResourceStatus);
 }
 
 /**
@@ -70,7 +70,7 @@ export interface _envoy_admin_v3_EcdsConfigDump_EcdsFilterConfig__Output {
    * The client status of this resource.
    * [#not-implemented-hide:]
    */
-  'client_status': (keyof typeof _envoy_admin_v3_ClientResourceStatus);
+  'client_status': (_envoy_admin_v3_ClientResourceStatus__Output);
 }
 
 /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/admin/v3/EndpointsConfigDump.ts b/packages/grpc-js-xds/src/generated/envoy/admin/v3/EndpointsConfigDump.ts
index ab5485dbe..3f362c5c3 100644
--- a/packages/grpc-js-xds/src/generated/envoy/admin/v3/EndpointsConfigDump.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/admin/v3/EndpointsConfigDump.ts
@@ -3,7 +3,7 @@
 import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../google/protobuf/Any';
 import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp';
 import type { UpdateFailureState as _envoy_admin_v3_UpdateFailureState, UpdateFailureState__Output as _envoy_admin_v3_UpdateFailureState__Output } from '../../../envoy/admin/v3/UpdateFailureState';
-import type { ClientResourceStatus as _envoy_admin_v3_ClientResourceStatus } from '../../../envoy/admin/v3/ClientResourceStatus';
+import type { ClientResourceStatus as _envoy_admin_v3_ClientResourceStatus, ClientResourceStatus__Output as _envoy_admin_v3_ClientResourceStatus__Output } from '../../../envoy/admin/v3/ClientResourceStatus';
 
 /**
  * [#next-free-field: 6]
@@ -35,7 +35,7 @@ export interface _envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig {
    * The client status of this resource.
    * [#not-implemented-hide:]
    */
-  'client_status'?: (_envoy_admin_v3_ClientResourceStatus | keyof typeof _envoy_admin_v3_ClientResourceStatus);
+  'client_status'?: (_envoy_admin_v3_ClientResourceStatus);
 }
 
 /**
@@ -68,7 +68,7 @@ export interface _envoy_admin_v3_EndpointsConfigDump_DynamicEndpointConfig__Outp
    * The client status of this resource.
    * [#not-implemented-hide:]
    */
-  'client_status': (keyof typeof _envoy_admin_v3_ClientResourceStatus);
+  'client_status': (_envoy_admin_v3_ClientResourceStatus__Output);
 }
 
 export interface _envoy_admin_v3_EndpointsConfigDump_StaticEndpointConfig {
diff --git a/packages/grpc-js-xds/src/generated/envoy/admin/v3/ListenersConfigDump.ts b/packages/grpc-js-xds/src/generated/envoy/admin/v3/ListenersConfigDump.ts
index 946e37953..a90338fdf 100644
--- a/packages/grpc-js-xds/src/generated/envoy/admin/v3/ListenersConfigDump.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/admin/v3/ListenersConfigDump.ts
@@ -3,7 +3,7 @@
 import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../google/protobuf/Any';
 import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp';
 import type { UpdateFailureState as _envoy_admin_v3_UpdateFailureState, UpdateFailureState__Output as _envoy_admin_v3_UpdateFailureState__Output } from '../../../envoy/admin/v3/UpdateFailureState';
-import type { ClientResourceStatus as _envoy_admin_v3_ClientResourceStatus } from '../../../envoy/admin/v3/ClientResourceStatus';
+import type { ClientResourceStatus as _envoy_admin_v3_ClientResourceStatus, ClientResourceStatus__Output as _envoy_admin_v3_ClientResourceStatus__Output } from '../../../envoy/admin/v3/ClientResourceStatus';
 
 /**
  * Describes a dynamically loaded listener via the LDS API.
@@ -44,7 +44,7 @@ export interface _envoy_admin_v3_ListenersConfigDump_DynamicListener {
    * The client status of this resource.
    * [#not-implemented-hide:]
    */
-  'client_status'?: (_envoy_admin_v3_ClientResourceStatus | keyof typeof _envoy_admin_v3_ClientResourceStatus);
+  'client_status'?: (_envoy_admin_v3_ClientResourceStatus);
 }
 
 /**
@@ -86,7 +86,7 @@ export interface _envoy_admin_v3_ListenersConfigDump_DynamicListener__Output {
    * The client status of this resource.
    * [#not-implemented-hide:]
    */
-  'client_status': (keyof typeof _envoy_admin_v3_ClientResourceStatus);
+  'client_status': (_envoy_admin_v3_ClientResourceStatus__Output);
 }
 
 export interface _envoy_admin_v3_ListenersConfigDump_DynamicListenerState {
diff --git a/packages/grpc-js-xds/src/generated/envoy/admin/v3/RoutesConfigDump.ts b/packages/grpc-js-xds/src/generated/envoy/admin/v3/RoutesConfigDump.ts
index 7b9bb29d0..6de43f0eb 100644
--- a/packages/grpc-js-xds/src/generated/envoy/admin/v3/RoutesConfigDump.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/admin/v3/RoutesConfigDump.ts
@@ -3,7 +3,7 @@
 import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../google/protobuf/Any';
 import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp';
 import type { UpdateFailureState as _envoy_admin_v3_UpdateFailureState, UpdateFailureState__Output as _envoy_admin_v3_UpdateFailureState__Output } from '../../../envoy/admin/v3/UpdateFailureState';
-import type { ClientResourceStatus as _envoy_admin_v3_ClientResourceStatus } from '../../../envoy/admin/v3/ClientResourceStatus';
+import type { ClientResourceStatus as _envoy_admin_v3_ClientResourceStatus, ClientResourceStatus__Output as _envoy_admin_v3_ClientResourceStatus__Output } from '../../../envoy/admin/v3/ClientResourceStatus';
 
 /**
  * [#next-free-field: 6]
@@ -35,7 +35,7 @@ export interface _envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig {
    * The client status of this resource.
    * [#not-implemented-hide:]
    */
-  'client_status'?: (_envoy_admin_v3_ClientResourceStatus | keyof typeof _envoy_admin_v3_ClientResourceStatus);
+  'client_status'?: (_envoy_admin_v3_ClientResourceStatus);
 }
 
 /**
@@ -68,7 +68,7 @@ export interface _envoy_admin_v3_RoutesConfigDump_DynamicRouteConfig__Output {
    * The client status of this resource.
    * [#not-implemented-hide:]
    */
-  'client_status': (keyof typeof _envoy_admin_v3_ClientResourceStatus);
+  'client_status': (_envoy_admin_v3_ClientResourceStatus__Output);
 }
 
 export interface _envoy_admin_v3_RoutesConfigDump_StaticRouteConfig {
diff --git a/packages/grpc-js-xds/src/generated/envoy/admin/v3/ScopedRoutesConfigDump.ts b/packages/grpc-js-xds/src/generated/envoy/admin/v3/ScopedRoutesConfigDump.ts
index c0723ce69..1ce3934cc 100644
--- a/packages/grpc-js-xds/src/generated/envoy/admin/v3/ScopedRoutesConfigDump.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/admin/v3/ScopedRoutesConfigDump.ts
@@ -3,7 +3,7 @@
 import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../google/protobuf/Any';
 import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp';
 import type { UpdateFailureState as _envoy_admin_v3_UpdateFailureState, UpdateFailureState__Output as _envoy_admin_v3_UpdateFailureState__Output } from '../../../envoy/admin/v3/UpdateFailureState';
-import type { ClientResourceStatus as _envoy_admin_v3_ClientResourceStatus } from '../../../envoy/admin/v3/ClientResourceStatus';
+import type { ClientResourceStatus as _envoy_admin_v3_ClientResourceStatus, ClientResourceStatus__Output as _envoy_admin_v3_ClientResourceStatus__Output } from '../../../envoy/admin/v3/ClientResourceStatus';
 
 /**
  * [#next-free-field: 7]
@@ -39,7 +39,7 @@ export interface _envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfig
    * The client status of this resource.
    * [#not-implemented-hide:]
    */
-  'client_status'?: (_envoy_admin_v3_ClientResourceStatus | keyof typeof _envoy_admin_v3_ClientResourceStatus);
+  'client_status'?: (_envoy_admin_v3_ClientResourceStatus);
 }
 
 /**
@@ -76,7 +76,7 @@ export interface _envoy_admin_v3_ScopedRoutesConfigDump_DynamicScopedRouteConfig
    * The client status of this resource.
    * [#not-implemented-hide:]
    */
-  'client_status': (keyof typeof _envoy_admin_v3_ClientResourceStatus);
+  'client_status': (_envoy_admin_v3_ClientResourceStatus__Output);
 }
 
 export interface _envoy_admin_v3_ScopedRoutesConfigDump_InlineScopedRouteConfigs {
diff --git a/packages/grpc-js-xds/src/generated/envoy/admin/v3/SecretsConfigDump.ts b/packages/grpc-js-xds/src/generated/envoy/admin/v3/SecretsConfigDump.ts
deleted file mode 100644
index 21921edec..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/admin/v3/SecretsConfigDump.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-// Original file: deps/envoy-api/envoy/admin/v3/config_dump.proto
-
-import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp';
-import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../google/protobuf/Any';
-import type { UpdateFailureState as _envoy_admin_v3_UpdateFailureState, UpdateFailureState__Output as _envoy_admin_v3_UpdateFailureState__Output } from '../../../envoy/admin/v3/UpdateFailureState';
-import type { ClientResourceStatus as _envoy_admin_v3_ClientResourceStatus } from '../../../envoy/admin/v3/ClientResourceStatus';
-
-/**
- * DynamicSecret contains secret information fetched via SDS.
- * [#next-free-field: 7]
- */
-export interface _envoy_admin_v3_SecretsConfigDump_DynamicSecret {
-  /**
-   * The name assigned to the secret.
-   */
-  'name'?: (string);
-  /**
-   * This is the per-resource version information.
-   */
-  'version_info'?: (string);
-  /**
-   * The timestamp when the secret was last updated.
-   */
-  'last_updated'?: (_google_protobuf_Timestamp | null);
-  /**
-   * The actual secret information.
-   * Security sensitive information is redacted (replaced with "[redacted]") for
-   * private keys and passwords in TLS certificates.
-   */
-  'secret'?: (_google_protobuf_Any | null);
-  /**
-   * Set if the last update failed, cleared after the next successful update.
-   * The *error_state* field contains the rejected version of this particular
-   * resource along with the reason and timestamp. For successfully updated or
-   * acknowledged resource, this field should be empty.
-   * [#not-implemented-hide:]
-   */
-  'error_state'?: (_envoy_admin_v3_UpdateFailureState | null);
-  /**
-   * The client status of this resource.
-   * [#not-implemented-hide:]
-   */
-  'client_status'?: (_envoy_admin_v3_ClientResourceStatus | keyof typeof _envoy_admin_v3_ClientResourceStatus);
-}
-
-/**
- * DynamicSecret contains secret information fetched via SDS.
- * [#next-free-field: 7]
- */
-export interface _envoy_admin_v3_SecretsConfigDump_DynamicSecret__Output {
-  /**
-   * The name assigned to the secret.
-   */
-  'name': (string);
-  /**
-   * This is the per-resource version information.
-   */
-  'version_info': (string);
-  /**
-   * The timestamp when the secret was last updated.
-   */
-  'last_updated': (_google_protobuf_Timestamp__Output | null);
-  /**
-   * The actual secret information.
-   * Security sensitive information is redacted (replaced with "[redacted]") for
-   * private keys and passwords in TLS certificates.
-   */
-  'secret': (_google_protobuf_Any__Output | null);
-  /**
-   * Set if the last update failed, cleared after the next successful update.
-   * The *error_state* field contains the rejected version of this particular
-   * resource along with the reason and timestamp. For successfully updated or
-   * acknowledged resource, this field should be empty.
-   * [#not-implemented-hide:]
-   */
-  'error_state': (_envoy_admin_v3_UpdateFailureState__Output | null);
-  /**
-   * The client status of this resource.
-   * [#not-implemented-hide:]
-   */
-  'client_status': (keyof typeof _envoy_admin_v3_ClientResourceStatus);
-}
-
-/**
- * StaticSecret specifies statically loaded secret in bootstrap.
- */
-export interface _envoy_admin_v3_SecretsConfigDump_StaticSecret {
-  /**
-   * The name assigned to the secret.
-   */
-  'name'?: (string);
-  /**
-   * The timestamp when the secret was last updated.
-   */
-  'last_updated'?: (_google_protobuf_Timestamp | null);
-  /**
-   * The actual secret information.
-   * Security sensitive information is redacted (replaced with "[redacted]") for
-   * private keys and passwords in TLS certificates.
-   */
-  'secret'?: (_google_protobuf_Any | null);
-}
-
-/**
- * StaticSecret specifies statically loaded secret in bootstrap.
- */
-export interface _envoy_admin_v3_SecretsConfigDump_StaticSecret__Output {
-  /**
-   * The name assigned to the secret.
-   */
-  'name': (string);
-  /**
-   * The timestamp when the secret was last updated.
-   */
-  'last_updated': (_google_protobuf_Timestamp__Output | null);
-  /**
-   * The actual secret information.
-   * Security sensitive information is redacted (replaced with "[redacted]") for
-   * private keys and passwords in TLS certificates.
-   */
-  'secret': (_google_protobuf_Any__Output | null);
-}
-
-/**
- * Envoys SDS implementation fills this message with all secrets fetched dynamically via SDS.
- */
-export interface SecretsConfigDump {
-  /**
-   * The statically loaded secrets.
-   */
-  'static_secrets'?: (_envoy_admin_v3_SecretsConfigDump_StaticSecret)[];
-  /**
-   * The dynamically loaded active secrets. These are secrets that are available to service
-   * clusters or listeners.
-   */
-  'dynamic_active_secrets'?: (_envoy_admin_v3_SecretsConfigDump_DynamicSecret)[];
-  /**
-   * The dynamically loaded warming secrets. These are secrets that are currently undergoing
-   * warming in preparation to service clusters or listeners.
-   */
-  'dynamic_warming_secrets'?: (_envoy_admin_v3_SecretsConfigDump_DynamicSecret)[];
-}
-
-/**
- * Envoys SDS implementation fills this message with all secrets fetched dynamically via SDS.
- */
-export interface SecretsConfigDump__Output {
-  /**
-   * The statically loaded secrets.
-   */
-  'static_secrets': (_envoy_admin_v3_SecretsConfigDump_StaticSecret__Output)[];
-  /**
-   * The dynamically loaded active secrets. These are secrets that are available to service
-   * clusters or listeners.
-   */
-  'dynamic_active_secrets': (_envoy_admin_v3_SecretsConfigDump_DynamicSecret__Output)[];
-  /**
-   * The dynamically loaded warming secrets. These are secrets that are currently undergoing
-   * warming in preparation to service clusters or listeners.
-   */
-  'dynamic_warming_secrets': (_envoy_admin_v3_SecretsConfigDump_DynamicSecret__Output)[];
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/accesslog/v3/ComparisonFilter.ts b/packages/grpc-js-xds/src/generated/envoy/config/accesslog/v3/ComparisonFilter.ts
index 07893f2dd..68c8f1b65 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/accesslog/v3/ComparisonFilter.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/accesslog/v3/ComparisonFilter.ts
@@ -4,20 +4,39 @@ import type { RuntimeUInt32 as _envoy_config_core_v3_RuntimeUInt32, RuntimeUInt3
 
 // Original file: deps/envoy-api/envoy/config/accesslog/v3/accesslog.proto
 
-export enum _envoy_config_accesslog_v3_ComparisonFilter_Op {
+export const _envoy_config_accesslog_v3_ComparisonFilter_Op = {
   /**
    * =
    */
-  EQ = 0,
+  EQ: 'EQ',
   /**
    * >=
    */
-  GE = 1,
+  GE: 'GE',
   /**
    * <=
    */
-  LE = 2,
-}
+  LE: 'LE',
+} as const;
+
+export type _envoy_config_accesslog_v3_ComparisonFilter_Op =
+  /**
+   * =
+   */
+  | 'EQ'
+  | 0
+  /**
+   * >=
+   */
+  | 'GE'
+  | 1
+  /**
+   * <=
+   */
+  | 'LE'
+  | 2
+
+export type _envoy_config_accesslog_v3_ComparisonFilter_Op__Output = typeof _envoy_config_accesslog_v3_ComparisonFilter_Op[keyof typeof _envoy_config_accesslog_v3_ComparisonFilter_Op]
 
 /**
  * Filter on an integer comparison.
@@ -26,7 +45,7 @@ export interface ComparisonFilter {
   /**
    * Comparison operator.
    */
-  'op'?: (_envoy_config_accesslog_v3_ComparisonFilter_Op | keyof typeof _envoy_config_accesslog_v3_ComparisonFilter_Op);
+  'op'?: (_envoy_config_accesslog_v3_ComparisonFilter_Op);
   /**
    * Value to compare against.
    */
@@ -40,7 +59,7 @@ export interface ComparisonFilter__Output {
   /**
    * Comparison operator.
    */
-  'op': (keyof typeof _envoy_config_accesslog_v3_ComparisonFilter_Op);
+  'op': (_envoy_config_accesslog_v3_ComparisonFilter_Op__Output);
   /**
    * Value to compare against.
    */
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/accesslog/v3/GrpcStatusFilter.ts b/packages/grpc-js-xds/src/generated/envoy/config/accesslog/v3/GrpcStatusFilter.ts
index f7ccc8052..ec18bde8a 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/accesslog/v3/GrpcStatusFilter.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/accesslog/v3/GrpcStatusFilter.ts
@@ -3,25 +3,63 @@
 
 // Original file: deps/envoy-api/envoy/config/accesslog/v3/accesslog.proto
 
-export enum _envoy_config_accesslog_v3_GrpcStatusFilter_Status {
-  OK = 0,
-  CANCELED = 1,
-  UNKNOWN = 2,
-  INVALID_ARGUMENT = 3,
-  DEADLINE_EXCEEDED = 4,
-  NOT_FOUND = 5,
-  ALREADY_EXISTS = 6,
-  PERMISSION_DENIED = 7,
-  RESOURCE_EXHAUSTED = 8,
-  FAILED_PRECONDITION = 9,
-  ABORTED = 10,
-  OUT_OF_RANGE = 11,
-  UNIMPLEMENTED = 12,
-  INTERNAL = 13,
-  UNAVAILABLE = 14,
-  DATA_LOSS = 15,
-  UNAUTHENTICATED = 16,
-}
+export const _envoy_config_accesslog_v3_GrpcStatusFilter_Status = {
+  OK: 'OK',
+  CANCELED: 'CANCELED',
+  UNKNOWN: 'UNKNOWN',
+  INVALID_ARGUMENT: 'INVALID_ARGUMENT',
+  DEADLINE_EXCEEDED: 'DEADLINE_EXCEEDED',
+  NOT_FOUND: 'NOT_FOUND',
+  ALREADY_EXISTS: 'ALREADY_EXISTS',
+  PERMISSION_DENIED: 'PERMISSION_DENIED',
+  RESOURCE_EXHAUSTED: 'RESOURCE_EXHAUSTED',
+  FAILED_PRECONDITION: 'FAILED_PRECONDITION',
+  ABORTED: 'ABORTED',
+  OUT_OF_RANGE: 'OUT_OF_RANGE',
+  UNIMPLEMENTED: 'UNIMPLEMENTED',
+  INTERNAL: 'INTERNAL',
+  UNAVAILABLE: 'UNAVAILABLE',
+  DATA_LOSS: 'DATA_LOSS',
+  UNAUTHENTICATED: 'UNAUTHENTICATED',
+} as const;
+
+export type _envoy_config_accesslog_v3_GrpcStatusFilter_Status =
+  | 'OK'
+  | 0
+  | 'CANCELED'
+  | 1
+  | 'UNKNOWN'
+  | 2
+  | 'INVALID_ARGUMENT'
+  | 3
+  | 'DEADLINE_EXCEEDED'
+  | 4
+  | 'NOT_FOUND'
+  | 5
+  | 'ALREADY_EXISTS'
+  | 6
+  | 'PERMISSION_DENIED'
+  | 7
+  | 'RESOURCE_EXHAUSTED'
+  | 8
+  | 'FAILED_PRECONDITION'
+  | 9
+  | 'ABORTED'
+  | 10
+  | 'OUT_OF_RANGE'
+  | 11
+  | 'UNIMPLEMENTED'
+  | 12
+  | 'INTERNAL'
+  | 13
+  | 'UNAVAILABLE'
+  | 14
+  | 'DATA_LOSS'
+  | 15
+  | 'UNAUTHENTICATED'
+  | 16
+
+export type _envoy_config_accesslog_v3_GrpcStatusFilter_Status__Output = typeof _envoy_config_accesslog_v3_GrpcStatusFilter_Status[keyof typeof _envoy_config_accesslog_v3_GrpcStatusFilter_Status]
 
 /**
  * Filters gRPC requests based on their response status. If a gRPC status is not
@@ -31,7 +69,7 @@ export interface GrpcStatusFilter {
   /**
    * Logs only responses that have any one of the gRPC statuses in this field.
    */
-  'statuses'?: (_envoy_config_accesslog_v3_GrpcStatusFilter_Status | keyof typeof _envoy_config_accesslog_v3_GrpcStatusFilter_Status)[];
+  'statuses'?: (_envoy_config_accesslog_v3_GrpcStatusFilter_Status)[];
   /**
    * If included and set to true, the filter will instead block all responses
    * with a gRPC status or inferred gRPC status enumerated in statuses, and
@@ -48,7 +86,7 @@ export interface GrpcStatusFilter__Output {
   /**
    * Logs only responses that have any one of the gRPC statuses in this field.
    */
-  'statuses': (keyof typeof _envoy_config_accesslog_v3_GrpcStatusFilter_Status)[];
+  'statuses': (_envoy_config_accesslog_v3_GrpcStatusFilter_Status__Output)[];
   /**
    * If included and set to true, the filter will instead block all responses
    * with a gRPC status or inferred gRPC status enumerated in statuses, and
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/accesslog/v3/LogTypeFilter.ts b/packages/grpc-js-xds/src/generated/envoy/config/accesslog/v3/LogTypeFilter.ts
index 8d51cd33f..59ad8e308 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/accesslog/v3/LogTypeFilter.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/accesslog/v3/LogTypeFilter.ts
@@ -1,6 +1,6 @@
 // Original file: deps/envoy-api/envoy/config/accesslog/v3/accesslog.proto
 
-import type { AccessLogType as _envoy_data_accesslog_v3_AccessLogType } from '../../../../envoy/data/accesslog/v3/AccessLogType';
+import type { AccessLogType as _envoy_data_accesslog_v3_AccessLogType, AccessLogType__Output as _envoy_data_accesslog_v3_AccessLogType__Output } from '../../../../envoy/data/accesslog/v3/AccessLogType';
 
 /**
  * Filters based on access log type.
@@ -9,7 +9,7 @@ export interface LogTypeFilter {
   /**
    * Logs only records which their type is one of the types defined in this field.
    */
-  'types'?: (_envoy_data_accesslog_v3_AccessLogType | keyof typeof _envoy_data_accesslog_v3_AccessLogType)[];
+  'types'?: (_envoy_data_accesslog_v3_AccessLogType)[];
   /**
    * If this field is set to true, the filter will instead block all records
    * with a access log type in types field, and allow all other records.
@@ -24,7 +24,7 @@ export interface LogTypeFilter__Output {
   /**
    * Logs only records which their type is one of the types defined in this field.
    */
-  'types': (keyof typeof _envoy_data_accesslog_v3_AccessLogType)[];
+  'types': (_envoy_data_accesslog_v3_AccessLogType__Output)[];
   /**
    * If this field is set to true, the filter will instead block all records
    * with a access log type in types field, and allow all other records.
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/Admin.ts b/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/Admin.ts
deleted file mode 100644
index a7f3826a1..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/Admin.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/bootstrap/v3/bootstrap.proto
-
-import type { Address as _envoy_config_core_v3_Address, Address__Output as _envoy_config_core_v3_Address__Output } from '../../../../envoy/config/core/v3/Address';
-import type { SocketOption as _envoy_config_core_v3_SocketOption, SocketOption__Output as _envoy_config_core_v3_SocketOption__Output } from '../../../../envoy/config/core/v3/SocketOption';
-import type { AccessLog as _envoy_config_accesslog_v3_AccessLog, AccessLog__Output as _envoy_config_accesslog_v3_AccessLog__Output } from '../../../../envoy/config/accesslog/v3/AccessLog';
-
-/**
- * Administration interface :ref:`operations documentation
- * <operations_admin_interface>`.
- * [#next-free-field: 6]
- */
-export interface Admin {
-  /**
-   * The path to write the access log for the administration server. If no
-   * access log is desired specify ‘/dev/null’. This is only required if
-   * :ref:`address <envoy_v3_api_field_config.bootstrap.v3.Admin.address>` is set.
-   * Deprecated in favor of *access_log* which offers more options.
-   */
-  'access_log_path'?: (string);
-  /**
-   * The cpu profiler output path for the administration server. If no profile
-   * path is specified, the default is ‘/var/log/envoy/envoy.prof’.
-   */
-  'profile_path'?: (string);
-  /**
-   * The TCP address that the administration server will listen on.
-   * If not specified, Envoy will not start an administration server.
-   */
-  'address'?: (_envoy_config_core_v3_Address | null);
-  /**
-   * Additional socket options that may not be present in Envoy source code or
-   * precompiled binaries.
-   */
-  'socket_options'?: (_envoy_config_core_v3_SocketOption)[];
-  /**
-   * Configuration for :ref:`access logs <arch_overview_access_logs>`
-   * emitted by the administration server.
-   */
-  'access_log'?: (_envoy_config_accesslog_v3_AccessLog)[];
-}
-
-/**
- * Administration interface :ref:`operations documentation
- * <operations_admin_interface>`.
- * [#next-free-field: 6]
- */
-export interface Admin__Output {
-  /**
-   * The path to write the access log for the administration server. If no
-   * access log is desired specify ‘/dev/null’. This is only required if
-   * :ref:`address <envoy_v3_api_field_config.bootstrap.v3.Admin.address>` is set.
-   * Deprecated in favor of *access_log* which offers more options.
-   */
-  'access_log_path': (string);
-  /**
-   * The cpu profiler output path for the administration server. If no profile
-   * path is specified, the default is ‘/var/log/envoy/envoy.prof’.
-   */
-  'profile_path': (string);
-  /**
-   * The TCP address that the administration server will listen on.
-   * If not specified, Envoy will not start an administration server.
-   */
-  'address': (_envoy_config_core_v3_Address__Output | null);
-  /**
-   * Additional socket options that may not be present in Envoy source code or
-   * precompiled binaries.
-   */
-  'socket_options': (_envoy_config_core_v3_SocketOption__Output)[];
-  /**
-   * Configuration for :ref:`access logs <arch_overview_access_logs>`
-   * emitted by the administration server.
-   */
-  'access_log': (_envoy_config_accesslog_v3_AccessLog__Output)[];
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/Bootstrap.ts b/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/Bootstrap.ts
deleted file mode 100644
index 797148675..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/Bootstrap.ts
+++ /dev/null
@@ -1,642 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/bootstrap/v3/bootstrap.proto
-
-import type { Node as _envoy_config_core_v3_Node, Node__Output as _envoy_config_core_v3_Node__Output } from '../../../../envoy/config/core/v3/Node';
-import type { ClusterManager as _envoy_config_bootstrap_v3_ClusterManager, ClusterManager__Output as _envoy_config_bootstrap_v3_ClusterManager__Output } from '../../../../envoy/config/bootstrap/v3/ClusterManager';
-import type { StatsSink as _envoy_config_metrics_v3_StatsSink, StatsSink__Output as _envoy_config_metrics_v3_StatsSink__Output } from '../../../../envoy/config/metrics/v3/StatsSink';
-import type { Duration as _google_protobuf_Duration, Duration__Output as _google_protobuf_Duration__Output } from '../../../../google/protobuf/Duration';
-import type { Watchdog as _envoy_config_bootstrap_v3_Watchdog, Watchdog__Output as _envoy_config_bootstrap_v3_Watchdog__Output } from '../../../../envoy/config/bootstrap/v3/Watchdog';
-import type { Tracing as _envoy_config_trace_v3_Tracing, Tracing__Output as _envoy_config_trace_v3_Tracing__Output } from '../../../../envoy/config/trace/v3/Tracing';
-import type { Admin as _envoy_config_bootstrap_v3_Admin, Admin__Output as _envoy_config_bootstrap_v3_Admin__Output } from '../../../../envoy/config/bootstrap/v3/Admin';
-import type { StatsConfig as _envoy_config_metrics_v3_StatsConfig, StatsConfig__Output as _envoy_config_metrics_v3_StatsConfig__Output } from '../../../../envoy/config/metrics/v3/StatsConfig';
-import type { ApiConfigSource as _envoy_config_core_v3_ApiConfigSource, ApiConfigSource__Output as _envoy_config_core_v3_ApiConfigSource__Output } from '../../../../envoy/config/core/v3/ApiConfigSource';
-import type { OverloadManager as _envoy_config_overload_v3_OverloadManager, OverloadManager__Output as _envoy_config_overload_v3_OverloadManager__Output } from '../../../../envoy/config/overload/v3/OverloadManager';
-import type { LayeredRuntime as _envoy_config_bootstrap_v3_LayeredRuntime, LayeredRuntime__Output as _envoy_config_bootstrap_v3_LayeredRuntime__Output } from '../../../../envoy/config/bootstrap/v3/LayeredRuntime';
-import type { UInt64Value as _google_protobuf_UInt64Value, UInt64Value__Output as _google_protobuf_UInt64Value__Output } from '../../../../google/protobuf/UInt64Value';
-import type { TypedExtensionConfig as _envoy_config_core_v3_TypedExtensionConfig, TypedExtensionConfig__Output as _envoy_config_core_v3_TypedExtensionConfig__Output } from '../../../../envoy/config/core/v3/TypedExtensionConfig';
-import type { ConfigSource as _envoy_config_core_v3_ConfigSource, ConfigSource__Output as _envoy_config_core_v3_ConfigSource__Output } from '../../../../envoy/config/core/v3/ConfigSource';
-import type { Watchdogs as _envoy_config_bootstrap_v3_Watchdogs, Watchdogs__Output as _envoy_config_bootstrap_v3_Watchdogs__Output } from '../../../../envoy/config/bootstrap/v3/Watchdogs';
-import type { FatalAction as _envoy_config_bootstrap_v3_FatalAction, FatalAction__Output as _envoy_config_bootstrap_v3_FatalAction__Output } from '../../../../envoy/config/bootstrap/v3/FatalAction';
-import type { DnsResolutionConfig as _envoy_config_core_v3_DnsResolutionConfig, DnsResolutionConfig__Output as _envoy_config_core_v3_DnsResolutionConfig__Output } from '../../../../envoy/config/core/v3/DnsResolutionConfig';
-import type { CustomInlineHeader as _envoy_config_bootstrap_v3_CustomInlineHeader, CustomInlineHeader__Output as _envoy_config_bootstrap_v3_CustomInlineHeader__Output } from '../../../../envoy/config/bootstrap/v3/CustomInlineHeader';
-import type { Listener as _envoy_config_listener_v3_Listener, Listener__Output as _envoy_config_listener_v3_Listener__Output } from '../../../../envoy/config/listener/v3/Listener';
-import type { Cluster as _envoy_config_cluster_v3_Cluster, Cluster__Output as _envoy_config_cluster_v3_Cluster__Output } from '../../../../envoy/config/cluster/v3/Cluster';
-import type { Secret as _envoy_extensions_transport_sockets_tls_v3_Secret, Secret__Output as _envoy_extensions_transport_sockets_tls_v3_Secret__Output } from '../../../../envoy/extensions/transport_sockets/tls/v3/Secret';
-import type { Long } from '@grpc/proto-loader';
-
-/**
- * [#next-free-field: 7]
- */
-export interface _envoy_config_bootstrap_v3_Bootstrap_DynamicResources {
-  /**
-   * All :ref:`Listeners <envoy_v3_api_msg_config.listener.v3.Listener>` are provided by a single
-   * :ref:`LDS <arch_overview_dynamic_config_lds>` configuration source.
-   */
-  'lds_config'?: (_envoy_config_core_v3_ConfigSource | null);
-  /**
-   * xdstp:// resource locator for listener collection.
-   * [#not-implemented-hide:]
-   */
-  'lds_resources_locator'?: (string);
-  /**
-   * All post-bootstrap :ref:`Cluster <envoy_v3_api_msg_config.cluster.v3.Cluster>` definitions are
-   * provided by a single :ref:`CDS <arch_overview_dynamic_config_cds>`
-   * configuration source.
-   */
-  'cds_config'?: (_envoy_config_core_v3_ConfigSource | null);
-  /**
-   * xdstp:// resource locator for cluster collection.
-   * [#not-implemented-hide:]
-   */
-  'cds_resources_locator'?: (string);
-  /**
-   * A single :ref:`ADS <config_overview_ads>` source may be optionally
-   * specified. This must have :ref:`api_type
-   * <envoy_v3_api_field_config.core.v3.ApiConfigSource.api_type>` :ref:`GRPC
-   * <envoy_v3_api_enum_value_config.core.v3.ApiConfigSource.ApiType.GRPC>`. Only
-   * :ref:`ConfigSources <envoy_v3_api_msg_config.core.v3.ConfigSource>` that have
-   * the :ref:`ads <envoy_v3_api_field_config.core.v3.ConfigSource.ads>` field set will be
-   * streamed on the ADS channel.
-   */
-  'ads_config'?: (_envoy_config_core_v3_ApiConfigSource | null);
-}
-
-/**
- * [#next-free-field: 7]
- */
-export interface _envoy_config_bootstrap_v3_Bootstrap_DynamicResources__Output {
-  /**
-   * All :ref:`Listeners <envoy_v3_api_msg_config.listener.v3.Listener>` are provided by a single
-   * :ref:`LDS <arch_overview_dynamic_config_lds>` configuration source.
-   */
-  'lds_config': (_envoy_config_core_v3_ConfigSource__Output | null);
-  /**
-   * xdstp:// resource locator for listener collection.
-   * [#not-implemented-hide:]
-   */
-  'lds_resources_locator': (string);
-  /**
-   * All post-bootstrap :ref:`Cluster <envoy_v3_api_msg_config.cluster.v3.Cluster>` definitions are
-   * provided by a single :ref:`CDS <arch_overview_dynamic_config_cds>`
-   * configuration source.
-   */
-  'cds_config': (_envoy_config_core_v3_ConfigSource__Output | null);
-  /**
-   * xdstp:// resource locator for cluster collection.
-   * [#not-implemented-hide:]
-   */
-  'cds_resources_locator': (string);
-  /**
-   * A single :ref:`ADS <config_overview_ads>` source may be optionally
-   * specified. This must have :ref:`api_type
-   * <envoy_v3_api_field_config.core.v3.ApiConfigSource.api_type>` :ref:`GRPC
-   * <envoy_v3_api_enum_value_config.core.v3.ApiConfigSource.ApiType.GRPC>`. Only
-   * :ref:`ConfigSources <envoy_v3_api_msg_config.core.v3.ConfigSource>` that have
-   * the :ref:`ads <envoy_v3_api_field_config.core.v3.ConfigSource.ads>` field set will be
-   * streamed on the ADS channel.
-   */
-  'ads_config': (_envoy_config_core_v3_ApiConfigSource__Output | null);
-}
-
-export interface _envoy_config_bootstrap_v3_Bootstrap_StaticResources {
-  /**
-   * Static :ref:`Listeners <envoy_v3_api_msg_config.listener.v3.Listener>`. These listeners are
-   * available regardless of LDS configuration.
-   */
-  'listeners'?: (_envoy_config_listener_v3_Listener)[];
-  /**
-   * If a network based configuration source is specified for :ref:`cds_config
-   * <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.DynamicResources.cds_config>`, it's necessary
-   * to have some initial cluster definitions available to allow Envoy to know
-   * how to speak to the management server. These cluster definitions may not
-   * use :ref:`EDS <arch_overview_dynamic_config_eds>` (i.e. they should be static
-   * IP or DNS-based).
-   */
-  'clusters'?: (_envoy_config_cluster_v3_Cluster)[];
-  /**
-   * These static secrets can be used by :ref:`SdsSecretConfig
-   * <envoy_v3_api_msg_extensions.transport_sockets.tls.v3.SdsSecretConfig>`
-   */
-  'secrets'?: (_envoy_extensions_transport_sockets_tls_v3_Secret)[];
-}
-
-export interface _envoy_config_bootstrap_v3_Bootstrap_StaticResources__Output {
-  /**
-   * Static :ref:`Listeners <envoy_v3_api_msg_config.listener.v3.Listener>`. These listeners are
-   * available regardless of LDS configuration.
-   */
-  'listeners': (_envoy_config_listener_v3_Listener__Output)[];
-  /**
-   * If a network based configuration source is specified for :ref:`cds_config
-   * <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.DynamicResources.cds_config>`, it's necessary
-   * to have some initial cluster definitions available to allow Envoy to know
-   * how to speak to the management server. These cluster definitions may not
-   * use :ref:`EDS <arch_overview_dynamic_config_eds>` (i.e. they should be static
-   * IP or DNS-based).
-   */
-  'clusters': (_envoy_config_cluster_v3_Cluster__Output)[];
-  /**
-   * These static secrets can be used by :ref:`SdsSecretConfig
-   * <envoy_v3_api_msg_extensions.transport_sockets.tls.v3.SdsSecretConfig>`
-   */
-  'secrets': (_envoy_extensions_transport_sockets_tls_v3_Secret__Output)[];
-}
-
-/**
- * Bootstrap :ref:`configuration overview <config_overview_bootstrap>`.
- * [#next-free-field: 33]
- */
-export interface Bootstrap {
-  /**
-   * Node identity to present to the management server and for instance
-   * identification purposes (e.g. in generated headers).
-   */
-  'node'?: (_envoy_config_core_v3_Node | null);
-  /**
-   * Statically specified resources.
-   */
-  'static_resources'?: (_envoy_config_bootstrap_v3_Bootstrap_StaticResources | null);
-  /**
-   * xDS configuration sources.
-   */
-  'dynamic_resources'?: (_envoy_config_bootstrap_v3_Bootstrap_DynamicResources | null);
-  /**
-   * Configuration for the cluster manager which owns all upstream clusters
-   * within the server.
-   */
-  'cluster_manager'?: (_envoy_config_bootstrap_v3_ClusterManager | null);
-  /**
-   * Optional file system path to search for startup flag files.
-   */
-  'flags_path'?: (string);
-  /**
-   * Optional set of stats sinks.
-   */
-  'stats_sinks'?: (_envoy_config_metrics_v3_StatsSink)[];
-  /**
-   * Optional duration between flushes to configured stats sinks. For
-   * performance reasons Envoy latches counters and only flushes counters and
-   * gauges at a periodic interval. If not specified the default is 5000ms (5
-   * seconds). Only one of `stats_flush_interval` or `stats_flush_on_admin`
-   * can be set.
-   * Duration must be at least 1ms and at most 5 min.
-   */
-  'stats_flush_interval'?: (_google_protobuf_Duration | null);
-  /**
-   * Optional watchdog configuration.
-   * This is for a single watchdog configuration for the entire system.
-   * Deprecated in favor of *watchdogs* which has finer granularity.
-   */
-  'watchdog'?: (_envoy_config_bootstrap_v3_Watchdog | null);
-  /**
-   * Configuration for an external tracing provider.
-   * 
-   * .. attention::
-   * This field has been deprecated in favor of :ref:`HttpConnectionManager.Tracing.provider
-   * <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing.provider>`.
-   */
-  'tracing'?: (_envoy_config_trace_v3_Tracing | null);
-  /**
-   * Configuration for the local administration HTTP server.
-   */
-  'admin'?: (_envoy_config_bootstrap_v3_Admin | null);
-  /**
-   * Configuration for internal processing of stats.
-   */
-  'stats_config'?: (_envoy_config_metrics_v3_StatsConfig | null);
-  /**
-   * Health discovery service config option.
-   * (:ref:`core.ApiConfigSource <envoy_v3_api_msg_config.core.v3.ApiConfigSource>`)
-   */
-  'hds_config'?: (_envoy_config_core_v3_ApiConfigSource | null);
-  /**
-   * Optional overload manager configuration.
-   */
-  'overload_manager'?: (_envoy_config_overload_v3_OverloadManager | null);
-  /**
-   * Enable :ref:`stats for event dispatcher <operations_performance>`, defaults to false.
-   * Note that this records a value for each iteration of the event loop on every thread. This
-   * should normally be minimal overhead, but when using
-   * :ref:`statsd <envoy_v3_api_msg_config.metrics.v3.StatsdSink>`, it will send each observed value
-   * over the wire individually because the statsd protocol doesn't have any way to represent a
-   * histogram summary. Be aware that this can be a very large volume of data.
-   */
-  'enable_dispatcher_stats'?: (boolean);
-  /**
-   * Configuration for the runtime configuration provider. If not
-   * specified, a “null” provider will be used which will result in all defaults
-   * being used.
-   */
-  'layered_runtime'?: (_envoy_config_bootstrap_v3_LayeredRuntime | null);
-  /**
-   * Optional string which will be used in lieu of x-envoy in prefixing headers.
-   * 
-   * For example, if this string is present and set to X-Foo, then x-envoy-retry-on will be
-   * transformed into x-foo-retry-on etc.
-   * 
-   * Note this applies to the headers Envoy will generate, the headers Envoy will sanitize, and the
-   * headers Envoy will trust for core code and core extensions only. Be VERY careful making
-   * changes to this string, especially in multi-layer Envoy deployments or deployments using
-   * extensions which are not upstream.
-   */
-  'header_prefix'?: (string);
-  /**
-   * Optional proxy version which will be used to set the value of :ref:`server.version statistic
-   * <server_statistics>` if specified. Envoy will not process this value, it will be sent as is to
-   * :ref:`stats sinks <envoy_v3_api_msg_config.metrics.v3.StatsSink>`.
-   */
-  'stats_server_version_override'?: (_google_protobuf_UInt64Value | null);
-  /**
-   * Always use TCP queries instead of UDP queries for DNS lookups.
-   * This may be overridden on a per-cluster basis in cds_config,
-   * when :ref:`dns_resolvers <envoy_v3_api_field_config.cluster.v3.Cluster.dns_resolvers>` and
-   * :ref:`use_tcp_for_dns_lookups <envoy_v3_api_field_config.cluster.v3.Cluster.use_tcp_for_dns_lookups>` are
-   * specified.
-   * Setting this value causes failure if the
-   * ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during
-   * server startup. Apple' API only uses UDP for DNS resolution.
-   * This field is deprecated in favor of *dns_resolution_config*
-   * which aggregates all of the DNS resolver configuration in a single message.
-   */
-  'use_tcp_for_dns_lookups'?: (boolean);
-  /**
-   * Specifies optional bootstrap extensions to be instantiated at startup time.
-   * Each item contains extension specific configuration.
-   * [#extension-category: envoy.bootstrap]
-   */
-  'bootstrap_extensions'?: (_envoy_config_core_v3_TypedExtensionConfig)[];
-  /**
-   * Configuration sources that will participate in
-   * xdstp:// URL authority resolution. The algorithm is as
-   * follows:
-   * 1. The authority field is taken from the xdstp:// URL, call
-   * this *resource_authority*.
-   * 2. *resource_authority* is compared against the authorities in any peer
-   * *ConfigSource*. The peer *ConfigSource* is the configuration source
-   * message which would have been used unconditionally for resolution
-   * with opaque resource names. If there is a match with an authority, the
-   * peer *ConfigSource* message is used.
-   * 3. *resource_authority* is compared sequentially with the authorities in
-   * each configuration source in *config_sources*. The first *ConfigSource*
-   * to match wins.
-   * 4. As a fallback, if no configuration source matches, then
-   * *default_config_source* is used.
-   * 5. If *default_config_source* is not specified, resolution fails.
-   * [#not-implemented-hide:]
-   */
-  'config_sources'?: (_envoy_config_core_v3_ConfigSource)[];
-  /**
-   * Default configuration source for xdstp:// URLs if all
-   * other resolution fails.
-   * [#not-implemented-hide:]
-   */
-  'default_config_source'?: (_envoy_config_core_v3_ConfigSource | null);
-  /**
-   * Optional overriding of default socket interface. The value must be the name of one of the
-   * socket interface factories initialized through a bootstrap extension
-   */
-  'default_socket_interface'?: (string);
-  /**
-   * Global map of CertificateProvider instances. These instances are referred to by name in the
-   * :ref:`CommonTlsContext.CertificateProviderInstance.instance_name
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProviderInstance.instance_name>`
-   * field.
-   * [#not-implemented-hide:]
-   */
-  'certificate_provider_instances'?: ({[key: string]: _envoy_config_core_v3_TypedExtensionConfig});
-  /**
-   * A list of :ref:`Node <envoy_v3_api_msg_config.core.v3.Node>` field names
-   * that will be included in the context parameters of the effective
-   * xdstp:// URL that is sent in a discovery request when resource
-   * locators are used for LDS/CDS. Any non-string field will have its JSON
-   * encoding set as the context parameter value, with the exception of
-   * metadata, which will be flattened (see example below). The supported field
-   * names are:
-   * - "cluster"
-   * - "id"
-   * - "locality.region"
-   * - "locality.sub_zone"
-   * - "locality.zone"
-   * - "metadata"
-   * - "user_agent_build_version.metadata"
-   * - "user_agent_build_version.version"
-   * - "user_agent_name"
-   * - "user_agent_version"
-   * 
-   * The node context parameters act as a base layer dictionary for the context
-   * parameters (i.e. more specific resource specific context parameters will
-   * override). Field names will be prefixed with “udpa.node.” when included in
-   * context parameters.
-   * 
-   * For example, if node_context_params is ``["user_agent_name", "metadata"]``,
-   * the implied context parameters might be::
-   * 
-   * node.user_agent_name: "envoy"
-   * node.metadata.foo: "{\"bar\": \"baz\"}"
-   * node.metadata.some: "42"
-   * node.metadata.thing: "\"thing\""
-   * 
-   * [#not-implemented-hide:]
-   */
-  'node_context_params'?: (string)[];
-  /**
-   * Optional watchdogs configuration.
-   * This is used for specifying different watchdogs for the different subsystems.
-   * [#extension-category: envoy.guarddog_actions]
-   */
-  'watchdogs'?: (_envoy_config_bootstrap_v3_Watchdogs | null);
-  /**
-   * Specifies optional extensions instantiated at startup time and
-   * invoked during crash time on the request that caused the crash.
-   */
-  'fatal_actions'?: (_envoy_config_bootstrap_v3_FatalAction)[];
-  /**
-   * Flush stats to sinks only when queried for on the admin interface. If set,
-   * a flush timer is not created. Only one of `stats_flush_on_admin` or
-   * `stats_flush_interval` can be set.
-   */
-  'stats_flush_on_admin'?: (boolean);
-  /**
-   * DNS resolution configuration which includes the underlying dns resolver addresses and options.
-   * This may be overridden on a per-cluster basis in cds_config, when
-   * :ref:`dns_resolution_config <envoy_v3_api_field_config.cluster.v3.Cluster.dns_resolution_config>`
-   * is specified.
-   * *dns_resolution_config* will be deprecated once
-   * :ref:'typed_dns_resolver_config <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.typed_dns_resolver_config>'
-   * is fully supported.
-   */
-  'dns_resolution_config'?: (_envoy_config_core_v3_DnsResolutionConfig | null);
-  /**
-   * DNS resolver type configuration extension. This extension can be used to configure c-ares, apple,
-   * or any other DNS resolver types and the related parameters.
-   * For example, an object of :ref:`DnsResolutionConfig <envoy_v3_api_msg_config.core.v3.DnsResolutionConfig>`
-   * can be packed into this *typed_dns_resolver_config*. This configuration will replace the
-   * :ref:'dns_resolution_config <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.dns_resolution_config>'
-   * configuration eventually.
-   * TODO(yanjunxiang): Investigate the deprecation plan for *dns_resolution_config*.
-   * During the transition period when both *dns_resolution_config* and *typed_dns_resolver_config* exists,
-   * this configuration is optional.
-   * When *typed_dns_resolver_config* is in place, Envoy will use it and ignore *dns_resolution_config*.
-   * When *typed_dns_resolver_config* is missing, the default behavior is in place.
-   * [#not-implemented-hide:]
-   */
-  'typed_dns_resolver_config'?: (_envoy_config_core_v3_TypedExtensionConfig | null);
-  /**
-   * Specifies a set of headers that need to be registered as inline header. This configuration
-   * allows users to customize the inline headers on-demand at Envoy startup without modifying
-   * Envoy's source code.
-   * 
-   * Note that the 'set-cookie' header cannot be registered as inline header.
-   */
-  'inline_headers'?: (_envoy_config_bootstrap_v3_CustomInlineHeader)[];
-  'stats_flush'?: "stats_flush_on_admin";
-}
-
-/**
- * Bootstrap :ref:`configuration overview <config_overview_bootstrap>`.
- * [#next-free-field: 33]
- */
-export interface Bootstrap__Output {
-  /**
-   * Node identity to present to the management server and for instance
-   * identification purposes (e.g. in generated headers).
-   */
-  'node': (_envoy_config_core_v3_Node__Output | null);
-  /**
-   * Statically specified resources.
-   */
-  'static_resources': (_envoy_config_bootstrap_v3_Bootstrap_StaticResources__Output | null);
-  /**
-   * xDS configuration sources.
-   */
-  'dynamic_resources': (_envoy_config_bootstrap_v3_Bootstrap_DynamicResources__Output | null);
-  /**
-   * Configuration for the cluster manager which owns all upstream clusters
-   * within the server.
-   */
-  'cluster_manager': (_envoy_config_bootstrap_v3_ClusterManager__Output | null);
-  /**
-   * Optional file system path to search for startup flag files.
-   */
-  'flags_path': (string);
-  /**
-   * Optional set of stats sinks.
-   */
-  'stats_sinks': (_envoy_config_metrics_v3_StatsSink__Output)[];
-  /**
-   * Optional duration between flushes to configured stats sinks. For
-   * performance reasons Envoy latches counters and only flushes counters and
-   * gauges at a periodic interval. If not specified the default is 5000ms (5
-   * seconds). Only one of `stats_flush_interval` or `stats_flush_on_admin`
-   * can be set.
-   * Duration must be at least 1ms and at most 5 min.
-   */
-  'stats_flush_interval': (_google_protobuf_Duration__Output | null);
-  /**
-   * Optional watchdog configuration.
-   * This is for a single watchdog configuration for the entire system.
-   * Deprecated in favor of *watchdogs* which has finer granularity.
-   */
-  'watchdog': (_envoy_config_bootstrap_v3_Watchdog__Output | null);
-  /**
-   * Configuration for an external tracing provider.
-   * 
-   * .. attention::
-   * This field has been deprecated in favor of :ref:`HttpConnectionManager.Tracing.provider
-   * <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.Tracing.provider>`.
-   */
-  'tracing': (_envoy_config_trace_v3_Tracing__Output | null);
-  /**
-   * Configuration for the local administration HTTP server.
-   */
-  'admin': (_envoy_config_bootstrap_v3_Admin__Output | null);
-  /**
-   * Configuration for internal processing of stats.
-   */
-  'stats_config': (_envoy_config_metrics_v3_StatsConfig__Output | null);
-  /**
-   * Health discovery service config option.
-   * (:ref:`core.ApiConfigSource <envoy_v3_api_msg_config.core.v3.ApiConfigSource>`)
-   */
-  'hds_config': (_envoy_config_core_v3_ApiConfigSource__Output | null);
-  /**
-   * Optional overload manager configuration.
-   */
-  'overload_manager': (_envoy_config_overload_v3_OverloadManager__Output | null);
-  /**
-   * Enable :ref:`stats for event dispatcher <operations_performance>`, defaults to false.
-   * Note that this records a value for each iteration of the event loop on every thread. This
-   * should normally be minimal overhead, but when using
-   * :ref:`statsd <envoy_v3_api_msg_config.metrics.v3.StatsdSink>`, it will send each observed value
-   * over the wire individually because the statsd protocol doesn't have any way to represent a
-   * histogram summary. Be aware that this can be a very large volume of data.
-   */
-  'enable_dispatcher_stats': (boolean);
-  /**
-   * Configuration for the runtime configuration provider. If not
-   * specified, a “null” provider will be used which will result in all defaults
-   * being used.
-   */
-  'layered_runtime': (_envoy_config_bootstrap_v3_LayeredRuntime__Output | null);
-  /**
-   * Optional string which will be used in lieu of x-envoy in prefixing headers.
-   * 
-   * For example, if this string is present and set to X-Foo, then x-envoy-retry-on will be
-   * transformed into x-foo-retry-on etc.
-   * 
-   * Note this applies to the headers Envoy will generate, the headers Envoy will sanitize, and the
-   * headers Envoy will trust for core code and core extensions only. Be VERY careful making
-   * changes to this string, especially in multi-layer Envoy deployments or deployments using
-   * extensions which are not upstream.
-   */
-  'header_prefix': (string);
-  /**
-   * Optional proxy version which will be used to set the value of :ref:`server.version statistic
-   * <server_statistics>` if specified. Envoy will not process this value, it will be sent as is to
-   * :ref:`stats sinks <envoy_v3_api_msg_config.metrics.v3.StatsSink>`.
-   */
-  'stats_server_version_override': (_google_protobuf_UInt64Value__Output | null);
-  /**
-   * Always use TCP queries instead of UDP queries for DNS lookups.
-   * This may be overridden on a per-cluster basis in cds_config,
-   * when :ref:`dns_resolvers <envoy_v3_api_field_config.cluster.v3.Cluster.dns_resolvers>` and
-   * :ref:`use_tcp_for_dns_lookups <envoy_v3_api_field_config.cluster.v3.Cluster.use_tcp_for_dns_lookups>` are
-   * specified.
-   * Setting this value causes failure if the
-   * ``envoy.restart_features.use_apple_api_for_dns_lookups`` runtime value is true during
-   * server startup. Apple' API only uses UDP for DNS resolution.
-   * This field is deprecated in favor of *dns_resolution_config*
-   * which aggregates all of the DNS resolver configuration in a single message.
-   */
-  'use_tcp_for_dns_lookups': (boolean);
-  /**
-   * Specifies optional bootstrap extensions to be instantiated at startup time.
-   * Each item contains extension specific configuration.
-   * [#extension-category: envoy.bootstrap]
-   */
-  'bootstrap_extensions': (_envoy_config_core_v3_TypedExtensionConfig__Output)[];
-  /**
-   * Configuration sources that will participate in
-   * xdstp:// URL authority resolution. The algorithm is as
-   * follows:
-   * 1. The authority field is taken from the xdstp:// URL, call
-   * this *resource_authority*.
-   * 2. *resource_authority* is compared against the authorities in any peer
-   * *ConfigSource*. The peer *ConfigSource* is the configuration source
-   * message which would have been used unconditionally for resolution
-   * with opaque resource names. If there is a match with an authority, the
-   * peer *ConfigSource* message is used.
-   * 3. *resource_authority* is compared sequentially with the authorities in
-   * each configuration source in *config_sources*. The first *ConfigSource*
-   * to match wins.
-   * 4. As a fallback, if no configuration source matches, then
-   * *default_config_source* is used.
-   * 5. If *default_config_source* is not specified, resolution fails.
-   * [#not-implemented-hide:]
-   */
-  'config_sources': (_envoy_config_core_v3_ConfigSource__Output)[];
-  /**
-   * Default configuration source for xdstp:// URLs if all
-   * other resolution fails.
-   * [#not-implemented-hide:]
-   */
-  'default_config_source': (_envoy_config_core_v3_ConfigSource__Output | null);
-  /**
-   * Optional overriding of default socket interface. The value must be the name of one of the
-   * socket interface factories initialized through a bootstrap extension
-   */
-  'default_socket_interface': (string);
-  /**
-   * Global map of CertificateProvider instances. These instances are referred to by name in the
-   * :ref:`CommonTlsContext.CertificateProviderInstance.instance_name
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CommonTlsContext.CertificateProviderInstance.instance_name>`
-   * field.
-   * [#not-implemented-hide:]
-   */
-  'certificate_provider_instances': ({[key: string]: _envoy_config_core_v3_TypedExtensionConfig__Output});
-  /**
-   * A list of :ref:`Node <envoy_v3_api_msg_config.core.v3.Node>` field names
-   * that will be included in the context parameters of the effective
-   * xdstp:// URL that is sent in a discovery request when resource
-   * locators are used for LDS/CDS. Any non-string field will have its JSON
-   * encoding set as the context parameter value, with the exception of
-   * metadata, which will be flattened (see example below). The supported field
-   * names are:
-   * - "cluster"
-   * - "id"
-   * - "locality.region"
-   * - "locality.sub_zone"
-   * - "locality.zone"
-   * - "metadata"
-   * - "user_agent_build_version.metadata"
-   * - "user_agent_build_version.version"
-   * - "user_agent_name"
-   * - "user_agent_version"
-   * 
-   * The node context parameters act as a base layer dictionary for the context
-   * parameters (i.e. more specific resource specific context parameters will
-   * override). Field names will be prefixed with “udpa.node.” when included in
-   * context parameters.
-   * 
-   * For example, if node_context_params is ``["user_agent_name", "metadata"]``,
-   * the implied context parameters might be::
-   * 
-   * node.user_agent_name: "envoy"
-   * node.metadata.foo: "{\"bar\": \"baz\"}"
-   * node.metadata.some: "42"
-   * node.metadata.thing: "\"thing\""
-   * 
-   * [#not-implemented-hide:]
-   */
-  'node_context_params': (string)[];
-  /**
-   * Optional watchdogs configuration.
-   * This is used for specifying different watchdogs for the different subsystems.
-   * [#extension-category: envoy.guarddog_actions]
-   */
-  'watchdogs': (_envoy_config_bootstrap_v3_Watchdogs__Output | null);
-  /**
-   * Specifies optional extensions instantiated at startup time and
-   * invoked during crash time on the request that caused the crash.
-   */
-  'fatal_actions': (_envoy_config_bootstrap_v3_FatalAction__Output)[];
-  /**
-   * Flush stats to sinks only when queried for on the admin interface. If set,
-   * a flush timer is not created. Only one of `stats_flush_on_admin` or
-   * `stats_flush_interval` can be set.
-   */
-  'stats_flush_on_admin'?: (boolean);
-  /**
-   * DNS resolution configuration which includes the underlying dns resolver addresses and options.
-   * This may be overridden on a per-cluster basis in cds_config, when
-   * :ref:`dns_resolution_config <envoy_v3_api_field_config.cluster.v3.Cluster.dns_resolution_config>`
-   * is specified.
-   * *dns_resolution_config* will be deprecated once
-   * :ref:'typed_dns_resolver_config <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.typed_dns_resolver_config>'
-   * is fully supported.
-   */
-  'dns_resolution_config': (_envoy_config_core_v3_DnsResolutionConfig__Output | null);
-  /**
-   * DNS resolver type configuration extension. This extension can be used to configure c-ares, apple,
-   * or any other DNS resolver types and the related parameters.
-   * For example, an object of :ref:`DnsResolutionConfig <envoy_v3_api_msg_config.core.v3.DnsResolutionConfig>`
-   * can be packed into this *typed_dns_resolver_config*. This configuration will replace the
-   * :ref:'dns_resolution_config <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.dns_resolution_config>'
-   * configuration eventually.
-   * TODO(yanjunxiang): Investigate the deprecation plan for *dns_resolution_config*.
-   * During the transition period when both *dns_resolution_config* and *typed_dns_resolver_config* exists,
-   * this configuration is optional.
-   * When *typed_dns_resolver_config* is in place, Envoy will use it and ignore *dns_resolution_config*.
-   * When *typed_dns_resolver_config* is missing, the default behavior is in place.
-   * [#not-implemented-hide:]
-   */
-  'typed_dns_resolver_config': (_envoy_config_core_v3_TypedExtensionConfig__Output | null);
-  /**
-   * Specifies a set of headers that need to be registered as inline header. This configuration
-   * allows users to customize the inline headers on-demand at Envoy startup without modifying
-   * Envoy's source code.
-   * 
-   * Note that the 'set-cookie' header cannot be registered as inline header.
-   */
-  'inline_headers': (_envoy_config_bootstrap_v3_CustomInlineHeader__Output)[];
-  'stats_flush': "stats_flush_on_admin";
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/ClusterManager.ts b/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/ClusterManager.ts
deleted file mode 100644
index 571b96fb7..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/ClusterManager.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/bootstrap/v3/bootstrap.proto
-
-import type { BindConfig as _envoy_config_core_v3_BindConfig, BindConfig__Output as _envoy_config_core_v3_BindConfig__Output } from '../../../../envoy/config/core/v3/BindConfig';
-import type { ApiConfigSource as _envoy_config_core_v3_ApiConfigSource, ApiConfigSource__Output as _envoy_config_core_v3_ApiConfigSource__Output } from '../../../../envoy/config/core/v3/ApiConfigSource';
-import type { EventServiceConfig as _envoy_config_core_v3_EventServiceConfig, EventServiceConfig__Output as _envoy_config_core_v3_EventServiceConfig__Output } from '../../../../envoy/config/core/v3/EventServiceConfig';
-
-export interface _envoy_config_bootstrap_v3_ClusterManager_OutlierDetection {
-  /**
-   * Specifies the path to the outlier event log.
-   */
-  'event_log_path'?: (string);
-  /**
-   * [#not-implemented-hide:]
-   * The gRPC service for the outlier detection event service.
-   * If empty, outlier detection events won't be sent to a remote endpoint.
-   */
-  'event_service'?: (_envoy_config_core_v3_EventServiceConfig | null);
-}
-
-export interface _envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__Output {
-  /**
-   * Specifies the path to the outlier event log.
-   */
-  'event_log_path': (string);
-  /**
-   * [#not-implemented-hide:]
-   * The gRPC service for the outlier detection event service.
-   * If empty, outlier detection events won't be sent to a remote endpoint.
-   */
-  'event_service': (_envoy_config_core_v3_EventServiceConfig__Output | null);
-}
-
-/**
- * Cluster manager :ref:`architecture overview <arch_overview_cluster_manager>`.
- */
-export interface ClusterManager {
-  /**
-   * Name of the local cluster (i.e., the cluster that owns the Envoy running
-   * this configuration). In order to enable :ref:`zone aware routing
-   * <arch_overview_load_balancing_zone_aware_routing>` this option must be set.
-   * If *local_cluster_name* is defined then :ref:`clusters
-   * <envoy_v3_api_msg_config.cluster.v3.Cluster>` must be defined in the :ref:`Bootstrap
-   * static cluster resources
-   * <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.StaticResources.clusters>`. This is unrelated to
-   * the :option:`--service-cluster` option which does not `affect zone aware
-   * routing <https://github.com/envoyproxy/envoy/issues/774>`_.
-   */
-  'local_cluster_name'?: (string);
-  /**
-   * Optional global configuration for outlier detection.
-   */
-  'outlier_detection'?: (_envoy_config_bootstrap_v3_ClusterManager_OutlierDetection | null);
-  /**
-   * Optional configuration used to bind newly established upstream connections.
-   * This may be overridden on a per-cluster basis by upstream_bind_config in the cds_config.
-   */
-  'upstream_bind_config'?: (_envoy_config_core_v3_BindConfig | null);
-  /**
-   * A management server endpoint to stream load stats to via
-   * *StreamLoadStats*. This must have :ref:`api_type
-   * <envoy_v3_api_field_config.core.v3.ApiConfigSource.api_type>` :ref:`GRPC
-   * <envoy_v3_api_enum_value_config.core.v3.ApiConfigSource.ApiType.GRPC>`.
-   */
-  'load_stats_config'?: (_envoy_config_core_v3_ApiConfigSource | null);
-}
-
-/**
- * Cluster manager :ref:`architecture overview <arch_overview_cluster_manager>`.
- */
-export interface ClusterManager__Output {
-  /**
-   * Name of the local cluster (i.e., the cluster that owns the Envoy running
-   * this configuration). In order to enable :ref:`zone aware routing
-   * <arch_overview_load_balancing_zone_aware_routing>` this option must be set.
-   * If *local_cluster_name* is defined then :ref:`clusters
-   * <envoy_v3_api_msg_config.cluster.v3.Cluster>` must be defined in the :ref:`Bootstrap
-   * static cluster resources
-   * <envoy_v3_api_field_config.bootstrap.v3.Bootstrap.StaticResources.clusters>`. This is unrelated to
-   * the :option:`--service-cluster` option which does not `affect zone aware
-   * routing <https://github.com/envoyproxy/envoy/issues/774>`_.
-   */
-  'local_cluster_name': (string);
-  /**
-   * Optional global configuration for outlier detection.
-   */
-  'outlier_detection': (_envoy_config_bootstrap_v3_ClusterManager_OutlierDetection__Output | null);
-  /**
-   * Optional configuration used to bind newly established upstream connections.
-   * This may be overridden on a per-cluster basis by upstream_bind_config in the cds_config.
-   */
-  'upstream_bind_config': (_envoy_config_core_v3_BindConfig__Output | null);
-  /**
-   * A management server endpoint to stream load stats to via
-   * *StreamLoadStats*. This must have :ref:`api_type
-   * <envoy_v3_api_field_config.core.v3.ApiConfigSource.api_type>` :ref:`GRPC
-   * <envoy_v3_api_enum_value_config.core.v3.ApiConfigSource.ApiType.GRPC>`.
-   */
-  'load_stats_config': (_envoy_config_core_v3_ApiConfigSource__Output | null);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/CustomInlineHeader.ts b/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/CustomInlineHeader.ts
deleted file mode 100644
index f0e2d29aa..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/CustomInlineHeader.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/bootstrap/v3/bootstrap.proto
-
-
-// Original file: deps/envoy-api/envoy/config/bootstrap/v3/bootstrap.proto
-
-export enum _envoy_config_bootstrap_v3_CustomInlineHeader_InlineHeaderType {
-  REQUEST_HEADER = 0,
-  REQUEST_TRAILER = 1,
-  RESPONSE_HEADER = 2,
-  RESPONSE_TRAILER = 3,
-}
-
-/**
- * Used to specify the header that needs to be registered as an inline header.
- * 
- * If request or response contain multiple headers with the same name and the header
- * name is registered as an inline header. Then multiple headers will be folded
- * into one, and multiple header values will be concatenated by a suitable delimiter.
- * The delimiter is generally a comma.
- * 
- * For example, if 'foo' is registered as an inline header, and the headers contains
- * the following two headers:
- * 
- * .. code-block:: text
- * 
- * foo: bar
- * foo: eep
- * 
- * Then they will eventually be folded into:
- * 
- * .. code-block:: text
- * 
- * foo: bar, eep
- * 
- * Inline headers provide O(1) search performance, but each inline header imposes
- * an additional memory overhead on all instances of the corresponding type of
- * HeaderMap or TrailerMap.
- */
-export interface CustomInlineHeader {
-  /**
-   * The name of the header that is expected to be set as the inline header.
-   */
-  'inline_header_name'?: (string);
-  /**
-   * The type of the header that is expected to be set as the inline header.
-   */
-  'inline_header_type'?: (_envoy_config_bootstrap_v3_CustomInlineHeader_InlineHeaderType | keyof typeof _envoy_config_bootstrap_v3_CustomInlineHeader_InlineHeaderType);
-}
-
-/**
- * Used to specify the header that needs to be registered as an inline header.
- * 
- * If request or response contain multiple headers with the same name and the header
- * name is registered as an inline header. Then multiple headers will be folded
- * into one, and multiple header values will be concatenated by a suitable delimiter.
- * The delimiter is generally a comma.
- * 
- * For example, if 'foo' is registered as an inline header, and the headers contains
- * the following two headers:
- * 
- * .. code-block:: text
- * 
- * foo: bar
- * foo: eep
- * 
- * Then they will eventually be folded into:
- * 
- * .. code-block:: text
- * 
- * foo: bar, eep
- * 
- * Inline headers provide O(1) search performance, but each inline header imposes
- * an additional memory overhead on all instances of the corresponding type of
- * HeaderMap or TrailerMap.
- */
-export interface CustomInlineHeader__Output {
-  /**
-   * The name of the header that is expected to be set as the inline header.
-   */
-  'inline_header_name': (string);
-  /**
-   * The type of the header that is expected to be set as the inline header.
-   */
-  'inline_header_type': (keyof typeof _envoy_config_bootstrap_v3_CustomInlineHeader_InlineHeaderType);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/FatalAction.ts b/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/FatalAction.ts
deleted file mode 100644
index 236afded5..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/FatalAction.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/bootstrap/v3/bootstrap.proto
-
-import type { TypedExtensionConfig as _envoy_config_core_v3_TypedExtensionConfig, TypedExtensionConfig__Output as _envoy_config_core_v3_TypedExtensionConfig__Output } from '../../../../envoy/config/core/v3/TypedExtensionConfig';
-
-/**
- * Fatal actions to run while crashing. Actions can be safe (meaning they are
- * async-signal safe) or unsafe. We run all safe actions before we run unsafe actions.
- * If using an unsafe action that could get stuck or deadlock, it important to
- * have an out of band system to terminate the process.
- * 
- * The interface for the extension is ``Envoy::Server::Configuration::FatalAction``.
- * *FatalAction* extensions live in the ``envoy.extensions.fatal_actions`` API
- * namespace.
- */
-export interface FatalAction {
-  /**
-   * Extension specific configuration for the action. It's expected to conform
-   * to the ``Envoy::Server::Configuration::FatalAction`` interface.
-   */
-  'config'?: (_envoy_config_core_v3_TypedExtensionConfig | null);
-}
-
-/**
- * Fatal actions to run while crashing. Actions can be safe (meaning they are
- * async-signal safe) or unsafe. We run all safe actions before we run unsafe actions.
- * If using an unsafe action that could get stuck or deadlock, it important to
- * have an out of band system to terminate the process.
- * 
- * The interface for the extension is ``Envoy::Server::Configuration::FatalAction``.
- * *FatalAction* extensions live in the ``envoy.extensions.fatal_actions`` API
- * namespace.
- */
-export interface FatalAction__Output {
-  /**
-   * Extension specific configuration for the action. It's expected to conform
-   * to the ``Envoy::Server::Configuration::FatalAction`` interface.
-   */
-  'config': (_envoy_config_core_v3_TypedExtensionConfig__Output | null);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/LayeredRuntime.ts b/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/LayeredRuntime.ts
deleted file mode 100644
index 3514d3140..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/LayeredRuntime.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/bootstrap/v3/bootstrap.proto
-
-import type { RuntimeLayer as _envoy_config_bootstrap_v3_RuntimeLayer, RuntimeLayer__Output as _envoy_config_bootstrap_v3_RuntimeLayer__Output } from '../../../../envoy/config/bootstrap/v3/RuntimeLayer';
-
-/**
- * Runtime :ref:`configuration overview <config_runtime>`.
- */
-export interface LayeredRuntime {
-  /**
-   * The :ref:`layers <config_runtime_layering>` of the runtime. This is ordered
-   * such that later layers in the list overlay earlier entries.
-   */
-  'layers'?: (_envoy_config_bootstrap_v3_RuntimeLayer)[];
-}
-
-/**
- * Runtime :ref:`configuration overview <config_runtime>`.
- */
-export interface LayeredRuntime__Output {
-  /**
-   * The :ref:`layers <config_runtime_layering>` of the runtime. This is ordered
-   * such that later layers in the list overlay earlier entries.
-   */
-  'layers': (_envoy_config_bootstrap_v3_RuntimeLayer__Output)[];
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/Runtime.ts b/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/Runtime.ts
deleted file mode 100644
index 4f7713bcf..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/Runtime.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/bootstrap/v3/bootstrap.proto
-
-import type { Struct as _google_protobuf_Struct, Struct__Output as _google_protobuf_Struct__Output } from '../../../../google/protobuf/Struct';
-
-/**
- * Runtime :ref:`configuration overview <config_runtime>` (deprecated).
- */
-export interface Runtime {
-  /**
-   * The implementation assumes that the file system tree is accessed via a
-   * symbolic link. An atomic link swap is used when a new tree should be
-   * switched to. This parameter specifies the path to the symbolic link. Envoy
-   * will watch the location for changes and reload the file system tree when
-   * they happen. If this parameter is not set, there will be no disk based
-   * runtime.
-   */
-  'symlink_root'?: (string);
-  /**
-   * Specifies the subdirectory to load within the root directory. This is
-   * useful if multiple systems share the same delivery mechanism. Envoy
-   * configuration elements can be contained in a dedicated subdirectory.
-   */
-  'subdirectory'?: (string);
-  /**
-   * Specifies an optional subdirectory to load within the root directory. If
-   * specified and the directory exists, configuration values within this
-   * directory will override those found in the primary subdirectory. This is
-   * useful when Envoy is deployed across many different types of servers.
-   * Sometimes it is useful to have a per service cluster directory for runtime
-   * configuration. See below for exactly how the override directory is used.
-   */
-  'override_subdirectory'?: (string);
-  /**
-   * Static base runtime. This will be :ref:`overridden
-   * <config_runtime_layering>` by other runtime layers, e.g.
-   * disk or admin. This follows the :ref:`runtime protobuf JSON representation
-   * encoding <config_runtime_proto_json>`.
-   */
-  'base'?: (_google_protobuf_Struct | null);
-}
-
-/**
- * Runtime :ref:`configuration overview <config_runtime>` (deprecated).
- */
-export interface Runtime__Output {
-  /**
-   * The implementation assumes that the file system tree is accessed via a
-   * symbolic link. An atomic link swap is used when a new tree should be
-   * switched to. This parameter specifies the path to the symbolic link. Envoy
-   * will watch the location for changes and reload the file system tree when
-   * they happen. If this parameter is not set, there will be no disk based
-   * runtime.
-   */
-  'symlink_root': (string);
-  /**
-   * Specifies the subdirectory to load within the root directory. This is
-   * useful if multiple systems share the same delivery mechanism. Envoy
-   * configuration elements can be contained in a dedicated subdirectory.
-   */
-  'subdirectory': (string);
-  /**
-   * Specifies an optional subdirectory to load within the root directory. If
-   * specified and the directory exists, configuration values within this
-   * directory will override those found in the primary subdirectory. This is
-   * useful when Envoy is deployed across many different types of servers.
-   * Sometimes it is useful to have a per service cluster directory for runtime
-   * configuration. See below for exactly how the override directory is used.
-   */
-  'override_subdirectory': (string);
-  /**
-   * Static base runtime. This will be :ref:`overridden
-   * <config_runtime_layering>` by other runtime layers, e.g.
-   * disk or admin. This follows the :ref:`runtime protobuf JSON representation
-   * encoding <config_runtime_proto_json>`.
-   */
-  'base': (_google_protobuf_Struct__Output | null);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/RuntimeLayer.ts b/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/RuntimeLayer.ts
deleted file mode 100644
index b072bfa7d..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/RuntimeLayer.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/bootstrap/v3/bootstrap.proto
-
-import type { Struct as _google_protobuf_Struct, Struct__Output as _google_protobuf_Struct__Output } from '../../../../google/protobuf/Struct';
-import type { ConfigSource as _envoy_config_core_v3_ConfigSource, ConfigSource__Output as _envoy_config_core_v3_ConfigSource__Output } from '../../../../envoy/config/core/v3/ConfigSource';
-
-/**
- * :ref:`Admin console runtime <config_runtime_admin>` layer.
- */
-export interface _envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer {
-}
-
-/**
- * :ref:`Admin console runtime <config_runtime_admin>` layer.
- */
-export interface _envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer__Output {
-}
-
-/**
- * :ref:`Disk runtime <config_runtime_local_disk>` layer.
- */
-export interface _envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer {
-  /**
-   * The implementation assumes that the file system tree is accessed via a
-   * symbolic link. An atomic link swap is used when a new tree should be
-   * switched to. This parameter specifies the path to the symbolic link.
-   * Envoy will watch the location for changes and reload the file system tree
-   * when they happen. See documentation on runtime :ref:`atomicity
-   * <config_runtime_atomicity>` for further details on how reloads are
-   * treated.
-   */
-  'symlink_root'?: (string);
-  /**
-   * Specifies the subdirectory to load within the root directory. This is
-   * useful if multiple systems share the same delivery mechanism. Envoy
-   * configuration elements can be contained in a dedicated subdirectory.
-   */
-  'subdirectory'?: (string);
-  /**
-   * :ref:`Append <config_runtime_local_disk_service_cluster_subdirs>` the
-   * service cluster to the path under symlink root.
-   */
-  'append_service_cluster'?: (boolean);
-}
-
-/**
- * :ref:`Disk runtime <config_runtime_local_disk>` layer.
- */
-export interface _envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer__Output {
-  /**
-   * The implementation assumes that the file system tree is accessed via a
-   * symbolic link. An atomic link swap is used when a new tree should be
-   * switched to. This parameter specifies the path to the symbolic link.
-   * Envoy will watch the location for changes and reload the file system tree
-   * when they happen. See documentation on runtime :ref:`atomicity
-   * <config_runtime_atomicity>` for further details on how reloads are
-   * treated.
-   */
-  'symlink_root': (string);
-  /**
-   * Specifies the subdirectory to load within the root directory. This is
-   * useful if multiple systems share the same delivery mechanism. Envoy
-   * configuration elements can be contained in a dedicated subdirectory.
-   */
-  'subdirectory': (string);
-  /**
-   * :ref:`Append <config_runtime_local_disk_service_cluster_subdirs>` the
-   * service cluster to the path under symlink root.
-   */
-  'append_service_cluster': (boolean);
-}
-
-/**
- * :ref:`Runtime Discovery Service (RTDS) <config_runtime_rtds>` layer.
- */
-export interface _envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer {
-  /**
-   * Resource to subscribe to at *rtds_config* for the RTDS layer.
-   */
-  'name'?: (string);
-  /**
-   * RTDS configuration source.
-   */
-  'rtds_config'?: (_envoy_config_core_v3_ConfigSource | null);
-}
-
-/**
- * :ref:`Runtime Discovery Service (RTDS) <config_runtime_rtds>` layer.
- */
-export interface _envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__Output {
-  /**
-   * Resource to subscribe to at *rtds_config* for the RTDS layer.
-   */
-  'name': (string);
-  /**
-   * RTDS configuration source.
-   */
-  'rtds_config': (_envoy_config_core_v3_ConfigSource__Output | null);
-}
-
-/**
- * [#next-free-field: 6]
- */
-export interface RuntimeLayer {
-  /**
-   * Descriptive name for the runtime layer. This is only used for the runtime
-   * :http:get:`/runtime` output.
-   */
-  'name'?: (string);
-  /**
-   * :ref:`Static runtime <config_runtime_bootstrap>` layer.
-   * This follows the :ref:`runtime protobuf JSON representation encoding
-   * <config_runtime_proto_json>`. Unlike static xDS resources, this static
-   * layer is overridable by later layers in the runtime virtual filesystem.
-   */
-  'static_layer'?: (_google_protobuf_Struct | null);
-  'disk_layer'?: (_envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer | null);
-  'admin_layer'?: (_envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer | null);
-  'rtds_layer'?: (_envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer | null);
-  'layer_specifier'?: "static_layer"|"disk_layer"|"admin_layer"|"rtds_layer";
-}
-
-/**
- * [#next-free-field: 6]
- */
-export interface RuntimeLayer__Output {
-  /**
-   * Descriptive name for the runtime layer. This is only used for the runtime
-   * :http:get:`/runtime` output.
-   */
-  'name': (string);
-  /**
-   * :ref:`Static runtime <config_runtime_bootstrap>` layer.
-   * This follows the :ref:`runtime protobuf JSON representation encoding
-   * <config_runtime_proto_json>`. Unlike static xDS resources, this static
-   * layer is overridable by later layers in the runtime virtual filesystem.
-   */
-  'static_layer'?: (_google_protobuf_Struct__Output | null);
-  'disk_layer'?: (_envoy_config_bootstrap_v3_RuntimeLayer_DiskLayer__Output | null);
-  'admin_layer'?: (_envoy_config_bootstrap_v3_RuntimeLayer_AdminLayer__Output | null);
-  'rtds_layer'?: (_envoy_config_bootstrap_v3_RuntimeLayer_RtdsLayer__Output | null);
-  'layer_specifier': "static_layer"|"disk_layer"|"admin_layer"|"rtds_layer";
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/Watchdog.ts b/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/Watchdog.ts
deleted file mode 100644
index 8cd743b56..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/Watchdog.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/bootstrap/v3/bootstrap.proto
-
-import type { Duration as _google_protobuf_Duration, Duration__Output as _google_protobuf_Duration__Output } from '../../../../google/protobuf/Duration';
-import type { Percent as _envoy_type_v3_Percent, Percent__Output as _envoy_type_v3_Percent__Output } from '../../../../envoy/type/v3/Percent';
-import type { TypedExtensionConfig as _envoy_config_core_v3_TypedExtensionConfig, TypedExtensionConfig__Output as _envoy_config_core_v3_TypedExtensionConfig__Output } from '../../../../envoy/config/core/v3/TypedExtensionConfig';
-
-export interface _envoy_config_bootstrap_v3_Watchdog_WatchdogAction {
-  /**
-   * Extension specific configuration for the action.
-   */
-  'config'?: (_envoy_config_core_v3_TypedExtensionConfig | null);
-  'event'?: (_envoy_config_bootstrap_v3_Watchdog_WatchdogAction_WatchdogEvent | keyof typeof _envoy_config_bootstrap_v3_Watchdog_WatchdogAction_WatchdogEvent);
-}
-
-export interface _envoy_config_bootstrap_v3_Watchdog_WatchdogAction__Output {
-  /**
-   * Extension specific configuration for the action.
-   */
-  'config': (_envoy_config_core_v3_TypedExtensionConfig__Output | null);
-  'event': (keyof typeof _envoy_config_bootstrap_v3_Watchdog_WatchdogAction_WatchdogEvent);
-}
-
-// Original file: deps/envoy-api/envoy/config/bootstrap/v3/bootstrap.proto
-
-/**
- * The events are fired in this order: KILL, MULTIKILL, MEGAMISS, MISS.
- * Within an event type, actions execute in the order they are configured.
- * For KILL/MULTIKILL there is a default PANIC that will run after the
- * registered actions and kills the process if it wasn't already killed.
- * It might be useful to specify several debug actions, and possibly an
- * alternate FATAL action.
- */
-export enum _envoy_config_bootstrap_v3_Watchdog_WatchdogAction_WatchdogEvent {
-  UNKNOWN = 0,
-  KILL = 1,
-  MULTIKILL = 2,
-  MEGAMISS = 3,
-  MISS = 4,
-}
-
-/**
- * Envoy process watchdog configuration. When configured, this monitors for
- * nonresponsive threads and kills the process after the configured thresholds.
- * See the :ref:`watchdog documentation <operations_performance_watchdog>` for more information.
- * [#next-free-field: 8]
- */
-export interface Watchdog {
-  /**
-   * The duration after which Envoy counts a nonresponsive thread in the
-   * *watchdog_miss* statistic. If not specified the default is 200ms.
-   */
-  'miss_timeout'?: (_google_protobuf_Duration | null);
-  /**
-   * The duration after which Envoy counts a nonresponsive thread in the
-   * *watchdog_mega_miss* statistic. If not specified the default is
-   * 1000ms.
-   */
-  'megamiss_timeout'?: (_google_protobuf_Duration | null);
-  /**
-   * If a watched thread has been nonresponsive for this duration, assume a
-   * programming error and kill the entire Envoy process. Set to 0 to disable
-   * kill behavior. If not specified the default is 0 (disabled).
-   */
-  'kill_timeout'?: (_google_protobuf_Duration | null);
-  /**
-   * If max(2, ceil(registered_threads * Fraction(*multikill_threshold*)))
-   * threads have been nonresponsive for at least this duration kill the entire
-   * Envoy process. Set to 0 to disable this behavior. If not specified the
-   * default is 0 (disabled).
-   */
-  'multikill_timeout'?: (_google_protobuf_Duration | null);
-  /**
-   * Sets the threshold for *multikill_timeout* in terms of the percentage of
-   * nonresponsive threads required for the *multikill_timeout*.
-   * If not specified the default is 0.
-   */
-  'multikill_threshold'?: (_envoy_type_v3_Percent | null);
-  /**
-   * Defines the maximum jitter used to adjust the *kill_timeout* if *kill_timeout* is
-   * enabled. Enabling this feature would help to reduce risk of synchronized
-   * watchdog kill events across proxies due to external triggers. Set to 0 to
-   * disable. If not specified the default is 0 (disabled).
-   */
-  'max_kill_timeout_jitter'?: (_google_protobuf_Duration | null);
-  /**
-   * Register actions that will fire on given WatchDog events.
-   * See *WatchDogAction* for priority of events.
-   */
-  'actions'?: (_envoy_config_bootstrap_v3_Watchdog_WatchdogAction)[];
-}
-
-/**
- * Envoy process watchdog configuration. When configured, this monitors for
- * nonresponsive threads and kills the process after the configured thresholds.
- * See the :ref:`watchdog documentation <operations_performance_watchdog>` for more information.
- * [#next-free-field: 8]
- */
-export interface Watchdog__Output {
-  /**
-   * The duration after which Envoy counts a nonresponsive thread in the
-   * *watchdog_miss* statistic. If not specified the default is 200ms.
-   */
-  'miss_timeout': (_google_protobuf_Duration__Output | null);
-  /**
-   * The duration after which Envoy counts a nonresponsive thread in the
-   * *watchdog_mega_miss* statistic. If not specified the default is
-   * 1000ms.
-   */
-  'megamiss_timeout': (_google_protobuf_Duration__Output | null);
-  /**
-   * If a watched thread has been nonresponsive for this duration, assume a
-   * programming error and kill the entire Envoy process. Set to 0 to disable
-   * kill behavior. If not specified the default is 0 (disabled).
-   */
-  'kill_timeout': (_google_protobuf_Duration__Output | null);
-  /**
-   * If max(2, ceil(registered_threads * Fraction(*multikill_threshold*)))
-   * threads have been nonresponsive for at least this duration kill the entire
-   * Envoy process. Set to 0 to disable this behavior. If not specified the
-   * default is 0 (disabled).
-   */
-  'multikill_timeout': (_google_protobuf_Duration__Output | null);
-  /**
-   * Sets the threshold for *multikill_timeout* in terms of the percentage of
-   * nonresponsive threads required for the *multikill_timeout*.
-   * If not specified the default is 0.
-   */
-  'multikill_threshold': (_envoy_type_v3_Percent__Output | null);
-  /**
-   * Defines the maximum jitter used to adjust the *kill_timeout* if *kill_timeout* is
-   * enabled. Enabling this feature would help to reduce risk of synchronized
-   * watchdog kill events across proxies due to external triggers. Set to 0 to
-   * disable. If not specified the default is 0 (disabled).
-   */
-  'max_kill_timeout_jitter': (_google_protobuf_Duration__Output | null);
-  /**
-   * Register actions that will fire on given WatchDog events.
-   * See *WatchDogAction* for priority of events.
-   */
-  'actions': (_envoy_config_bootstrap_v3_Watchdog_WatchdogAction__Output)[];
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/Watchdogs.ts b/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/Watchdogs.ts
deleted file mode 100644
index b478615ea..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/bootstrap/v3/Watchdogs.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/bootstrap/v3/bootstrap.proto
-
-import type { Watchdog as _envoy_config_bootstrap_v3_Watchdog, Watchdog__Output as _envoy_config_bootstrap_v3_Watchdog__Output } from '../../../../envoy/config/bootstrap/v3/Watchdog';
-
-/**
- * Allows you to specify different watchdog configs for different subsystems.
- * This allows finer tuned policies for the watchdog. If a subsystem is omitted
- * the default values for that system will be used.
- */
-export interface Watchdogs {
-  /**
-   * Watchdog for the main thread.
-   */
-  'main_thread_watchdog'?: (_envoy_config_bootstrap_v3_Watchdog | null);
-  /**
-   * Watchdog for the worker threads.
-   */
-  'worker_watchdog'?: (_envoy_config_bootstrap_v3_Watchdog | null);
-}
-
-/**
- * Allows you to specify different watchdog configs for different subsystems.
- * This allows finer tuned policies for the watchdog. If a subsystem is omitted
- * the default values for that system will be used.
- */
-export interface Watchdogs__Output {
-  /**
-   * Watchdog for the main thread.
-   */
-  'main_thread_watchdog': (_envoy_config_bootstrap_v3_Watchdog__Output | null);
-  /**
-   * Watchdog for the worker threads.
-   */
-  'worker_watchdog': (_envoy_config_bootstrap_v3_Watchdog__Output | null);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/cluster/v3/CircuitBreakers.ts b/packages/grpc-js-xds/src/generated/envoy/config/cluster/v3/CircuitBreakers.ts
index 4a8a4be36..61f473134 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/cluster/v3/CircuitBreakers.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/cluster/v3/CircuitBreakers.ts
@@ -1,6 +1,6 @@
 // Original file: deps/envoy-api/envoy/config/cluster/v3/circuit_breaker.proto
 
-import type { RoutingPriority as _envoy_config_core_v3_RoutingPriority } from '../../../../envoy/config/core/v3/RoutingPriority';
+import type { RoutingPriority as _envoy_config_core_v3_RoutingPriority, RoutingPriority__Output as _envoy_config_core_v3_RoutingPriority__Output } from '../../../../envoy/config/core/v3/RoutingPriority';
 import type { UInt32Value as _google_protobuf_UInt32Value, UInt32Value__Output as _google_protobuf_UInt32Value__Output } from '../../../../google/protobuf/UInt32Value';
 import type { Percent as _envoy_type_v3_Percent, Percent__Output as _envoy_type_v3_Percent__Output } from '../../../../envoy/type/v3/Percent';
 
@@ -50,7 +50,7 @@ export interface _envoy_config_cluster_v3_CircuitBreakers_Thresholds {
    * The :ref:`RoutingPriority<envoy_v3_api_enum_config.core.v3.RoutingPriority>`
    * the specified CircuitBreaker settings apply to.
    */
-  'priority'?: (_envoy_config_core_v3_RoutingPriority | keyof typeof _envoy_config_core_v3_RoutingPriority);
+  'priority'?: (_envoy_config_core_v3_RoutingPriority);
   /**
    * The maximum number of connections that Envoy will make to the upstream
    * cluster. If not specified, the default is 1024.
@@ -114,7 +114,7 @@ export interface _envoy_config_cluster_v3_CircuitBreakers_Thresholds__Output {
    * The :ref:`RoutingPriority<envoy_v3_api_enum_config.core.v3.RoutingPriority>`
    * the specified CircuitBreaker settings apply to.
    */
-  'priority': (keyof typeof _envoy_config_core_v3_RoutingPriority);
+  'priority': (_envoy_config_core_v3_RoutingPriority__Output);
   /**
    * The maximum number of connections that Envoy will make to the upstream
    * cluster. If not specified, the default is 1024.
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/cluster/v3/Cluster.ts b/packages/grpc-js-xds/src/generated/envoy/config/cluster/v3/Cluster.ts
index 0ac7f7fc1..467d31f5b 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/cluster/v3/Cluster.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/cluster/v3/Cluster.ts
@@ -30,22 +30,37 @@ import type { UInt64Value as _google_protobuf_UInt64Value, UInt64Value__Output a
 import type { MetadataKey as _envoy_type_metadata_v3_MetadataKey, MetadataKey__Output as _envoy_type_metadata_v3_MetadataKey__Output } from '../../../../envoy/type/metadata/v3/MetadataKey';
 import type { HealthStatusSet as _envoy_config_core_v3_HealthStatusSet, HealthStatusSet__Output as _envoy_config_core_v3_HealthStatusSet__Output } from '../../../../envoy/config/core/v3/HealthStatusSet';
 import type { DoubleValue as _google_protobuf_DoubleValue, DoubleValue__Output as _google_protobuf_DoubleValue__Output } from '../../../../google/protobuf/DoubleValue';
-import type { Long } from '@grpc/proto-loader';
 
 // Original file: deps/envoy-api/envoy/config/cluster/v3/cluster.proto
 
-export enum _envoy_config_cluster_v3_Cluster_ClusterProtocolSelection {
+export const _envoy_config_cluster_v3_Cluster_ClusterProtocolSelection = {
   /**
    * Cluster can only operate on one of the possible upstream protocols (HTTP1.1, HTTP2).
    * If :ref:`http2_protocol_options <envoy_v3_api_field_config.cluster.v3.Cluster.http2_protocol_options>` are
    * present, HTTP2 will be used, otherwise HTTP1.1 will be used.
    */
-  USE_CONFIGURED_PROTOCOL = 0,
+  USE_CONFIGURED_PROTOCOL: 'USE_CONFIGURED_PROTOCOL',
   /**
    * Use HTTP1.1 or HTTP2, depending on which one is used on the downstream connection.
    */
-  USE_DOWNSTREAM_PROTOCOL = 1,
-}
+  USE_DOWNSTREAM_PROTOCOL: 'USE_DOWNSTREAM_PROTOCOL',
+} as const;
+
+export type _envoy_config_cluster_v3_Cluster_ClusterProtocolSelection =
+  /**
+   * Cluster can only operate on one of the possible upstream protocols (HTTP1.1, HTTP2).
+   * If :ref:`http2_protocol_options <envoy_v3_api_field_config.cluster.v3.Cluster.http2_protocol_options>` are
+   * present, HTTP2 will be used, otherwise HTTP1.1 will be used.
+   */
+  | 'USE_CONFIGURED_PROTOCOL'
+  | 0
+  /**
+   * Use HTTP1.1 or HTTP2, depending on which one is used on the downstream connection.
+   */
+  | 'USE_DOWNSTREAM_PROTOCOL'
+  | 1
+
+export type _envoy_config_cluster_v3_Cluster_ClusterProtocolSelection__Output = typeof _envoy_config_cluster_v3_Cluster_ClusterProtocolSelection[keyof typeof _envoy_config_cluster_v3_Cluster_ClusterProtocolSelection]
 
 /**
  * Common configuration for all load balancer implementations.
@@ -269,36 +284,81 @@ export interface _envoy_config_cluster_v3_Cluster_CustomClusterType__Output {
  * Refer to :ref:`service discovery type <arch_overview_service_discovery_types>`
  * for an explanation on each type.
  */
-export enum _envoy_config_cluster_v3_Cluster_DiscoveryType {
+export const _envoy_config_cluster_v3_Cluster_DiscoveryType = {
   /**
    * Refer to the :ref:`static discovery type<arch_overview_service_discovery_types_static>`
    * for an explanation.
    */
-  STATIC = 0,
+  STATIC: 'STATIC',
   /**
    * Refer to the :ref:`strict DNS discovery
    * type<arch_overview_service_discovery_types_strict_dns>`
    * for an explanation.
    */
-  STRICT_DNS = 1,
+  STRICT_DNS: 'STRICT_DNS',
   /**
    * Refer to the :ref:`logical DNS discovery
    * type<arch_overview_service_discovery_types_logical_dns>`
    * for an explanation.
    */
-  LOGICAL_DNS = 2,
+  LOGICAL_DNS: 'LOGICAL_DNS',
   /**
    * Refer to the :ref:`service discovery type<arch_overview_service_discovery_types_eds>`
    * for an explanation.
    */
-  EDS = 3,
+  EDS: 'EDS',
   /**
    * Refer to the :ref:`original destination discovery
    * type<arch_overview_service_discovery_types_original_destination>`
    * for an explanation.
    */
-  ORIGINAL_DST = 4,
-}
+  ORIGINAL_DST: 'ORIGINAL_DST',
+} as const;
+
+/**
+ * Refer to :ref:`service discovery type <arch_overview_service_discovery_types>`
+ * for an explanation on each type.
+ */
+export type _envoy_config_cluster_v3_Cluster_DiscoveryType =
+  /**
+   * Refer to the :ref:`static discovery type<arch_overview_service_discovery_types_static>`
+   * for an explanation.
+   */
+  | 'STATIC'
+  | 0
+  /**
+   * Refer to the :ref:`strict DNS discovery
+   * type<arch_overview_service_discovery_types_strict_dns>`
+   * for an explanation.
+   */
+  | 'STRICT_DNS'
+  | 1
+  /**
+   * Refer to the :ref:`logical DNS discovery
+   * type<arch_overview_service_discovery_types_logical_dns>`
+   * for an explanation.
+   */
+  | 'LOGICAL_DNS'
+  | 2
+  /**
+   * Refer to the :ref:`service discovery type<arch_overview_service_discovery_types_eds>`
+   * for an explanation.
+   */
+  | 'EDS'
+  | 3
+  /**
+   * Refer to the :ref:`original destination discovery
+   * type<arch_overview_service_discovery_types_original_destination>`
+   * for an explanation.
+   */
+  | 'ORIGINAL_DST'
+  | 4
+
+/**
+ * Refer to :ref:`service discovery type <arch_overview_service_discovery_types>`
+ * for an explanation on each type.
+ */
+export type _envoy_config_cluster_v3_Cluster_DiscoveryType__Output = typeof _envoy_config_cluster_v3_Cluster_DiscoveryType[keyof typeof _envoy_config_cluster_v3_Cluster_DiscoveryType]
 
 // Original file: deps/envoy-api/envoy/config/cluster/v3/cluster.proto
 
@@ -325,13 +385,73 @@ export enum _envoy_config_cluster_v3_Cluster_DiscoveryType {
  * ignored.
  * [#next-major-version: deprecate AUTO in favor of a V6_PREFERRED option.]
  */
-export enum _envoy_config_cluster_v3_Cluster_DnsLookupFamily {
-  AUTO = 0,
-  V4_ONLY = 1,
-  V6_ONLY = 2,
-  V4_PREFERRED = 3,
-  ALL = 4,
-}
+export const _envoy_config_cluster_v3_Cluster_DnsLookupFamily = {
+  AUTO: 'AUTO',
+  V4_ONLY: 'V4_ONLY',
+  V6_ONLY: 'V6_ONLY',
+  V4_PREFERRED: 'V4_PREFERRED',
+  ALL: 'ALL',
+} as const;
+
+/**
+ * When V4_ONLY is selected, the DNS resolver will only perform a lookup for
+ * addresses in the IPv4 family. If V6_ONLY is selected, the DNS resolver will
+ * only perform a lookup for addresses in the IPv6 family. If AUTO is
+ * specified, the DNS resolver will first perform a lookup for addresses in
+ * the IPv6 family and fallback to a lookup for addresses in the IPv4 family.
+ * This is semantically equivalent to a non-existent V6_PREFERRED option.
+ * AUTO is a legacy name that is more opaque than
+ * necessary and will be deprecated in favor of V6_PREFERRED in a future major version of the API.
+ * If V4_PREFERRED is specified, the DNS resolver will first perform a lookup for addresses in the
+ * IPv4 family and fallback to a lookup for addresses in the IPv6 family. i.e., the callback
+ * target will only get v6 addresses if there were NO v4 addresses to return.
+ * If ALL is specified, the DNS resolver will perform a lookup for both IPv4 and IPv6 families,
+ * and return all resolved addresses. When this is used, Happy Eyeballs will be enabled for
+ * upstream connections. Refer to :ref:`Happy Eyeballs Support <arch_overview_happy_eyeballs>`
+ * for more information.
+ * For cluster types other than
+ * :ref:`STRICT_DNS<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DiscoveryType.STRICT_DNS>` and
+ * :ref:`LOGICAL_DNS<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DiscoveryType.LOGICAL_DNS>`,
+ * this setting is
+ * ignored.
+ * [#next-major-version: deprecate AUTO in favor of a V6_PREFERRED option.]
+ */
+export type _envoy_config_cluster_v3_Cluster_DnsLookupFamily =
+  | 'AUTO'
+  | 0
+  | 'V4_ONLY'
+  | 1
+  | 'V6_ONLY'
+  | 2
+  | 'V4_PREFERRED'
+  | 3
+  | 'ALL'
+  | 4
+
+/**
+ * When V4_ONLY is selected, the DNS resolver will only perform a lookup for
+ * addresses in the IPv4 family. If V6_ONLY is selected, the DNS resolver will
+ * only perform a lookup for addresses in the IPv6 family. If AUTO is
+ * specified, the DNS resolver will first perform a lookup for addresses in
+ * the IPv6 family and fallback to a lookup for addresses in the IPv4 family.
+ * This is semantically equivalent to a non-existent V6_PREFERRED option.
+ * AUTO is a legacy name that is more opaque than
+ * necessary and will be deprecated in favor of V6_PREFERRED in a future major version of the API.
+ * If V4_PREFERRED is specified, the DNS resolver will first perform a lookup for addresses in the
+ * IPv4 family and fallback to a lookup for addresses in the IPv6 family. i.e., the callback
+ * target will only get v6 addresses if there were NO v4 addresses to return.
+ * If ALL is specified, the DNS resolver will perform a lookup for both IPv4 and IPv6 families,
+ * and return all resolved addresses. When this is used, Happy Eyeballs will be enabled for
+ * upstream connections. Refer to :ref:`Happy Eyeballs Support <arch_overview_happy_eyeballs>`
+ * for more information.
+ * For cluster types other than
+ * :ref:`STRICT_DNS<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DiscoveryType.STRICT_DNS>` and
+ * :ref:`LOGICAL_DNS<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DiscoveryType.LOGICAL_DNS>`,
+ * this setting is
+ * ignored.
+ * [#next-major-version: deprecate AUTO in favor of a V6_PREFERRED option.]
+ */
+export type _envoy_config_cluster_v3_Cluster_DnsLookupFamily__Output = typeof _envoy_config_cluster_v3_Cluster_DnsLookupFamily[keyof typeof _envoy_config_cluster_v3_Cluster_DnsLookupFamily]
 
 /**
  * Only valid when discovery type is EDS.
@@ -370,18 +490,40 @@ export interface _envoy_config_cluster_v3_Cluster_EdsClusterConfig__Output {
 /**
  * The hash function used to hash hosts onto the ketama ring.
  */
-export enum _envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction {
+export const _envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction = {
   /**
    * Use `xxHash <https://github.com/Cyan4973/xxHash>`_, this is the default hash function.
    */
-  XX_HASH = 0,
+  XX_HASH: 'XX_HASH',
   /**
    * Use `MurmurHash2 <https://sites.google.com/site/murmurhash/>`_, this is compatible with
    * std:hash<string> in GNU libstdc++ 3.4.20 or above. This is typically the case when compiled
    * on Linux and not macOS.
    */
-  MURMUR_HASH_2 = 1,
-}
+  MURMUR_HASH_2: 'MURMUR_HASH_2',
+} as const;
+
+/**
+ * The hash function used to hash hosts onto the ketama ring.
+ */
+export type _envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction =
+  /**
+   * Use `xxHash <https://github.com/Cyan4973/xxHash>`_, this is the default hash function.
+   */
+  | 'XX_HASH'
+  | 0
+  /**
+   * Use `MurmurHash2 <https://sites.google.com/site/murmurhash/>`_, this is compatible with
+   * std:hash<string> in GNU libstdc++ 3.4.20 or above. This is typically the case when compiled
+   * on Linux and not macOS.
+   */
+  | 'MURMUR_HASH_2'
+  | 1
+
+/**
+ * The hash function used to hash hosts onto the ketama ring.
+ */
+export type _envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction__Output = typeof _envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction[keyof typeof _envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction]
 
 // Original file: deps/envoy-api/envoy/config/cluster/v3/cluster.proto
 
@@ -389,42 +531,42 @@ export enum _envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction {
  * Refer to :ref:`load balancer type <arch_overview_load_balancing_types>` architecture
  * overview section for information on each type.
  */
-export enum _envoy_config_cluster_v3_Cluster_LbPolicy {
+export const _envoy_config_cluster_v3_Cluster_LbPolicy = {
   /**
    * Refer to the :ref:`round robin load balancing
    * policy<arch_overview_load_balancing_types_round_robin>`
    * for an explanation.
    */
-  ROUND_ROBIN = 0,
+  ROUND_ROBIN: 'ROUND_ROBIN',
   /**
    * Refer to the :ref:`least request load balancing
    * policy<arch_overview_load_balancing_types_least_request>`
    * for an explanation.
    */
-  LEAST_REQUEST = 1,
+  LEAST_REQUEST: 'LEAST_REQUEST',
   /**
    * Refer to the :ref:`ring hash load balancing
    * policy<arch_overview_load_balancing_types_ring_hash>`
    * for an explanation.
    */
-  RING_HASH = 2,
+  RING_HASH: 'RING_HASH',
   /**
    * Refer to the :ref:`random load balancing
    * policy<arch_overview_load_balancing_types_random>`
    * for an explanation.
    */
-  RANDOM = 3,
+  RANDOM: 'RANDOM',
   /**
    * Refer to the :ref:`Maglev load balancing policy<arch_overview_load_balancing_types_maglev>`
    * for an explanation.
    */
-  MAGLEV = 5,
+  MAGLEV: 'MAGLEV',
   /**
    * This load balancer type must be specified if the configured cluster provides a cluster
    * specific load balancer. Consult the configured cluster's documentation for whether to set
    * this option or not.
    */
-  CLUSTER_PROVIDED = 6,
+  CLUSTER_PROVIDED: 'CLUSTER_PROVIDED',
   /**
    * Use the new :ref:`load_balancing_policy
    * <envoy_v3_api_field_config.cluster.v3.Cluster.load_balancing_policy>` field to determine the LB policy.
@@ -432,8 +574,70 @@ export enum _envoy_config_cluster_v3_Cluster_LbPolicy {
    * <envoy_v3_api_field_config.cluster.v3.Cluster.load_balancing_policy>` field without
    * setting any value in :ref:`lb_policy<envoy_v3_api_field_config.cluster.v3.Cluster.lb_policy>`.
    */
-  LOAD_BALANCING_POLICY_CONFIG = 7,
-}
+  LOAD_BALANCING_POLICY_CONFIG: 'LOAD_BALANCING_POLICY_CONFIG',
+} as const;
+
+/**
+ * Refer to :ref:`load balancer type <arch_overview_load_balancing_types>` architecture
+ * overview section for information on each type.
+ */
+export type _envoy_config_cluster_v3_Cluster_LbPolicy =
+  /**
+   * Refer to the :ref:`round robin load balancing
+   * policy<arch_overview_load_balancing_types_round_robin>`
+   * for an explanation.
+   */
+  | 'ROUND_ROBIN'
+  | 0
+  /**
+   * Refer to the :ref:`least request load balancing
+   * policy<arch_overview_load_balancing_types_least_request>`
+   * for an explanation.
+   */
+  | 'LEAST_REQUEST'
+  | 1
+  /**
+   * Refer to the :ref:`ring hash load balancing
+   * policy<arch_overview_load_balancing_types_ring_hash>`
+   * for an explanation.
+   */
+  | 'RING_HASH'
+  | 2
+  /**
+   * Refer to the :ref:`random load balancing
+   * policy<arch_overview_load_balancing_types_random>`
+   * for an explanation.
+   */
+  | 'RANDOM'
+  | 3
+  /**
+   * Refer to the :ref:`Maglev load balancing policy<arch_overview_load_balancing_types_maglev>`
+   * for an explanation.
+   */
+  | 'MAGLEV'
+  | 5
+  /**
+   * This load balancer type must be specified if the configured cluster provides a cluster
+   * specific load balancer. Consult the configured cluster's documentation for whether to set
+   * this option or not.
+   */
+  | 'CLUSTER_PROVIDED'
+  | 6
+  /**
+   * Use the new :ref:`load_balancing_policy
+   * <envoy_v3_api_field_config.cluster.v3.Cluster.load_balancing_policy>` field to determine the LB policy.
+   * This has been deprecated in favor of using the :ref:`load_balancing_policy
+   * <envoy_v3_api_field_config.cluster.v3.Cluster.load_balancing_policy>` field without
+   * setting any value in :ref:`lb_policy<envoy_v3_api_field_config.cluster.v3.Cluster.lb_policy>`.
+   */
+  | 'LOAD_BALANCING_POLICY_CONFIG'
+  | 7
+
+/**
+ * Refer to :ref:`load balancer type <arch_overview_load_balancing_types>` architecture
+ * overview section for information on each type.
+ */
+export type _envoy_config_cluster_v3_Cluster_LbPolicy__Output = typeof _envoy_config_cluster_v3_Cluster_LbPolicy[keyof typeof _envoy_config_cluster_v3_Cluster_LbPolicy]
 
 /**
  * Optionally divide the endpoints in this cluster into subsets defined by
@@ -446,7 +650,7 @@ export interface _envoy_config_cluster_v3_Cluster_LbSubsetConfig {
    * metadata. The value defaults to
    * :ref:`NO_FALLBACK<envoy_v3_api_enum_value_config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetFallbackPolicy.NO_FALLBACK>`.
    */
-  'fallback_policy'?: (_envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetFallbackPolicy | keyof typeof _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetFallbackPolicy);
+  'fallback_policy'?: (_envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetFallbackPolicy);
   /**
    * Specifies the default subset of endpoints used during fallback if
    * fallback_policy is
@@ -519,7 +723,7 @@ export interface _envoy_config_cluster_v3_Cluster_LbSubsetConfig {
    * The value defaults to
    * :ref:`METADATA_NO_FALLBACK<envoy_v3_api_enum_value_config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetMetadataFallbackPolicy.METADATA_NO_FALLBACK>`.
    */
-  'metadata_fallback_policy'?: (_envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy | keyof typeof _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy);
+  'metadata_fallback_policy'?: (_envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy);
 }
 
 /**
@@ -533,7 +737,7 @@ export interface _envoy_config_cluster_v3_Cluster_LbSubsetConfig__Output {
    * metadata. The value defaults to
    * :ref:`NO_FALLBACK<envoy_v3_api_enum_value_config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetFallbackPolicy.NO_FALLBACK>`.
    */
-  'fallback_policy': (keyof typeof _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetFallbackPolicy);
+  'fallback_policy': (_envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetFallbackPolicy__Output);
   /**
    * Specifies the default subset of endpoints used during fallback if
    * fallback_policy is
@@ -606,7 +810,7 @@ export interface _envoy_config_cluster_v3_Cluster_LbSubsetConfig__Output {
    * The value defaults to
    * :ref:`METADATA_NO_FALLBACK<envoy_v3_api_enum_value_config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetMetadataFallbackPolicy.METADATA_NO_FALLBACK>`.
    */
-  'metadata_fallback_policy': (keyof typeof _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy);
+  'metadata_fallback_policy': (_envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy__Output);
 }
 
 // Original file: deps/envoy-api/envoy/config/cluster/v3/cluster.proto
@@ -618,19 +822,43 @@ export interface _envoy_config_cluster_v3_Cluster_LbSubsetConfig__Output {
  * etc). If DEFAULT_SUBSET is selected, load balancing is performed over the
  * endpoints matching the values from the default_subset field.
  */
-export enum _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetFallbackPolicy {
-  NO_FALLBACK = 0,
-  ANY_ENDPOINT = 1,
-  DEFAULT_SUBSET = 2,
-}
+export const _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetFallbackPolicy = {
+  NO_FALLBACK: 'NO_FALLBACK',
+  ANY_ENDPOINT: 'ANY_ENDPOINT',
+  DEFAULT_SUBSET: 'DEFAULT_SUBSET',
+} as const;
+
+/**
+ * If NO_FALLBACK is selected, a result
+ * equivalent to no healthy hosts is reported. If ANY_ENDPOINT is selected,
+ * any cluster endpoint may be returned (subject to policy, health checks,
+ * etc). If DEFAULT_SUBSET is selected, load balancing is performed over the
+ * endpoints matching the values from the default_subset field.
+ */
+export type _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetFallbackPolicy =
+  | 'NO_FALLBACK'
+  | 0
+  | 'ANY_ENDPOINT'
+  | 1
+  | 'DEFAULT_SUBSET'
+  | 2
+
+/**
+ * If NO_FALLBACK is selected, a result
+ * equivalent to no healthy hosts is reported. If ANY_ENDPOINT is selected,
+ * any cluster endpoint may be returned (subject to policy, health checks,
+ * etc). If DEFAULT_SUBSET is selected, load balancing is performed over the
+ * endpoints matching the values from the default_subset field.
+ */
+export type _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetFallbackPolicy__Output = typeof _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetFallbackPolicy[keyof typeof _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetFallbackPolicy]
 
 // Original file: deps/envoy-api/envoy/config/cluster/v3/cluster.proto
 
-export enum _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy {
+export const _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy = {
   /**
    * No fallback. Route metadata will be used as-is.
    */
-  METADATA_NO_FALLBACK = 0,
+  METADATA_NO_FALLBACK: 'METADATA_NO_FALLBACK',
   /**
    * A special metadata key ``fallback_list`` will be used to provide variants of metadata to try.
    * Value of ``fallback_list`` key has to be a list. Every list element has to be a struct - it will
@@ -672,8 +900,60 @@ export enum _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetMetadataFall
    * 
    * is used.
    */
-  FALLBACK_LIST = 1,
-}
+  FALLBACK_LIST: 'FALLBACK_LIST',
+} as const;
+
+export type _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy =
+  /**
+   * No fallback. Route metadata will be used as-is.
+   */
+  | 'METADATA_NO_FALLBACK'
+  | 0
+  /**
+   * A special metadata key ``fallback_list`` will be used to provide variants of metadata to try.
+   * Value of ``fallback_list`` key has to be a list. Every list element has to be a struct - it will
+   * be merged with route metadata, overriding keys that appear in both places.
+   * ``fallback_list`` entries will be used in order until a host is found.
+   * 
+   * ``fallback_list`` key itself is removed from metadata before subset load balancing is performed.
+   * 
+   * Example:
+   * 
+   * for metadata:
+   * 
+   * .. code-block:: yaml
+   * 
+   * version: 1.0
+   * fallback_list:
+   * - version: 2.0
+   * hardware: c64
+   * - hardware: c32
+   * - version: 3.0
+   * 
+   * at first, metadata:
+   * 
+   * .. code-block:: json
+   * 
+   * {"version": "2.0", "hardware": "c64"}
+   * 
+   * will be used for load balancing. If no host is found, metadata:
+   * 
+   * .. code-block:: json
+   * 
+   * {"version": "1.0", "hardware": "c32"}
+   * 
+   * is next to try. If it still results in no host, finally metadata:
+   * 
+   * .. code-block:: json
+   * 
+   * {"version": "3.0"}
+   * 
+   * is used.
+   */
+  | 'FALLBACK_LIST'
+  | 1
+
+export type _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy__Output = typeof _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy[keyof typeof _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetMetadataFallbackPolicy]
 
 /**
  * Specifications for subsets.
@@ -699,7 +979,7 @@ export interface _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelecto
    * The behavior used when no endpoint subset matches the selected route's
    * metadata.
    */
-  'fallback_policy'?: (_envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_LbSubsetSelectorFallbackPolicy | keyof typeof _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_LbSubsetSelectorFallbackPolicy);
+  'fallback_policy'?: (_envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_LbSubsetSelectorFallbackPolicy);
   /**
    * Subset of
    * :ref:`keys<envoy_v3_api_field_config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector.keys>` used by
@@ -738,7 +1018,7 @@ export interface _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelecto
    * The behavior used when no endpoint subset matches the selected route's
    * metadata.
    */
-  'fallback_policy': (keyof typeof _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_LbSubsetSelectorFallbackPolicy);
+  'fallback_policy': (_envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_LbSubsetSelectorFallbackPolicy__Output);
   /**
    * Subset of
    * :ref:`keys<envoy_v3_api_field_config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector.keys>` used by
@@ -758,25 +1038,25 @@ export interface _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelecto
 /**
  * Allows to override top level fallback policy per selector.
  */
-export enum _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_LbSubsetSelectorFallbackPolicy {
+export const _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_LbSubsetSelectorFallbackPolicy = {
   /**
    * If NOT_DEFINED top level config fallback policy is used instead.
    */
-  NOT_DEFINED = 0,
+  NOT_DEFINED: 'NOT_DEFINED',
   /**
    * If NO_FALLBACK is selected, a result equivalent to no healthy hosts is reported.
    */
-  NO_FALLBACK = 1,
+  NO_FALLBACK: 'NO_FALLBACK',
   /**
    * If ANY_ENDPOINT is selected, any cluster endpoint may be returned
    * (subject to policy, health checks, etc).
    */
-  ANY_ENDPOINT = 2,
+  ANY_ENDPOINT: 'ANY_ENDPOINT',
   /**
    * If DEFAULT_SUBSET is selected, load balancing is performed over the
    * endpoints matching the values from the default_subset field.
    */
-  DEFAULT_SUBSET = 3,
+  DEFAULT_SUBSET: 'DEFAULT_SUBSET',
   /**
    * If KEYS_SUBSET is selected, subset selector matching is performed again with metadata
    * keys reduced to
@@ -784,8 +1064,49 @@ export enum _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_LbS
    * It allows for a fallback to a different, less specific selector if some of the keys of
    * the selector are considered optional.
    */
-  KEYS_SUBSET = 4,
-}
+  KEYS_SUBSET: 'KEYS_SUBSET',
+} as const;
+
+/**
+ * Allows to override top level fallback policy per selector.
+ */
+export type _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_LbSubsetSelectorFallbackPolicy =
+  /**
+   * If NOT_DEFINED top level config fallback policy is used instead.
+   */
+  | 'NOT_DEFINED'
+  | 0
+  /**
+   * If NO_FALLBACK is selected, a result equivalent to no healthy hosts is reported.
+   */
+  | 'NO_FALLBACK'
+  | 1
+  /**
+   * If ANY_ENDPOINT is selected, any cluster endpoint may be returned
+   * (subject to policy, health checks, etc).
+   */
+  | 'ANY_ENDPOINT'
+  | 2
+  /**
+   * If DEFAULT_SUBSET is selected, load balancing is performed over the
+   * endpoints matching the values from the default_subset field.
+   */
+  | 'DEFAULT_SUBSET'
+  | 3
+  /**
+   * If KEYS_SUBSET is selected, subset selector matching is performed again with metadata
+   * keys reduced to
+   * :ref:`fallback_keys_subset<envoy_v3_api_field_config.cluster.v3.Cluster.LbSubsetConfig.LbSubsetSelector.fallback_keys_subset>`.
+   * It allows for a fallback to a different, less specific selector if some of the keys of
+   * the selector are considered optional.
+   */
+  | 'KEYS_SUBSET'
+  | 4
+
+/**
+ * Allows to override top level fallback policy per selector.
+ */
+export type _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_LbSubsetSelectorFallbackPolicy__Output = typeof _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_LbSubsetSelectorFallbackPolicy[keyof typeof _envoy_config_cluster_v3_Cluster_LbSubsetConfig_LbSubsetSelector_LbSubsetSelectorFallbackPolicy]
 
 /**
  * Specific configuration for the LeastRequest load balancing policy.
@@ -1149,7 +1470,7 @@ export interface _envoy_config_cluster_v3_Cluster_RingHashLbConfig {
    * The hash function used to hash hosts onto the ketama ring. The value defaults to
    * :ref:`XX_HASH<envoy_v3_api_enum_value_config.cluster.v3.Cluster.RingHashLbConfig.HashFunction.XX_HASH>`.
    */
-  'hash_function'?: (_envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction | keyof typeof _envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction);
+  'hash_function'?: (_envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction);
   /**
    * Maximum hash ring size. Defaults to 8M entries, and limited to 8M entries, but can be lowered
    * to further constrain resource use. See also
@@ -1174,7 +1495,7 @@ export interface _envoy_config_cluster_v3_Cluster_RingHashLbConfig__Output {
    * The hash function used to hash hosts onto the ketama ring. The value defaults to
    * :ref:`XX_HASH<envoy_v3_api_enum_value_config.cluster.v3.Cluster.RingHashLbConfig.HashFunction.XX_HASH>`.
    */
-  'hash_function': (keyof typeof _envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction);
+  'hash_function': (_envoy_config_cluster_v3_Cluster_RingHashLbConfig_HashFunction__Output);
   /**
    * Maximum hash ring size. Defaults to 8M entries, and limited to 8M entries, but can be lowered
    * to further constrain resource use. See also
@@ -1394,7 +1715,7 @@ export interface Cluster {
    * The :ref:`service discovery type <arch_overview_service_discovery_types>`
    * to use for resolving the cluster.
    */
-  'type'?: (_envoy_config_cluster_v3_Cluster_DiscoveryType | keyof typeof _envoy_config_cluster_v3_Cluster_DiscoveryType);
+  'type'?: (_envoy_config_cluster_v3_Cluster_DiscoveryType);
   /**
    * Configuration to use for EDS updates for the Cluster.
    */
@@ -1413,7 +1734,7 @@ export interface Cluster {
    * The :ref:`load balancer type <arch_overview_load_balancing_types>` to use
    * when picking a host in the cluster.
    */
-  'lb_policy'?: (_envoy_config_cluster_v3_Cluster_LbPolicy | keyof typeof _envoy_config_cluster_v3_Cluster_LbPolicy);
+  'lb_policy'?: (_envoy_config_cluster_v3_Cluster_LbPolicy);
   /**
    * Optional :ref:`active health checking <arch_overview_health_checking>`
    * configuration for the cluster. If no
@@ -1429,6 +1750,7 @@ export interface Cluster {
    * 
    * .. attention::
    * This field has been deprecated in favor of the :ref:`max_requests_per_connection <envoy_v3_api_field_config.core.v3.HttpProtocolOptions.max_requests_per_connection>` field.
+   * @deprecated
    */
   'max_requests_per_connection'?: (_google_protobuf_UInt32Value | null);
   /**
@@ -1444,6 +1766,7 @@ export interface Cluster {
    * See :ref:`upstream_http_protocol_options
    * <envoy_v3_api_field_extensions.upstreams.http.v3.HttpProtocolOptions.upstream_http_protocol_options>`
    * for example usage.
+   * @deprecated
    */
   'http_protocol_options'?: (_envoy_config_core_v3_Http1ProtocolOptions | null);
   /**
@@ -1460,6 +1783,7 @@ export interface Cluster {
    * See :ref:`upstream_http_protocol_options
    * <envoy_v3_api_field_extensions.upstreams.http.v3.HttpProtocolOptions.upstream_http_protocol_options>`
    * for example usage.
+   * @deprecated
    */
   'http2_protocol_options'?: (_envoy_config_core_v3_Http2ProtocolOptions | null);
   /**
@@ -1479,7 +1803,7 @@ export interface Cluster {
    * value defaults to
    * :ref:`AUTO<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DnsLookupFamily.AUTO>`.
    */
-  'dns_lookup_family'?: (_envoy_config_cluster_v3_Cluster_DnsLookupFamily | keyof typeof _envoy_config_cluster_v3_Cluster_DnsLookupFamily);
+  'dns_lookup_family'?: (_envoy_config_cluster_v3_Cluster_DnsLookupFamily);
   /**
    * If DNS resolvers are specified and the cluster type is either
    * :ref:`STRICT_DNS<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DiscoveryType.STRICT_DNS>`,
@@ -1493,6 +1817,7 @@ export interface Cluster {
    * this setting is ignored.
    * This field is deprecated in favor of ``dns_resolution_config``
    * which aggregates all of the DNS resolver configuration in a single message.
+   * @deprecated
    */
   'dns_resolvers'?: (_envoy_config_core_v3_Address)[];
   /**
@@ -1554,8 +1879,9 @@ export interface Cluster {
    * <envoy_v3_api_msg_extensions.upstreams.http.v3.HttpProtocolOptions>` message.
    * http_protocol_options can be set via the cluster's
    * :ref:`extension_protocol_options<envoy_v3_api_field_config.cluster.v3.Cluster.typed_extension_protocol_options>`.
+   * @deprecated
    */
-  'protocol_selection'?: (_envoy_config_cluster_v3_Cluster_ClusterProtocolSelection | keyof typeof _envoy_config_cluster_v3_Cluster_ClusterProtocolSelection);
+  'protocol_selection'?: (_envoy_config_cluster_v3_Cluster_ClusterProtocolSelection);
   /**
    * Common configuration for all load balancer implementations.
    */
@@ -1581,6 +1907,7 @@ export interface Cluster {
    * See :ref:`upstream_http_protocol_options
    * <envoy_v3_api_field_extensions.upstreams.http.v3.HttpProtocolOptions.upstream_http_protocol_options>`
    * for example usage.
+   * @deprecated
    */
   'common_http_protocol_options'?: (_envoy_config_core_v3_HttpProtocolOptions | null);
   /**
@@ -1743,6 +2070,7 @@ export interface Cluster {
    * Always use TCP queries instead of UDP queries for DNS lookups.
    * This field is deprecated in favor of ``dns_resolution_config``
    * which aggregates all of the DNS resolver configuration in a single message.
+   * @deprecated
    */
   'use_tcp_for_dns_lookups'?: (boolean);
   /**
@@ -1756,6 +2084,7 @@ export interface Cluster {
    * See :ref:`upstream_http_protocol_options
    * <envoy_v3_api_field_extensions.upstreams.http.v3.HttpProtocolOptions.upstream_http_protocol_options>`
    * for example usage.
+   * @deprecated
    */
   'upstream_http_protocol_options'?: (_envoy_config_core_v3_UpstreamHttpProtocolOptions | null);
   /**
@@ -1769,6 +2098,7 @@ export interface Cluster {
    * 
    * This field has been deprecated in favor of ``timeout_budgets``, part of
    * :ref:`track_cluster_stats <envoy_v3_api_field_config.cluster.v3.Cluster.track_cluster_stats>`.
+   * @deprecated
    */
   'track_timeout_budgets'?: (boolean);
   /**
@@ -1813,6 +2143,7 @@ export interface Cluster {
    * DNS resolution configuration which includes the underlying dns resolver addresses and options.
    * This field is deprecated in favor of
    * :ref:`typed_dns_resolver_config <envoy_v3_api_field_config.cluster.v3.Cluster.typed_dns_resolver_config>`.
+   * @deprecated
    */
   'dns_resolution_config'?: (_envoy_config_core_v3_DnsResolutionConfig | null);
   /**
@@ -1873,7 +2204,7 @@ export interface Cluster__Output {
    * The :ref:`service discovery type <arch_overview_service_discovery_types>`
    * to use for resolving the cluster.
    */
-  'type'?: (keyof typeof _envoy_config_cluster_v3_Cluster_DiscoveryType);
+  'type'?: (_envoy_config_cluster_v3_Cluster_DiscoveryType__Output);
   /**
    * Configuration to use for EDS updates for the Cluster.
    */
@@ -1892,7 +2223,7 @@ export interface Cluster__Output {
    * The :ref:`load balancer type <arch_overview_load_balancing_types>` to use
    * when picking a host in the cluster.
    */
-  'lb_policy': (keyof typeof _envoy_config_cluster_v3_Cluster_LbPolicy);
+  'lb_policy': (_envoy_config_cluster_v3_Cluster_LbPolicy__Output);
   /**
    * Optional :ref:`active health checking <arch_overview_health_checking>`
    * configuration for the cluster. If no
@@ -1908,6 +2239,7 @@ export interface Cluster__Output {
    * 
    * .. attention::
    * This field has been deprecated in favor of the :ref:`max_requests_per_connection <envoy_v3_api_field_config.core.v3.HttpProtocolOptions.max_requests_per_connection>` field.
+   * @deprecated
    */
   'max_requests_per_connection': (_google_protobuf_UInt32Value__Output | null);
   /**
@@ -1923,6 +2255,7 @@ export interface Cluster__Output {
    * See :ref:`upstream_http_protocol_options
    * <envoy_v3_api_field_extensions.upstreams.http.v3.HttpProtocolOptions.upstream_http_protocol_options>`
    * for example usage.
+   * @deprecated
    */
   'http_protocol_options': (_envoy_config_core_v3_Http1ProtocolOptions__Output | null);
   /**
@@ -1939,6 +2272,7 @@ export interface Cluster__Output {
    * See :ref:`upstream_http_protocol_options
    * <envoy_v3_api_field_extensions.upstreams.http.v3.HttpProtocolOptions.upstream_http_protocol_options>`
    * for example usage.
+   * @deprecated
    */
   'http2_protocol_options': (_envoy_config_core_v3_Http2ProtocolOptions__Output | null);
   /**
@@ -1958,7 +2292,7 @@ export interface Cluster__Output {
    * value defaults to
    * :ref:`AUTO<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DnsLookupFamily.AUTO>`.
    */
-  'dns_lookup_family': (keyof typeof _envoy_config_cluster_v3_Cluster_DnsLookupFamily);
+  'dns_lookup_family': (_envoy_config_cluster_v3_Cluster_DnsLookupFamily__Output);
   /**
    * If DNS resolvers are specified and the cluster type is either
    * :ref:`STRICT_DNS<envoy_v3_api_enum_value_config.cluster.v3.Cluster.DiscoveryType.STRICT_DNS>`,
@@ -1972,6 +2306,7 @@ export interface Cluster__Output {
    * this setting is ignored.
    * This field is deprecated in favor of ``dns_resolution_config``
    * which aggregates all of the DNS resolver configuration in a single message.
+   * @deprecated
    */
   'dns_resolvers': (_envoy_config_core_v3_Address__Output)[];
   /**
@@ -2033,8 +2368,9 @@ export interface Cluster__Output {
    * <envoy_v3_api_msg_extensions.upstreams.http.v3.HttpProtocolOptions>` message.
    * http_protocol_options can be set via the cluster's
    * :ref:`extension_protocol_options<envoy_v3_api_field_config.cluster.v3.Cluster.typed_extension_protocol_options>`.
+   * @deprecated
    */
-  'protocol_selection': (keyof typeof _envoy_config_cluster_v3_Cluster_ClusterProtocolSelection);
+  'protocol_selection': (_envoy_config_cluster_v3_Cluster_ClusterProtocolSelection__Output);
   /**
    * Common configuration for all load balancer implementations.
    */
@@ -2060,6 +2396,7 @@ export interface Cluster__Output {
    * See :ref:`upstream_http_protocol_options
    * <envoy_v3_api_field_extensions.upstreams.http.v3.HttpProtocolOptions.upstream_http_protocol_options>`
    * for example usage.
+   * @deprecated
    */
   'common_http_protocol_options': (_envoy_config_core_v3_HttpProtocolOptions__Output | null);
   /**
@@ -2222,6 +2559,7 @@ export interface Cluster__Output {
    * Always use TCP queries instead of UDP queries for DNS lookups.
    * This field is deprecated in favor of ``dns_resolution_config``
    * which aggregates all of the DNS resolver configuration in a single message.
+   * @deprecated
    */
   'use_tcp_for_dns_lookups': (boolean);
   /**
@@ -2235,6 +2573,7 @@ export interface Cluster__Output {
    * See :ref:`upstream_http_protocol_options
    * <envoy_v3_api_field_extensions.upstreams.http.v3.HttpProtocolOptions.upstream_http_protocol_options>`
    * for example usage.
+   * @deprecated
    */
   'upstream_http_protocol_options': (_envoy_config_core_v3_UpstreamHttpProtocolOptions__Output | null);
   /**
@@ -2248,6 +2587,7 @@ export interface Cluster__Output {
    * 
    * This field has been deprecated in favor of ``timeout_budgets``, part of
    * :ref:`track_cluster_stats <envoy_v3_api_field_config.cluster.v3.Cluster.track_cluster_stats>`.
+   * @deprecated
    */
   'track_timeout_budgets': (boolean);
   /**
@@ -2292,6 +2632,7 @@ export interface Cluster__Output {
    * DNS resolution configuration which includes the underlying dns resolver addresses and options.
    * This field is deprecated in favor of
    * :ref:`typed_dns_resolver_config <envoy_v3_api_field_config.cluster.v3.Cluster.typed_dns_resolver_config>`.
+   * @deprecated
    */
   'dns_resolution_config': (_envoy_config_core_v3_DnsResolutionConfig__Output | null);
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/cluster/v3/UpstreamBindConfig.ts b/packages/grpc-js-xds/src/generated/envoy/config/cluster/v3/UpstreamBindConfig.ts
deleted file mode 100644
index f2dbd0608..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/cluster/v3/UpstreamBindConfig.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/cluster/v3/cluster.proto
-
-import type { Address as _envoy_config_core_v3_Address, Address__Output as _envoy_config_core_v3_Address__Output } from '../../../../envoy/config/core/v3/Address';
-
-/**
- * An extensible structure containing the address Envoy should bind to when
- * establishing upstream connections.
- */
-export interface UpstreamBindConfig {
-  /**
-   * The address Envoy should bind to when establishing upstream connections.
-   */
-  'source_address'?: (_envoy_config_core_v3_Address | null);
-}
-
-/**
- * An extensible structure containing the address Envoy should bind to when
- * establishing upstream connections.
- */
-export interface UpstreamBindConfig__Output {
-  /**
-   * The address Envoy should bind to when establishing upstream connections.
-   */
-  'source_address': (_envoy_config_core_v3_Address__Output | null);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ApiConfigSource.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ApiConfigSource.ts
index 691ab93ba..0a2f11bdf 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ApiConfigSource.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ApiConfigSource.ts
@@ -3,7 +3,7 @@
 import type { Duration as _google_protobuf_Duration, Duration__Output as _google_protobuf_Duration__Output } from '../../../../google/protobuf/Duration';
 import type { GrpcService as _envoy_config_core_v3_GrpcService, GrpcService__Output as _envoy_config_core_v3_GrpcService__Output } from '../../../../envoy/config/core/v3/GrpcService';
 import type { RateLimitSettings as _envoy_config_core_v3_RateLimitSettings, RateLimitSettings__Output as _envoy_config_core_v3_RateLimitSettings__Output } from '../../../../envoy/config/core/v3/RateLimitSettings';
-import type { ApiVersion as _envoy_config_core_v3_ApiVersion } from '../../../../envoy/config/core/v3/ApiVersion';
+import type { ApiVersion as _envoy_config_core_v3_ApiVersion, ApiVersion__Output as _envoy_config_core_v3_ApiVersion__Output } from '../../../../envoy/config/core/v3/ApiVersion';
 import type { TypedExtensionConfig as _envoy_config_core_v3_TypedExtensionConfig, TypedExtensionConfig__Output as _envoy_config_core_v3_TypedExtensionConfig__Output } from '../../../../envoy/config/core/v3/TypedExtensionConfig';
 
 // Original file: deps/envoy-api/envoy/config/core/v3/config_source.proto
@@ -11,41 +11,91 @@ import type { TypedExtensionConfig as _envoy_config_core_v3_TypedExtensionConfig
 /**
  * APIs may be fetched via either REST or gRPC.
  */
-export enum _envoy_config_core_v3_ApiConfigSource_ApiType {
+export const _envoy_config_core_v3_ApiConfigSource_ApiType = {
   /**
    * Ideally this would be 'reserved 0' but one can't reserve the default
    * value. Instead we throw an exception if this is ever used.
+   * @deprecated
    */
-  DEPRECATED_AND_UNAVAILABLE_DO_NOT_USE = 0,
+  DEPRECATED_AND_UNAVAILABLE_DO_NOT_USE: 'DEPRECATED_AND_UNAVAILABLE_DO_NOT_USE',
   /**
    * REST-JSON v2 API. The `canonical JSON encoding
    * <https://developers.google.com/protocol-buffers/docs/proto3#json>`_ for
    * the v2 protos is used.
    */
-  REST = 1,
+  REST: 'REST',
   /**
    * SotW gRPC service.
    */
-  GRPC = 2,
+  GRPC: 'GRPC',
   /**
    * Using the delta xDS gRPC service, i.e. DeltaDiscovery{Request,Response}
    * rather than Discovery{Request,Response}. Rather than sending Envoy the entire state
    * with every update, the xDS server only sends what has changed since the last update.
    */
-  DELTA_GRPC = 3,
+  DELTA_GRPC: 'DELTA_GRPC',
   /**
    * SotW xDS gRPC with ADS. All resources which resolve to this configuration source will be
    * multiplexed on a single connection to an ADS endpoint.
    * [#not-implemented-hide:]
    */
-  AGGREGATED_GRPC = 5,
+  AGGREGATED_GRPC: 'AGGREGATED_GRPC',
   /**
    * Delta xDS gRPC with ADS. All resources which resolve to this configuration source will be
    * multiplexed on a single connection to an ADS endpoint.
    * [#not-implemented-hide:]
    */
-  AGGREGATED_DELTA_GRPC = 6,
-}
+  AGGREGATED_DELTA_GRPC: 'AGGREGATED_DELTA_GRPC',
+} as const;
+
+/**
+ * APIs may be fetched via either REST or gRPC.
+ */
+export type _envoy_config_core_v3_ApiConfigSource_ApiType =
+  /**
+   * Ideally this would be 'reserved 0' but one can't reserve the default
+   * value. Instead we throw an exception if this is ever used.
+   */
+  | 'DEPRECATED_AND_UNAVAILABLE_DO_NOT_USE'
+  | 0
+  /**
+   * REST-JSON v2 API. The `canonical JSON encoding
+   * <https://developers.google.com/protocol-buffers/docs/proto3#json>`_ for
+   * the v2 protos is used.
+   */
+  | 'REST'
+  | 1
+  /**
+   * SotW gRPC service.
+   */
+  | 'GRPC'
+  | 2
+  /**
+   * Using the delta xDS gRPC service, i.e. DeltaDiscovery{Request,Response}
+   * rather than Discovery{Request,Response}. Rather than sending Envoy the entire state
+   * with every update, the xDS server only sends what has changed since the last update.
+   */
+  | 'DELTA_GRPC'
+  | 3
+  /**
+   * SotW xDS gRPC with ADS. All resources which resolve to this configuration source will be
+   * multiplexed on a single connection to an ADS endpoint.
+   * [#not-implemented-hide:]
+   */
+  | 'AGGREGATED_GRPC'
+  | 5
+  /**
+   * Delta xDS gRPC with ADS. All resources which resolve to this configuration source will be
+   * multiplexed on a single connection to an ADS endpoint.
+   * [#not-implemented-hide:]
+   */
+  | 'AGGREGATED_DELTA_GRPC'
+  | 6
+
+/**
+ * APIs may be fetched via either REST or gRPC.
+ */
+export type _envoy_config_core_v3_ApiConfigSource_ApiType__Output = typeof _envoy_config_core_v3_ApiConfigSource_ApiType[keyof typeof _envoy_config_core_v3_ApiConfigSource_ApiType]
 
 /**
  * API configuration source. This identifies the API type and cluster that Envoy
@@ -56,7 +106,7 @@ export interface ApiConfigSource {
   /**
    * API type (gRPC, REST, delta gRPC)
    */
-  'api_type'?: (_envoy_config_core_v3_ApiConfigSource_ApiType | keyof typeof _envoy_config_core_v3_ApiConfigSource_ApiType);
+  'api_type'?: (_envoy_config_core_v3_ApiConfigSource_ApiType);
   /**
    * Cluster names should be used only with REST. If > 1
    * cluster is defined, clusters will be cycled through if any kind of failure
@@ -94,7 +144,7 @@ export interface ApiConfigSource {
    * API version for xDS transport protocol. This describes the xDS gRPC/REST
    * endpoint and version of [Delta]DiscoveryRequest/Response used on the wire.
    */
-  'transport_api_version'?: (_envoy_config_core_v3_ApiVersion | keyof typeof _envoy_config_core_v3_ApiVersion);
+  'transport_api_version'?: (_envoy_config_core_v3_ApiVersion);
   /**
    * A list of config validators that will be executed when a new update is
    * received from the ApiConfigSource. Note that each validator handles a
@@ -117,7 +167,7 @@ export interface ApiConfigSource__Output {
   /**
    * API type (gRPC, REST, delta gRPC)
    */
-  'api_type': (keyof typeof _envoy_config_core_v3_ApiConfigSource_ApiType);
+  'api_type': (_envoy_config_core_v3_ApiConfigSource_ApiType__Output);
   /**
    * Cluster names should be used only with REST. If > 1
    * cluster is defined, clusters will be cycled through if any kind of failure
@@ -155,7 +205,7 @@ export interface ApiConfigSource__Output {
    * API version for xDS transport protocol. This describes the xDS gRPC/REST
    * endpoint and version of [Delta]DiscoveryRequest/Response used on the wire.
    */
-  'transport_api_version': (keyof typeof _envoy_config_core_v3_ApiVersion);
+  'transport_api_version': (_envoy_config_core_v3_ApiVersion__Output);
   /**
    * A list of config validators that will be executed when a new update is
    * received from the ApiConfigSource. Note that each validator handles a
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ApiVersion.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ApiVersion.ts
index b46f6ec43..d3bad5d4e 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ApiVersion.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ApiVersion.ts
@@ -4,19 +4,50 @@
  * xDS API and non-xDS services version. This is used to describe both resource and transport
  * protocol versions (in distinct configuration fields).
  */
-export enum ApiVersion {
+export const ApiVersion = {
   /**
    * When not specified, we assume v2, to ease migration to Envoy's stable API
    * versioning. If a client does not support v2 (e.g. due to deprecation), this
    * is an invalid value.
+   * @deprecated
    */
-  AUTO = 0,
+  AUTO: 'AUTO',
   /**
    * Use xDS v2 API.
+   * @deprecated
    */
-  V2 = 1,
+  V2: 'V2',
   /**
    * Use xDS v3 API.
    */
-  V3 = 2,
-}
+  V3: 'V3',
+} as const;
+
+/**
+ * xDS API and non-xDS services version. This is used to describe both resource and transport
+ * protocol versions (in distinct configuration fields).
+ */
+export type ApiVersion =
+  /**
+   * When not specified, we assume v2, to ease migration to Envoy's stable API
+   * versioning. If a client does not support v2 (e.g. due to deprecation), this
+   * is an invalid value.
+   */
+  | 'AUTO'
+  | 0
+  /**
+   * Use xDS v2 API.
+   */
+  | 'V2'
+  | 1
+  /**
+   * Use xDS v3 API.
+   */
+  | 'V3'
+  | 2
+
+/**
+ * xDS API and non-xDS services version. This is used to describe both resource and transport
+ * protocol versions (in distinct configuration fields).
+ */
+export type ApiVersion__Output = typeof ApiVersion[keyof typeof ApiVersion]
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/BindConfig.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/BindConfig.ts
index 592525ce2..8fd14a147 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/BindConfig.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/BindConfig.ts
@@ -32,6 +32,7 @@ export interface BindConfig {
   /**
    * Deprecated by
    * :ref:`extra_source_addresses <envoy_v3_api_field_config.core.v3.BindConfig.extra_source_addresses>`
+   * @deprecated
    */
   'additional_source_addresses'?: (_envoy_config_core_v3_SocketAddress)[];
   /**
@@ -76,6 +77,7 @@ export interface BindConfig__Output {
   /**
    * Deprecated by
    * :ref:`extra_source_addresses <envoy_v3_api_field_config.core.v3.BindConfig.extra_source_addresses>`
+   * @deprecated
    */
   'additional_source_addresses': (_envoy_config_core_v3_SocketAddress__Output)[];
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ConfigSource.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ConfigSource.ts
index 5438b6e7d..1b98848ef 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ConfigSource.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ConfigSource.ts
@@ -4,7 +4,7 @@ import type { ApiConfigSource as _envoy_config_core_v3_ApiConfigSource, ApiConfi
 import type { AggregatedConfigSource as _envoy_config_core_v3_AggregatedConfigSource, AggregatedConfigSource__Output as _envoy_config_core_v3_AggregatedConfigSource__Output } from '../../../../envoy/config/core/v3/AggregatedConfigSource';
 import type { Duration as _google_protobuf_Duration, Duration__Output as _google_protobuf_Duration__Output } from '../../../../google/protobuf/Duration';
 import type { SelfConfigSource as _envoy_config_core_v3_SelfConfigSource, SelfConfigSource__Output as _envoy_config_core_v3_SelfConfigSource__Output } from '../../../../envoy/config/core/v3/SelfConfigSource';
-import type { ApiVersion as _envoy_config_core_v3_ApiVersion } from '../../../../envoy/config/core/v3/ApiVersion';
+import type { ApiVersion as _envoy_config_core_v3_ApiVersion, ApiVersion__Output as _envoy_config_core_v3_ApiVersion__Output } from '../../../../envoy/config/core/v3/ApiVersion';
 import type { Authority as _xds_core_v3_Authority, Authority__Output as _xds_core_v3_Authority__Output } from '../../../../xds/core/v3/Authority';
 import type { PathConfigSource as _envoy_config_core_v3_PathConfigSource, PathConfigSource__Output as _envoy_config_core_v3_PathConfigSource__Output } from '../../../../envoy/config/core/v3/PathConfigSource';
 
@@ -20,6 +20,7 @@ import type { PathConfigSource as _envoy_config_core_v3_PathConfigSource, PathCo
 export interface ConfigSource {
   /**
    * Deprecated in favor of ``path_config_source``. Use that field instead.
+   * @deprecated
    */
   'path'?: (string);
   /**
@@ -60,7 +61,7 @@ export interface ConfigSource {
    * will request for resources and the resource type that the client will in
    * turn expect to be delivered.
    */
-  'resource_api_version'?: (_envoy_config_core_v3_ApiVersion | keyof typeof _envoy_config_core_v3_ApiVersion);
+  'resource_api_version'?: (_envoy_config_core_v3_ApiVersion);
   /**
    * Authorities that this config source may be used for. An authority specified in a xdstp:// URL
    * is resolved to a ``ConfigSource`` prior to configuration fetch. This field provides the
@@ -87,6 +88,7 @@ export interface ConfigSource {
 export interface ConfigSource__Output {
   /**
    * Deprecated in favor of ``path_config_source``. Use that field instead.
+   * @deprecated
    */
   'path'?: (string);
   /**
@@ -127,7 +129,7 @@ export interface ConfigSource__Output {
    * will request for resources and the resource type that the client will in
    * turn expect to be delivered.
    */
-  'resource_api_version': (keyof typeof _envoy_config_core_v3_ApiVersion);
+  'resource_api_version': (_envoy_config_core_v3_ApiVersion__Output);
   /**
    * Authorities that this config source may be used for. An authority specified in a xdstp:// URL
    * is resolved to a ``ConfigSource`` prior to configuration fetch. This field provides the
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/Extension.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/Extension.ts
index b25c15cce..dbbdb0cee 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/Extension.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/Extension.ts
@@ -24,6 +24,7 @@ export interface Extension {
    * [#not-implemented-hide:] Type descriptor of extension configuration proto.
    * [#comment:TODO(yanavlasov): Link to the doc with existing configuration protos.]
    * [#comment:TODO(yanavlasov): Add tests when PR #9391 lands.]
+   * @deprecated
    */
   'type_descriptor'?: (string);
   /**
@@ -64,6 +65,7 @@ export interface Extension__Output {
    * [#not-implemented-hide:] Type descriptor of extension configuration proto.
    * [#comment:TODO(yanavlasov): Link to the doc with existing configuration protos.]
    * [#comment:TODO(yanavlasov): Add tests when PR #9391 lands.]
+   * @deprecated
    */
   'type_descriptor': (string);
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HeaderValueOption.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HeaderValueOption.ts
index 04f82a7fe..1e792bdb6 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HeaderValueOption.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HeaderValueOption.ts
@@ -8,7 +8,7 @@ import type { BoolValue as _google_protobuf_BoolValue, BoolValue__Output as _goo
 /**
  * Describes the supported actions types for header append action.
  */
-export enum _envoy_config_core_v3_HeaderValueOption_HeaderAppendAction {
+export const _envoy_config_core_v3_HeaderValueOption_HeaderAppendAction = {
   /**
    * If the header already exists, this action will result in:
    * 
@@ -17,24 +17,63 @@ export enum _envoy_config_core_v3_HeaderValueOption_HeaderAppendAction {
    * 
    * If the header doesn't exist then this will add new header with specified key and value.
    */
-  APPEND_IF_EXISTS_OR_ADD = 0,
+  APPEND_IF_EXISTS_OR_ADD: 'APPEND_IF_EXISTS_OR_ADD',
   /**
    * This action will add the header if it doesn't already exist. If the header
    * already exists then this will be a no-op.
    */
-  ADD_IF_ABSENT = 1,
+  ADD_IF_ABSENT: 'ADD_IF_ABSENT',
   /**
    * This action will overwrite the specified value by discarding any existing values if
    * the header already exists. If the header doesn't exist then this will add the header
    * with specified key and value.
    */
-  OVERWRITE_IF_EXISTS_OR_ADD = 2,
+  OVERWRITE_IF_EXISTS_OR_ADD: 'OVERWRITE_IF_EXISTS_OR_ADD',
   /**
    * This action will overwrite the specified value by discarding any existing values if
    * the header already exists. If the header doesn't exist then this will be no-op.
    */
-  OVERWRITE_IF_EXISTS = 3,
-}
+  OVERWRITE_IF_EXISTS: 'OVERWRITE_IF_EXISTS',
+} as const;
+
+/**
+ * Describes the supported actions types for header append action.
+ */
+export type _envoy_config_core_v3_HeaderValueOption_HeaderAppendAction =
+  /**
+   * If the header already exists, this action will result in:
+   * 
+   * - Comma-concatenated for predefined inline headers.
+   * - Duplicate header added in the ``HeaderMap`` for other headers.
+   * 
+   * If the header doesn't exist then this will add new header with specified key and value.
+   */
+  | 'APPEND_IF_EXISTS_OR_ADD'
+  | 0
+  /**
+   * This action will add the header if it doesn't already exist. If the header
+   * already exists then this will be a no-op.
+   */
+  | 'ADD_IF_ABSENT'
+  | 1
+  /**
+   * This action will overwrite the specified value by discarding any existing values if
+   * the header already exists. If the header doesn't exist then this will add the header
+   * with specified key and value.
+   */
+  | 'OVERWRITE_IF_EXISTS_OR_ADD'
+  | 2
+  /**
+   * This action will overwrite the specified value by discarding any existing values if
+   * the header already exists. If the header doesn't exist then this will be no-op.
+   */
+  | 'OVERWRITE_IF_EXISTS'
+  | 3
+
+/**
+ * Describes the supported actions types for header append action.
+ */
+export type _envoy_config_core_v3_HeaderValueOption_HeaderAppendAction__Output = typeof _envoy_config_core_v3_HeaderValueOption_HeaderAppendAction[keyof typeof _envoy_config_core_v3_HeaderValueOption_HeaderAppendAction]
 
 /**
  * Header name/value pair plus option to control append behavior.
@@ -54,6 +93,7 @@ export interface HeaderValueOption {
    * The :ref:`external authorization service <envoy_v3_api_msg_service.auth.v3.CheckResponse>` and
    * :ref:`external processor service <envoy_v3_api_msg_service.ext_proc.v3.ProcessingResponse>` have
    * default value (``false``) for this field.
+   * @deprecated
    */
   'append'?: (_google_protobuf_BoolValue | null);
   /**
@@ -62,7 +102,7 @@ export interface HeaderValueOption {
    * Value defaults to :ref:`APPEND_IF_EXISTS_OR_ADD
    * <envoy_v3_api_enum_value_config.core.v3.HeaderValueOption.HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD>`.
    */
-  'append_action'?: (_envoy_config_core_v3_HeaderValueOption_HeaderAppendAction | keyof typeof _envoy_config_core_v3_HeaderValueOption_HeaderAppendAction);
+  'append_action'?: (_envoy_config_core_v3_HeaderValueOption_HeaderAppendAction);
   /**
    * Is the header value allowed to be empty? If false (default), custom headers with empty values are dropped,
    * otherwise they are added.
@@ -88,6 +128,7 @@ export interface HeaderValueOption__Output {
    * The :ref:`external authorization service <envoy_v3_api_msg_service.auth.v3.CheckResponse>` and
    * :ref:`external processor service <envoy_v3_api_msg_service.ext_proc.v3.ProcessingResponse>` have
    * default value (``false``) for this field.
+   * @deprecated
    */
   'append': (_google_protobuf_BoolValue__Output | null);
   /**
@@ -96,7 +137,7 @@ export interface HeaderValueOption__Output {
    * Value defaults to :ref:`APPEND_IF_EXISTS_OR_ADD
    * <envoy_v3_api_enum_value_config.core.v3.HeaderValueOption.HeaderAppendAction.APPEND_IF_EXISTS_OR_ADD>`.
    */
-  'append_action': (keyof typeof _envoy_config_core_v3_HeaderValueOption_HeaderAppendAction);
+  'append_action': (_envoy_config_core_v3_HeaderValueOption_HeaderAppendAction__Output);
   /**
    * Is the header value allowed to be empty? If false (default), custom headers with empty values are dropped,
    * otherwise they are added.
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HealthCheck.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HealthCheck.ts
index e0638df7d..f6605412e 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HealthCheck.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HealthCheck.ts
@@ -9,11 +9,10 @@ import type { TypedExtensionConfig as _envoy_config_core_v3_TypedExtensionConfig
 import type { UInt64Value as _google_protobuf_UInt64Value, UInt64Value__Output as _google_protobuf_UInt64Value__Output } from '../../../../google/protobuf/UInt64Value';
 import type { HeaderValueOption as _envoy_config_core_v3_HeaderValueOption, HeaderValueOption__Output as _envoy_config_core_v3_HeaderValueOption__Output } from '../../../../envoy/config/core/v3/HeaderValueOption';
 import type { Int64Range as _envoy_type_v3_Int64Range, Int64Range__Output as _envoy_type_v3_Int64Range__Output } from '../../../../envoy/type/v3/Int64Range';
-import type { CodecClientType as _envoy_type_v3_CodecClientType } from '../../../../envoy/type/v3/CodecClientType';
+import type { CodecClientType as _envoy_type_v3_CodecClientType, CodecClientType__Output as _envoy_type_v3_CodecClientType__Output } from '../../../../envoy/type/v3/CodecClientType';
 import type { StringMatcher as _envoy_type_matcher_v3_StringMatcher, StringMatcher__Output as _envoy_type_matcher_v3_StringMatcher__Output } from '../../../../envoy/type/matcher/v3/StringMatcher';
-import type { RequestMethod as _envoy_config_core_v3_RequestMethod } from '../../../../envoy/config/core/v3/RequestMethod';
+import type { RequestMethod as _envoy_config_core_v3_RequestMethod, RequestMethod__Output as _envoy_config_core_v3_RequestMethod__Output } from '../../../../envoy/config/core/v3/RequestMethod';
 import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../../google/protobuf/Any';
-import type { Long } from '@grpc/proto-loader';
 
 /**
  * Custom health check.
@@ -183,7 +182,7 @@ export interface _envoy_config_core_v3_HealthCheck_HttpHealthCheck {
   /**
    * Use specified application protocol for health checks.
    */
-  'codec_client_type'?: (_envoy_type_v3_CodecClientType | keyof typeof _envoy_type_v3_CodecClientType);
+  'codec_client_type'?: (_envoy_type_v3_CodecClientType);
   /**
    * An optional service name parameter which is used to validate the identity of
    * the health checked cluster using a :ref:`StringMatcher
@@ -197,7 +196,7 @@ export interface _envoy_config_core_v3_HealthCheck_HttpHealthCheck {
    * CONNECT method is disallowed because it is not appropriate for health check request.
    * If a non-200 response is expected by the method, it needs to be set in :ref:`expected_statuses <envoy_v3_api_field_config.core.v3.HealthCheck.HttpHealthCheck.expected_statuses>`.
    */
-  'method'?: (_envoy_config_core_v3_RequestMethod | keyof typeof _envoy_config_core_v3_RequestMethod);
+  'method'?: (_envoy_config_core_v3_RequestMethod);
 }
 
 /**
@@ -272,7 +271,7 @@ export interface _envoy_config_core_v3_HealthCheck_HttpHealthCheck__Output {
   /**
    * Use specified application protocol for health checks.
    */
-  'codec_client_type': (keyof typeof _envoy_type_v3_CodecClientType);
+  'codec_client_type': (_envoy_type_v3_CodecClientType__Output);
   /**
    * An optional service name parameter which is used to validate the identity of
    * the health checked cluster using a :ref:`StringMatcher
@@ -286,7 +285,7 @@ export interface _envoy_config_core_v3_HealthCheck_HttpHealthCheck__Output {
    * CONNECT method is disallowed because it is not appropriate for health check request.
    * If a non-200 response is expected by the method, it needs to be set in :ref:`expected_statuses <envoy_v3_api_field_config.core.v3.HealthCheck.HttpHealthCheck.expected_statuses>`.
    */
-  'method': (keyof typeof _envoy_config_core_v3_RequestMethod);
+  'method': (_envoy_config_core_v3_RequestMethod__Output);
 }
 
 /**
@@ -497,6 +496,7 @@ export interface HealthCheck {
    * in the file sink extension.
    * 
    * Specifies the path to the :ref:`health check event log <arch_overview_health_check_logging>`.
+   * @deprecated
    */
   'event_log_path'?: (string);
   /**
@@ -687,6 +687,7 @@ export interface HealthCheck__Output {
    * in the file sink extension.
    * 
    * Specifies the path to the :ref:`health check event log <arch_overview_health_check_logging>`.
+   * @deprecated
    */
   'event_log_path': (string);
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HealthStatus.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HealthStatus.ts
index 7d3d76569..54298f59b 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HealthStatus.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HealthStatus.ts
@@ -3,19 +3,19 @@
 /**
  * Endpoint health status.
  */
-export enum HealthStatus {
+export const HealthStatus = {
   /**
    * The health status is not known. This is interpreted by Envoy as ``HEALTHY``.
    */
-  UNKNOWN = 0,
+  UNKNOWN: 'UNKNOWN',
   /**
    * Healthy.
    */
-  HEALTHY = 1,
+  HEALTHY: 'HEALTHY',
   /**
    * Unhealthy.
    */
-  UNHEALTHY = 2,
+  UNHEALTHY: 'UNHEALTHY',
   /**
    * Connection draining in progress. E.g.,
    * `<https://aws.amazon.com/blogs/aws/elb-connection-draining-remove-instances-from-service-with-care/>`_
@@ -23,14 +23,59 @@ export enum HealthStatus {
    * `<https://cloud.google.com/compute/docs/load-balancing/enabling-connection-draining>`_.
    * This is interpreted by Envoy as ``UNHEALTHY``.
    */
-  DRAINING = 3,
+  DRAINING: 'DRAINING',
   /**
    * Health check timed out. This is part of HDS and is interpreted by Envoy as
    * ``UNHEALTHY``.
    */
-  TIMEOUT = 4,
+  TIMEOUT: 'TIMEOUT',
   /**
    * Degraded.
    */
-  DEGRADED = 5,
-}
+  DEGRADED: 'DEGRADED',
+} as const;
+
+/**
+ * Endpoint health status.
+ */
+export type HealthStatus =
+  /**
+   * The health status is not known. This is interpreted by Envoy as ``HEALTHY``.
+   */
+  | 'UNKNOWN'
+  | 0
+  /**
+   * Healthy.
+   */
+  | 'HEALTHY'
+  | 1
+  /**
+   * Unhealthy.
+   */
+  | 'UNHEALTHY'
+  | 2
+  /**
+   * Connection draining in progress. E.g.,
+   * `<https://aws.amazon.com/blogs/aws/elb-connection-draining-remove-instances-from-service-with-care/>`_
+   * or
+   * `<https://cloud.google.com/compute/docs/load-balancing/enabling-connection-draining>`_.
+   * This is interpreted by Envoy as ``UNHEALTHY``.
+   */
+  | 'DRAINING'
+  | 3
+  /**
+   * Health check timed out. This is part of HDS and is interpreted by Envoy as
+   * ``UNHEALTHY``.
+   */
+  | 'TIMEOUT'
+  | 4
+  /**
+   * Degraded.
+   */
+  | 'DEGRADED'
+  | 5
+
+/**
+ * Endpoint health status.
+ */
+export type HealthStatus__Output = typeof HealthStatus[keyof typeof HealthStatus]
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HealthStatusSet.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HealthStatusSet.ts
index c518192d7..c94bf049c 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HealthStatusSet.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HealthStatusSet.ts
@@ -1,17 +1,17 @@
 // Original file: deps/envoy-api/envoy/config/core/v3/health_check.proto
 
-import type { HealthStatus as _envoy_config_core_v3_HealthStatus } from '../../../../envoy/config/core/v3/HealthStatus';
+import type { HealthStatus as _envoy_config_core_v3_HealthStatus, HealthStatus__Output as _envoy_config_core_v3_HealthStatus__Output } from '../../../../envoy/config/core/v3/HealthStatus';
 
 export interface HealthStatusSet {
   /**
    * An order-independent set of health status.
    */
-  'statuses'?: (_envoy_config_core_v3_HealthStatus | keyof typeof _envoy_config_core_v3_HealthStatus)[];
+  'statuses'?: (_envoy_config_core_v3_HealthStatus)[];
 }
 
 export interface HealthStatusSet__Output {
   /**
    * An order-independent set of health status.
    */
-  'statuses': (keyof typeof _envoy_config_core_v3_HealthStatus)[];
+  'statuses': (_envoy_config_core_v3_HealthStatus__Output)[];
 }
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/Http2ProtocolOptions.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/Http2ProtocolOptions.ts
index cc22ce44c..9e0ae3d6e 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/Http2ProtocolOptions.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/Http2ProtocolOptions.ts
@@ -159,6 +159,7 @@ export interface Http2ProtocolOptions {
    * <envoy_v3_api_field_config.core.v3.Http2ProtocolOptions.override_stream_error_on_invalid_http_message>`
    * 
    * See `RFC7540, sec. 8.1 <https://tools.ietf.org/html/rfc7540#section-8.1>`_ for details.
+   * @deprecated
    */
   'stream_error_on_invalid_http_messaging'?: (boolean);
   /**
@@ -339,6 +340,7 @@ export interface Http2ProtocolOptions__Output {
    * <envoy_v3_api_field_config.core.v3.Http2ProtocolOptions.override_stream_error_on_invalid_http_message>`
    * 
    * See `RFC7540, sec. 8.1 <https://tools.ietf.org/html/rfc7540#section-8.1>`_ for details.
+   * @deprecated
    */
   'stream_error_on_invalid_http_messaging': (boolean);
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HttpProtocolOptions.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HttpProtocolOptions.ts
index a3064110f..dfa800c3b 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HttpProtocolOptions.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/HttpProtocolOptions.ts
@@ -12,24 +12,61 @@ import type { UInt32Value as _google_protobuf_UInt32Value, UInt32Value__Output a
  * as a security measure due to systems that treat '_' and '-' as interchangeable. Envoy by default allows client request headers with underscore
  * characters.
  */
-export enum _envoy_config_core_v3_HttpProtocolOptions_HeadersWithUnderscoresAction {
+export const _envoy_config_core_v3_HttpProtocolOptions_HeadersWithUnderscoresAction = {
   /**
    * Allow headers with underscores. This is the default behavior.
    */
-  ALLOW = 0,
+  ALLOW: 'ALLOW',
   /**
    * Reject client request. HTTP/1 requests are rejected with the 400 status. HTTP/2 requests
    * end with the stream reset. The "httpN.requests_rejected_with_underscores_in_headers" counter
    * is incremented for each rejected request.
    */
-  REJECT_REQUEST = 1,
+  REJECT_REQUEST: 'REJECT_REQUEST',
   /**
    * Drop the client header with name containing underscores. The header is dropped before the filter chain is
    * invoked and as such filters will not see dropped headers. The
    * "httpN.dropped_headers_with_underscores" is incremented for each dropped header.
    */
-  DROP_HEADER = 2,
-}
+  DROP_HEADER: 'DROP_HEADER',
+} as const;
+
+/**
+ * Action to take when Envoy receives client request with header names containing underscore
+ * characters.
+ * Underscore character is allowed in header names by the RFC-7230 and this behavior is implemented
+ * as a security measure due to systems that treat '_' and '-' as interchangeable. Envoy by default allows client request headers with underscore
+ * characters.
+ */
+export type _envoy_config_core_v3_HttpProtocolOptions_HeadersWithUnderscoresAction =
+  /**
+   * Allow headers with underscores. This is the default behavior.
+   */
+  | 'ALLOW'
+  | 0
+  /**
+   * Reject client request. HTTP/1 requests are rejected with the 400 status. HTTP/2 requests
+   * end with the stream reset. The "httpN.requests_rejected_with_underscores_in_headers" counter
+   * is incremented for each rejected request.
+   */
+  | 'REJECT_REQUEST'
+  | 1
+  /**
+   * Drop the client header with name containing underscores. The header is dropped before the filter chain is
+   * invoked and as such filters will not see dropped headers. The
+   * "httpN.dropped_headers_with_underscores" is incremented for each dropped header.
+   */
+  | 'DROP_HEADER'
+  | 2
+
+/**
+ * Action to take when Envoy receives client request with header names containing underscore
+ * characters.
+ * Underscore character is allowed in header names by the RFC-7230 and this behavior is implemented
+ * as a security measure due to systems that treat '_' and '-' as interchangeable. Envoy by default allows client request headers with underscore
+ * characters.
+ */
+export type _envoy_config_core_v3_HttpProtocolOptions_HeadersWithUnderscoresAction__Output = typeof _envoy_config_core_v3_HttpProtocolOptions_HeadersWithUnderscoresAction[keyof typeof _envoy_config_core_v3_HttpProtocolOptions_HeadersWithUnderscoresAction]
 
 /**
  * [#next-free-field: 7]
@@ -81,7 +118,7 @@ export interface HttpProtocolOptions {
    * Note: this only affects client headers. It does not affect headers added
    * by Envoy filters and does not have any impact if added to cluster config.
    */
-  'headers_with_underscores_action'?: (_envoy_config_core_v3_HttpProtocolOptions_HeadersWithUnderscoresAction | keyof typeof _envoy_config_core_v3_HttpProtocolOptions_HeadersWithUnderscoresAction);
+  'headers_with_underscores_action'?: (_envoy_config_core_v3_HttpProtocolOptions_HeadersWithUnderscoresAction);
   /**
    * Optional maximum requests for both upstream and downstream connections.
    * If not specified, there is no limit.
@@ -141,7 +178,7 @@ export interface HttpProtocolOptions__Output {
    * Note: this only affects client headers. It does not affect headers added
    * by Envoy filters and does not have any impact if added to cluster config.
    */
-  'headers_with_underscores_action': (keyof typeof _envoy_config_core_v3_HttpProtocolOptions_HeadersWithUnderscoresAction);
+  'headers_with_underscores_action': (_envoy_config_core_v3_HttpProtocolOptions_HeadersWithUnderscoresAction__Output);
   /**
    * Optional maximum requests for both upstream and downstream connections.
    * If not specified, there is no limit.
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/Node.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/Node.ts
index 6aef94d8e..b29b68502 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/Node.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/Node.ts
@@ -78,6 +78,7 @@ export interface Node {
    * for filtering :ref:`listeners <config_listeners>` to be returned. For example,
    * if there is a listener bound to port 80, the list can optionally contain the
    * SocketAddress ``(0.0.0.0,80)``. The field is optional and just a hint.
+   * @deprecated
    */
   'listening_addresses'?: (_envoy_config_core_v3_Address)[];
   /**
@@ -162,6 +163,7 @@ export interface Node__Output {
    * for filtering :ref:`listeners <config_listeners>` to be returned. For example,
    * if there is a listener bound to port 80, the list can optionally contain the
    * SocketAddress ``(0.0.0.0,80)``. The field is optional and just a hint.
+   * @deprecated
    */
   'listening_addresses': (_envoy_config_core_v3_Address__Output)[];
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ProxyProtocolConfig.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ProxyProtocolConfig.ts
index 7da9d569e..34cf7475f 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ProxyProtocolConfig.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ProxyProtocolConfig.ts
@@ -4,22 +4,36 @@ import type { ProxyProtocolPassThroughTLVs as _envoy_config_core_v3_ProxyProtoco
 
 // Original file: deps/envoy-api/envoy/config/core/v3/proxy_protocol.proto
 
-export enum _envoy_config_core_v3_ProxyProtocolConfig_Version {
+export const _envoy_config_core_v3_ProxyProtocolConfig_Version = {
   /**
    * PROXY protocol version 1. Human readable format.
    */
-  V1 = 0,
+  V1: 'V1',
   /**
    * PROXY protocol version 2. Binary format.
    */
-  V2 = 1,
-}
+  V2: 'V2',
+} as const;
+
+export type _envoy_config_core_v3_ProxyProtocolConfig_Version =
+  /**
+   * PROXY protocol version 1. Human readable format.
+   */
+  | 'V1'
+  | 0
+  /**
+   * PROXY protocol version 2. Binary format.
+   */
+  | 'V2'
+  | 1
+
+export type _envoy_config_core_v3_ProxyProtocolConfig_Version__Output = typeof _envoy_config_core_v3_ProxyProtocolConfig_Version[keyof typeof _envoy_config_core_v3_ProxyProtocolConfig_Version]
 
 export interface ProxyProtocolConfig {
   /**
    * The PROXY protocol version to use. See https://www.haproxy.org/download/2.1/doc/proxy-protocol.txt for details
    */
-  'version'?: (_envoy_config_core_v3_ProxyProtocolConfig_Version | keyof typeof _envoy_config_core_v3_ProxyProtocolConfig_Version);
+  'version'?: (_envoy_config_core_v3_ProxyProtocolConfig_Version);
   /**
    * This config controls which TLVs can be passed to upstream if it is Proxy Protocol
    * V2 header. If there is no setting for this field, no TLVs will be passed through.
@@ -31,7 +45,7 @@ export interface ProxyProtocolConfig__Output {
   /**
    * The PROXY protocol version to use. See https://www.haproxy.org/download/2.1/doc/proxy-protocol.txt for details
    */
-  'version': (keyof typeof _envoy_config_core_v3_ProxyProtocolConfig_Version);
+  'version': (_envoy_config_core_v3_ProxyProtocolConfig_Version__Output);
   /**
    * This config controls which TLVs can be passed to upstream if it is Proxy Protocol
    * V2 header. If there is no setting for this field, no TLVs will be passed through.
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ProxyProtocolPassThroughTLVs.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ProxyProtocolPassThroughTLVs.ts
index 0dddbf79f..9f253ceff 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ProxyProtocolPassThroughTLVs.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/ProxyProtocolPassThroughTLVs.ts
@@ -3,23 +3,37 @@
 
 // Original file: deps/envoy-api/envoy/config/core/v3/proxy_protocol.proto
 
-export enum _envoy_config_core_v3_ProxyProtocolPassThroughTLVs_PassTLVsMatchType {
+export const _envoy_config_core_v3_ProxyProtocolPassThroughTLVs_PassTLVsMatchType = {
   /**
    * Pass all TLVs.
    */
-  INCLUDE_ALL = 0,
+  INCLUDE_ALL: 'INCLUDE_ALL',
   /**
    * Pass specific TLVs defined in tlv_type.
    */
-  INCLUDE = 1,
-}
+  INCLUDE: 'INCLUDE',
+} as const;
+
+export type _envoy_config_core_v3_ProxyProtocolPassThroughTLVs_PassTLVsMatchType =
+  /**
+   * Pass all TLVs.
+   */
+  | 'INCLUDE_ALL'
+  | 0
+  /**
+   * Pass specific TLVs defined in tlv_type.
+   */
+  | 'INCLUDE'
+  | 1
+
+export type _envoy_config_core_v3_ProxyProtocolPassThroughTLVs_PassTLVsMatchType__Output = typeof _envoy_config_core_v3_ProxyProtocolPassThroughTLVs_PassTLVsMatchType[keyof typeof _envoy_config_core_v3_ProxyProtocolPassThroughTLVs_PassTLVsMatchType]
 
 export interface ProxyProtocolPassThroughTLVs {
   /**
    * The strategy to pass through TLVs. Default is INCLUDE_ALL.
    * If INCLUDE_ALL is set, all TLVs will be passed through no matter the tlv_type field.
    */
-  'match_type'?: (_envoy_config_core_v3_ProxyProtocolPassThroughTLVs_PassTLVsMatchType | keyof typeof _envoy_config_core_v3_ProxyProtocolPassThroughTLVs_PassTLVsMatchType);
+  'match_type'?: (_envoy_config_core_v3_ProxyProtocolPassThroughTLVs_PassTLVsMatchType);
   /**
    * The TLV types that are applied based on match_type.
    * TLV type is defined as uint8_t in proxy protocol. See `the spec
@@ -33,7 +47,7 @@ export interface ProxyProtocolPassThroughTLVs__Output {
    * The strategy to pass through TLVs. Default is INCLUDE_ALL.
    * If INCLUDE_ALL is set, all TLVs will be passed through no matter the tlv_type field.
    */
-  'match_type': (keyof typeof _envoy_config_core_v3_ProxyProtocolPassThroughTLVs_PassTLVsMatchType);
+  'match_type': (_envoy_config_core_v3_ProxyProtocolPassThroughTLVs_PassTLVsMatchType__Output);
   /**
    * The TLV types that are applied based on match_type.
    * TLV type is defined as uint8_t in proxy protocol. See `the spec
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/RequestMethod.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/RequestMethod.ts
index 9be1aa6d1..67d40fda6 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/RequestMethod.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/RequestMethod.ts
@@ -3,15 +3,45 @@
 /**
  * HTTP request method.
  */
-export enum RequestMethod {
-  METHOD_UNSPECIFIED = 0,
-  GET = 1,
-  HEAD = 2,
-  POST = 3,
-  PUT = 4,
-  DELETE = 5,
-  CONNECT = 6,
-  OPTIONS = 7,
-  TRACE = 8,
-  PATCH = 9,
-}
+export const RequestMethod = {
+  METHOD_UNSPECIFIED: 'METHOD_UNSPECIFIED',
+  GET: 'GET',
+  HEAD: 'HEAD',
+  POST: 'POST',
+  PUT: 'PUT',
+  DELETE: 'DELETE',
+  CONNECT: 'CONNECT',
+  OPTIONS: 'OPTIONS',
+  TRACE: 'TRACE',
+  PATCH: 'PATCH',
+} as const;
+
+/**
+ * HTTP request method.
+ */
+export type RequestMethod =
+  | 'METHOD_UNSPECIFIED'
+  | 0
+  | 'GET'
+  | 1
+  | 'HEAD'
+  | 2
+  | 'POST'
+  | 3
+  | 'PUT'
+  | 4
+  | 'DELETE'
+  | 5
+  | 'CONNECT'
+  | 6
+  | 'OPTIONS'
+  | 7
+  | 'TRACE'
+  | 8
+  | 'PATCH'
+  | 9
+
+/**
+ * HTTP request method.
+ */
+export type RequestMethod__Output = typeof RequestMethod[keyof typeof RequestMethod]
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/RoutingPriority.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/RoutingPriority.ts
index 917d8a3df..41172d92f 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/RoutingPriority.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/RoutingPriority.ts
@@ -9,7 +9,33 @@
  * upstream host. In the future Envoy will likely support true HTTP/2 priority
  * over a single upstream connection.
  */
-export enum RoutingPriority {
-  DEFAULT = 0,
-  HIGH = 1,
-}
+export const RoutingPriority = {
+  DEFAULT: 'DEFAULT',
+  HIGH: 'HIGH',
+} as const;
+
+/**
+ * Envoy supports :ref:`upstream priority routing
+ * <arch_overview_http_routing_priority>` both at the route and the virtual
+ * cluster level. The current priority implementation uses different connection
+ * pool and circuit breaking settings for each priority level. This means that
+ * even for HTTP/2 requests, two physical connections will be used to an
+ * upstream host. In the future Envoy will likely support true HTTP/2 priority
+ * over a single upstream connection.
+ */
+export type RoutingPriority =
+  | 'DEFAULT'
+  | 0
+  | 'HIGH'
+  | 1
+
+/**
+ * Envoy supports :ref:`upstream priority routing
+ * <arch_overview_http_routing_priority>` both at the route and the virtual
+ * cluster level. The current priority implementation uses different connection
+ * pool and circuit breaking settings for each priority level. This means that
+ * even for HTTP/2 requests, two physical connections will be used to an
+ * upstream host. In the future Envoy will likely support true HTTP/2 priority
+ * over a single upstream connection.
+ */
+export type RoutingPriority__Output = typeof RoutingPriority[keyof typeof RoutingPriority]
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SelfConfigSource.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SelfConfigSource.ts
index 3912fd1cf..939c4fd3d 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SelfConfigSource.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SelfConfigSource.ts
@@ -1,6 +1,6 @@
 // Original file: deps/envoy-api/envoy/config/core/v3/config_source.proto
 
-import type { ApiVersion as _envoy_config_core_v3_ApiVersion } from '../../../../envoy/config/core/v3/ApiVersion';
+import type { ApiVersion as _envoy_config_core_v3_ApiVersion, ApiVersion__Output as _envoy_config_core_v3_ApiVersion__Output } from '../../../../envoy/config/core/v3/ApiVersion';
 
 /**
  * [#not-implemented-hide:]
@@ -13,7 +13,7 @@ export interface SelfConfigSource {
    * API version for xDS transport protocol. This describes the xDS gRPC/REST
    * endpoint and version of [Delta]DiscoveryRequest/Response used on the wire.
    */
-  'transport_api_version'?: (_envoy_config_core_v3_ApiVersion | keyof typeof _envoy_config_core_v3_ApiVersion);
+  'transport_api_version'?: (_envoy_config_core_v3_ApiVersion);
 }
 
 /**
@@ -27,5 +27,5 @@ export interface SelfConfigSource__Output {
    * API version for xDS transport protocol. This describes the xDS gRPC/REST
    * endpoint and version of [Delta]DiscoveryRequest/Response used on the wire.
    */
-  'transport_api_version': (keyof typeof _envoy_config_core_v3_ApiVersion);
+  'transport_api_version': (_envoy_config_core_v3_ApiVersion__Output);
 }
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SocketAddress.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SocketAddress.ts
index ae87b9edd..f939393fb 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SocketAddress.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SocketAddress.ts
@@ -3,16 +3,24 @@
 
 // Original file: deps/envoy-api/envoy/config/core/v3/address.proto
 
-export enum _envoy_config_core_v3_SocketAddress_Protocol {
-  TCP = 0,
-  UDP = 1,
-}
+export const _envoy_config_core_v3_SocketAddress_Protocol = {
+  TCP: 'TCP',
+  UDP: 'UDP',
+} as const;
+
+export type _envoy_config_core_v3_SocketAddress_Protocol =
+  | 'TCP'
+  | 0
+  | 'UDP'
+  | 1
+
+export type _envoy_config_core_v3_SocketAddress_Protocol__Output = typeof _envoy_config_core_v3_SocketAddress_Protocol[keyof typeof _envoy_config_core_v3_SocketAddress_Protocol]
 
 /**
  * [#next-free-field: 7]
  */
 export interface SocketAddress {
-  'protocol'?: (_envoy_config_core_v3_SocketAddress_Protocol | keyof typeof _envoy_config_core_v3_SocketAddress_Protocol);
+  'protocol'?: (_envoy_config_core_v3_SocketAddress_Protocol);
   /**
    * The address for this socket. :ref:`Listeners <config_listeners>` will bind
    * to the address. An empty address is not allowed. Specify ``0.0.0.0`` or ``::``
@@ -56,7 +64,7 @@ export interface SocketAddress {
  * [#next-free-field: 7]
  */
 export interface SocketAddress__Output {
-  'protocol': (keyof typeof _envoy_config_core_v3_SocketAddress_Protocol);
+  'protocol': (_envoy_config_core_v3_SocketAddress_Protocol__Output);
   /**
    * The address for this socket. :ref:`Listeners <config_listeners>` will bind
    * to the address. An empty address is not allowed. Specify ``0.0.0.0`` or ``::``
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SocketOption.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SocketOption.ts
index edff50a63..9b3bc0019 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SocketOption.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SocketOption.ts
@@ -4,20 +4,39 @@ import type { Long } from '@grpc/proto-loader';
 
 // Original file: deps/envoy-api/envoy/config/core/v3/socket_option.proto
 
-export enum _envoy_config_core_v3_SocketOption_SocketState {
+export const _envoy_config_core_v3_SocketOption_SocketState = {
   /**
    * Socket options are applied after socket creation but before binding the socket to a port
    */
-  STATE_PREBIND = 0,
+  STATE_PREBIND: 'STATE_PREBIND',
   /**
    * Socket options are applied after binding the socket to a port but before calling listen()
    */
-  STATE_BOUND = 1,
+  STATE_BOUND: 'STATE_BOUND',
   /**
    * Socket options are applied after calling listen()
    */
-  STATE_LISTENING = 2,
-}
+  STATE_LISTENING: 'STATE_LISTENING',
+} as const;
+
+export type _envoy_config_core_v3_SocketOption_SocketState =
+  /**
+   * Socket options are applied after socket creation but before binding the socket to a port
+   */
+  | 'STATE_PREBIND'
+  | 0
+  /**
+   * Socket options are applied after binding the socket to a port but before calling listen()
+   */
+  | 'STATE_BOUND'
+  | 1
+  /**
+   * Socket options are applied after calling listen()
+   */
+  | 'STATE_LISTENING'
+  | 2
+
+export type _envoy_config_core_v3_SocketOption_SocketState__Output = typeof _envoy_config_core_v3_SocketOption_SocketState[keyof typeof _envoy_config_core_v3_SocketOption_SocketState]
 
 /**
  * Generic socket option message. This would be used to set socket options that
@@ -70,7 +89,7 @@ export interface SocketOption {
    * The state in which the option will be applied. When used in BindConfig
    * STATE_PREBIND is currently the only valid value.
    */
-  'state'?: (_envoy_config_core_v3_SocketOption_SocketState | keyof typeof _envoy_config_core_v3_SocketOption_SocketState);
+  'state'?: (_envoy_config_core_v3_SocketOption_SocketState);
   'value'?: "int_value"|"buf_value";
 }
 
@@ -125,6 +144,6 @@ export interface SocketOption__Output {
    * The state in which the option will be applied. When used in BindConfig
    * STATE_PREBIND is currently the only valid value.
    */
-  'state': (keyof typeof _envoy_config_core_v3_SocketOption_SocketState);
+  'state': (_envoy_config_core_v3_SocketOption_SocketState__Output);
   'value': "int_value"|"buf_value";
 }
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SubstitutionFormatString.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SubstitutionFormatString.ts
index 5f050a33a..5171ffb71 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SubstitutionFormatString.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/SubstitutionFormatString.ts
@@ -29,6 +29,7 @@ export interface SubstitutionFormatString {
    * upstream connect error:503:path=/foo
    * 
    * Deprecated in favor of :ref:`text_format_source <envoy_v3_api_field_config.core.v3.SubstitutionFormatString.text_format_source>`. To migrate text format strings, use the :ref:`inline_string <envoy_v3_api_field_config.core.v3.DataSource.inline_string>` field.
+   * @deprecated
    */
   'text_format'?: (string);
   /**
@@ -130,6 +131,7 @@ export interface SubstitutionFormatString__Output {
    * upstream connect error:503:path=/foo
    * 
    * Deprecated in favor of :ref:`text_format_source <envoy_v3_api_field_config.core.v3.SubstitutionFormatString.text_format_source>`. To migrate text format strings, use the :ref:`inline_string <envoy_v3_api_field_config.core.v3.DataSource.inline_string>` field.
+   * @deprecated
    */
   'text_format'?: (string);
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/TrafficDirection.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/TrafficDirection.ts
index b68323b09..e450d43cb 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/TrafficDirection.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/TrafficDirection.ts
@@ -3,17 +3,42 @@
 /**
  * Identifies the direction of the traffic relative to the local Envoy.
  */
-export enum TrafficDirection {
+export const TrafficDirection = {
   /**
    * Default option is unspecified.
    */
-  UNSPECIFIED = 0,
+  UNSPECIFIED: 'UNSPECIFIED',
   /**
    * The transport is used for incoming traffic.
    */
-  INBOUND = 1,
+  INBOUND: 'INBOUND',
   /**
    * The transport is used for outgoing traffic.
    */
-  OUTBOUND = 2,
-}
+  OUTBOUND: 'OUTBOUND',
+} as const;
+
+/**
+ * Identifies the direction of the traffic relative to the local Envoy.
+ */
+export type TrafficDirection =
+  /**
+   * Default option is unspecified.
+   */
+  | 'UNSPECIFIED'
+  | 0
+  /**
+   * The transport is used for incoming traffic.
+   */
+  | 'INBOUND'
+  | 1
+  /**
+   * The transport is used for outgoing traffic.
+   */
+  | 'OUTBOUND'
+  | 2
+
+/**
+ * Identifies the direction of the traffic relative to the local Envoy.
+ */
+export type TrafficDirection__Output = typeof TrafficDirection[keyof typeof TrafficDirection]
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/UdpSocketConfig.ts b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/UdpSocketConfig.ts
index fe1b038db..f5e38b2b4 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/core/v3/UdpSocketConfig.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/core/v3/UdpSocketConfig.ts
@@ -2,7 +2,6 @@
 
 import type { UInt64Value as _google_protobuf_UInt64Value, UInt64Value__Output as _google_protobuf_UInt64Value__Output } from '../../../../google/protobuf/UInt64Value';
 import type { BoolValue as _google_protobuf_BoolValue, BoolValue__Output as _google_protobuf_BoolValue__Output } from '../../../../google/protobuf/BoolValue';
-import type { Long } from '@grpc/proto-loader';
 
 /**
  * Generic UDP socket configuration.
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/endpoint/v3/LbEndpoint.ts b/packages/grpc-js-xds/src/generated/envoy/config/endpoint/v3/LbEndpoint.ts
index 8d184b8a0..4130eb838 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/endpoint/v3/LbEndpoint.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/endpoint/v3/LbEndpoint.ts
@@ -1,7 +1,7 @@
 // Original file: deps/envoy-api/envoy/config/endpoint/v3/endpoint_components.proto
 
 import type { Endpoint as _envoy_config_endpoint_v3_Endpoint, Endpoint__Output as _envoy_config_endpoint_v3_Endpoint__Output } from '../../../../envoy/config/endpoint/v3/Endpoint';
-import type { HealthStatus as _envoy_config_core_v3_HealthStatus } from '../../../../envoy/config/core/v3/HealthStatus';
+import type { HealthStatus as _envoy_config_core_v3_HealthStatus, HealthStatus__Output as _envoy_config_core_v3_HealthStatus__Output } from '../../../../envoy/config/core/v3/HealthStatus';
 import type { Metadata as _envoy_config_core_v3_Metadata, Metadata__Output as _envoy_config_core_v3_Metadata__Output } from '../../../../envoy/config/core/v3/Metadata';
 import type { UInt32Value as _google_protobuf_UInt32Value, UInt32Value__Output as _google_protobuf_UInt32Value__Output } from '../../../../google/protobuf/UInt32Value';
 
@@ -14,7 +14,7 @@ export interface LbEndpoint {
   /**
    * Optional health status when known and supplied by EDS server.
    */
-  'health_status'?: (_envoy_config_core_v3_HealthStatus | keyof typeof _envoy_config_core_v3_HealthStatus);
+  'health_status'?: (_envoy_config_core_v3_HealthStatus);
   /**
    * The endpoint metadata specifies values that may be used by the load
    * balancer to select endpoints in a cluster for a given request. The filter
@@ -56,7 +56,7 @@ export interface LbEndpoint__Output {
   /**
    * Optional health status when known and supplied by EDS server.
    */
-  'health_status': (keyof typeof _envoy_config_core_v3_HealthStatus);
+  'health_status': (_envoy_config_core_v3_HealthStatus__Output);
   /**
    * The endpoint metadata specifies values that may be used by the load
    * balancer to select endpoints in a cluster for a given request. The filter
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/listener/v3/FilterChain.ts b/packages/grpc-js-xds/src/generated/envoy/config/listener/v3/FilterChain.ts
index f27000d71..77b08f48e 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/listener/v3/FilterChain.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/listener/v3/FilterChain.ts
@@ -79,6 +79,7 @@ export interface FilterChain {
    * This field is deprecated. Add a
    * :ref:`PROXY protocol listener filter <config_listener_filters_proxy_protocol>`
    * explicitly instead.
+   * @deprecated
    */
   'use_proxy_proto'?: (_google_protobuf_BoolValue | null);
   /**
@@ -149,6 +150,7 @@ export interface FilterChain__Output {
    * This field is deprecated. Add a
    * :ref:`PROXY protocol listener filter <config_listener_filters_proxy_protocol>`
    * explicitly instead.
+   * @deprecated
    */
   'use_proxy_proto': (_google_protobuf_BoolValue__Output | null);
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/listener/v3/FilterChainMatch.ts b/packages/grpc-js-xds/src/generated/envoy/config/listener/v3/FilterChainMatch.ts
index 87b1503cb..fcbfc1b3e 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/listener/v3/FilterChainMatch.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/listener/v3/FilterChainMatch.ts
@@ -5,20 +5,39 @@ import type { UInt32Value as _google_protobuf_UInt32Value, UInt32Value__Output a
 
 // Original file: deps/envoy-api/envoy/config/listener/v3/listener_components.proto
 
-export enum _envoy_config_listener_v3_FilterChainMatch_ConnectionSourceType {
+export const _envoy_config_listener_v3_FilterChainMatch_ConnectionSourceType = {
   /**
    * Any connection source matches.
    */
-  ANY = 0,
+  ANY: 'ANY',
   /**
    * Match a connection originating from the same host.
    */
-  SAME_IP_OR_LOOPBACK = 1,
+  SAME_IP_OR_LOOPBACK: 'SAME_IP_OR_LOOPBACK',
   /**
    * Match a connection originating from a different host.
    */
-  EXTERNAL = 2,
-}
+  EXTERNAL: 'EXTERNAL',
+} as const;
+
+export type _envoy_config_listener_v3_FilterChainMatch_ConnectionSourceType =
+  /**
+   * Any connection source matches.
+   */
+  | 'ANY'
+  | 0
+  /**
+   * Match a connection originating from the same host.
+   */
+  | 'SAME_IP_OR_LOOPBACK'
+  | 1
+  /**
+   * Match a connection originating from a different host.
+   */
+  | 'EXTERNAL'
+  | 2
+
+export type _envoy_config_listener_v3_FilterChainMatch_ConnectionSourceType__Output = typeof _envoy_config_listener_v3_FilterChainMatch_ConnectionSourceType[keyof typeof _envoy_config_listener_v3_FilterChainMatch_ConnectionSourceType]
 
 /**
  * Specifies the match criteria for selecting a specific filter chain for a
@@ -154,7 +173,7 @@ export interface FilterChainMatch {
   /**
    * Specifies the connection source IP match type. Can be any, local or external network.
    */
-  'source_type'?: (_envoy_config_listener_v3_FilterChainMatch_ConnectionSourceType | keyof typeof _envoy_config_listener_v3_FilterChainMatch_ConnectionSourceType);
+  'source_type'?: (_envoy_config_listener_v3_FilterChainMatch_ConnectionSourceType);
   /**
    * The criteria is satisfied if the directly connected source IP address of the downstream
    * connection is contained in at least one of the specified subnets. If the parameter is not
@@ -297,7 +316,7 @@ export interface FilterChainMatch__Output {
   /**
    * Specifies the connection source IP match type. Can be any, local or external network.
    */
-  'source_type': (keyof typeof _envoy_config_listener_v3_FilterChainMatch_ConnectionSourceType);
+  'source_type': (_envoy_config_listener_v3_FilterChainMatch_ConnectionSourceType__Output);
   /**
    * The criteria is satisfied if the directly connected source IP address of the downstream
    * connection is contained in at least one of the specified subnets. If the parameter is not
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/listener/v3/Listener.ts b/packages/grpc-js-xds/src/generated/envoy/config/listener/v3/Listener.ts
index 9fe361c45..6089081be 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/listener/v3/Listener.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/listener/v3/Listener.ts
@@ -8,7 +8,7 @@ import type { Metadata as _envoy_config_core_v3_Metadata, Metadata__Output as _e
 import type { ListenerFilter as _envoy_config_listener_v3_ListenerFilter, ListenerFilter__Output as _envoy_config_listener_v3_ListenerFilter__Output } from '../../../../envoy/config/listener/v3/ListenerFilter';
 import type { SocketOption as _envoy_config_core_v3_SocketOption, SocketOption__Output as _envoy_config_core_v3_SocketOption__Output } from '../../../../envoy/config/core/v3/SocketOption';
 import type { Duration as _google_protobuf_Duration, Duration__Output as _google_protobuf_Duration__Output } from '../../../../google/protobuf/Duration';
-import type { TrafficDirection as _envoy_config_core_v3_TrafficDirection } from '../../../../envoy/config/core/v3/TrafficDirection';
+import type { TrafficDirection as _envoy_config_core_v3_TrafficDirection, TrafficDirection__Output as _envoy_config_core_v3_TrafficDirection__Output } from '../../../../envoy/config/core/v3/TrafficDirection';
 import type { UdpListenerConfig as _envoy_config_listener_v3_UdpListenerConfig, UdpListenerConfig__Output as _envoy_config_listener_v3_UdpListenerConfig__Output } from '../../../../envoy/config/listener/v3/UdpListenerConfig';
 import type { ApiListener as _envoy_config_listener_v3_ApiListener, ApiListener__Output as _envoy_config_listener_v3_ApiListener__Output } from '../../../../envoy/config/listener/v3/ApiListener';
 import type { AccessLog as _envoy_config_accesslog_v3_AccessLog, AccessLog__Output as _envoy_config_accesslog_v3_AccessLog__Output } from '../../../../envoy/config/accesslog/v3/AccessLog';
@@ -82,19 +82,36 @@ export interface _envoy_config_listener_v3_Listener_DeprecatedV1__Output {
 
 // Original file: deps/envoy-api/envoy/config/listener/v3/listener.proto
 
-export enum _envoy_config_listener_v3_Listener_DrainType {
+export const _envoy_config_listener_v3_Listener_DrainType = {
   /**
    * Drain in response to calling /healthcheck/fail admin endpoint (along with the health check
    * filter), listener removal/modification, and hot restart.
    */
-  DEFAULT = 0,
+  DEFAULT: 'DEFAULT',
   /**
    * Drain in response to listener removal/modification and hot restart. This setting does not
    * include /healthcheck/fail. This setting may be desirable if Envoy is hosting both ingress
    * and egress listeners.
    */
-  MODIFY_ONLY = 1,
-}
+  MODIFY_ONLY: 'MODIFY_ONLY',
+} as const;
+
+export type _envoy_config_listener_v3_Listener_DrainType =
+  /**
+   * Drain in response to calling /healthcheck/fail admin endpoint (along with the health check
+   * filter), listener removal/modification, and hot restart.
+   */
+  | 'DEFAULT'
+  | 0
+  /**
+   * Drain in response to listener removal/modification and hot restart. This setting does not
+   * include /healthcheck/fail. This setting may be desirable if Envoy is hosting both ingress
+   * and egress listeners.
+   */
+  | 'MODIFY_ONLY'
+  | 1
+
+export type _envoy_config_listener_v3_Listener_DrainType__Output = typeof _envoy_config_listener_v3_Listener_DrainType[keyof typeof _envoy_config_listener_v3_Listener_DrainType]
 
 /**
  * A connection balancer implementation that does exact balancing. This means that a lock is
@@ -176,12 +193,13 @@ export interface Listener {
   'metadata'?: (_envoy_config_core_v3_Metadata | null);
   /**
    * [#not-implemented-hide:]
+   * @deprecated
    */
   'deprecated_v1'?: (_envoy_config_listener_v3_Listener_DeprecatedV1 | null);
   /**
    * The type of draining to perform at a listener-wide level.
    */
-  'drain_type'?: (_envoy_config_listener_v3_Listener_DrainType | keyof typeof _envoy_config_listener_v3_Listener_DrainType);
+  'drain_type'?: (_envoy_config_listener_v3_Listener_DrainType);
   /**
    * Listener filters have the opportunity to manipulate and augment the connection metadata that
    * is used in connection filter chain matching, for example. These filters are run before any in
@@ -261,7 +279,7 @@ export interface Listener {
    * This property is required on Windows for listeners using the original destination filter,
    * see :ref:`Original Destination <config_listener_filters_original_dst>`.
    */
-  'traffic_direction'?: (_envoy_config_core_v3_TrafficDirection | keyof typeof _envoy_config_core_v3_TrafficDirection);
+  'traffic_direction'?: (_envoy_config_core_v3_TrafficDirection);
   /**
    * Whether a connection should be created when listener filters timeout. Default is false.
    * 
@@ -312,6 +330,7 @@ export interface Listener {
   'connection_balance_config'?: (_envoy_config_listener_v3_Listener_ConnectionBalanceConfig | null);
   /**
    * Deprecated. Use ``enable_reuse_port`` instead.
+   * @deprecated
    */
   'reuse_port'?: (boolean);
   /**
@@ -482,12 +501,13 @@ export interface Listener__Output {
   'metadata': (_envoy_config_core_v3_Metadata__Output | null);
   /**
    * [#not-implemented-hide:]
+   * @deprecated
    */
   'deprecated_v1': (_envoy_config_listener_v3_Listener_DeprecatedV1__Output | null);
   /**
    * The type of draining to perform at a listener-wide level.
    */
-  'drain_type': (keyof typeof _envoy_config_listener_v3_Listener_DrainType);
+  'drain_type': (_envoy_config_listener_v3_Listener_DrainType__Output);
   /**
    * Listener filters have the opportunity to manipulate and augment the connection metadata that
    * is used in connection filter chain matching, for example. These filters are run before any in
@@ -567,7 +587,7 @@ export interface Listener__Output {
    * This property is required on Windows for listeners using the original destination filter,
    * see :ref:`Original Destination <config_listener_filters_original_dst>`.
    */
-  'traffic_direction': (keyof typeof _envoy_config_core_v3_TrafficDirection);
+  'traffic_direction': (_envoy_config_core_v3_TrafficDirection__Output);
   /**
    * Whether a connection should be created when listener filters timeout. Default is false.
    * 
@@ -618,6 +638,7 @@ export interface Listener__Output {
   'connection_balance_config': (_envoy_config_listener_v3_Listener_ConnectionBalanceConfig__Output | null);
   /**
    * Deprecated. Use ``enable_reuse_port`` instead.
+   * @deprecated
    */
   'reuse_port': (boolean);
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/DogStatsdSink.ts b/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/DogStatsdSink.ts
deleted file mode 100644
index 4cf705f10..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/DogStatsdSink.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/metrics/v3/stats.proto
-
-import type { Address as _envoy_config_core_v3_Address, Address__Output as _envoy_config_core_v3_Address__Output } from '../../../../envoy/config/core/v3/Address';
-import type { UInt64Value as _google_protobuf_UInt64Value, UInt64Value__Output as _google_protobuf_UInt64Value__Output } from '../../../../google/protobuf/UInt64Value';
-import type { Long } from '@grpc/proto-loader';
-
-/**
- * Stats configuration proto schema for built-in *envoy.stat_sinks.dog_statsd* sink.
- * The sink emits stats with `DogStatsD <https://docs.datadoghq.com/guides/dogstatsd/>`_
- * compatible tags. Tags are configurable via :ref:`StatsConfig
- * <envoy_v3_api_msg_config.metrics.v3.StatsConfig>`.
- * [#extension: envoy.stat_sinks.dog_statsd]
- */
-export interface DogStatsdSink {
-  /**
-   * The UDP address of a running DogStatsD compliant listener. If specified,
-   * statistics will be flushed to this address.
-   */
-  'address'?: (_envoy_config_core_v3_Address | null);
-  /**
-   * Optional custom metric name prefix. See :ref:`StatsdSink's prefix field
-   * <envoy_v3_api_field_config.metrics.v3.StatsdSink.prefix>` for more details.
-   */
-  'prefix'?: (string);
-  /**
-   * Optional max datagram size to use when sending UDP messages. By default Envoy
-   * will emit one metric per datagram. By specifying a max-size larger than a single
-   * metric, Envoy will emit multiple, new-line separated metrics. The max datagram
-   * size should not exceed your network's MTU.
-   * 
-   * Note that this value may not be respected if smaller than a single metric.
-   */
-  'max_bytes_per_datagram'?: (_google_protobuf_UInt64Value | null);
-  'dog_statsd_specifier'?: "address";
-}
-
-/**
- * Stats configuration proto schema for built-in *envoy.stat_sinks.dog_statsd* sink.
- * The sink emits stats with `DogStatsD <https://docs.datadoghq.com/guides/dogstatsd/>`_
- * compatible tags. Tags are configurable via :ref:`StatsConfig
- * <envoy_v3_api_msg_config.metrics.v3.StatsConfig>`.
- * [#extension: envoy.stat_sinks.dog_statsd]
- */
-export interface DogStatsdSink__Output {
-  /**
-   * The UDP address of a running DogStatsD compliant listener. If specified,
-   * statistics will be flushed to this address.
-   */
-  'address'?: (_envoy_config_core_v3_Address__Output | null);
-  /**
-   * Optional custom metric name prefix. See :ref:`StatsdSink's prefix field
-   * <envoy_v3_api_field_config.metrics.v3.StatsdSink.prefix>` for more details.
-   */
-  'prefix': (string);
-  /**
-   * Optional max datagram size to use when sending UDP messages. By default Envoy
-   * will emit one metric per datagram. By specifying a max-size larger than a single
-   * metric, Envoy will emit multiple, new-line separated metrics. The max datagram
-   * size should not exceed your network's MTU.
-   * 
-   * Note that this value may not be respected if smaller than a single metric.
-   */
-  'max_bytes_per_datagram': (_google_protobuf_UInt64Value__Output | null);
-  'dog_statsd_specifier': "address";
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/HistogramBucketSettings.ts b/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/HistogramBucketSettings.ts
deleted file mode 100644
index 036958a49..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/HistogramBucketSettings.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/metrics/v3/stats.proto
-
-import type { StringMatcher as _envoy_type_matcher_v3_StringMatcher, StringMatcher__Output as _envoy_type_matcher_v3_StringMatcher__Output } from '../../../../envoy/type/matcher/v3/StringMatcher';
-
-/**
- * Specifies a matcher for stats and the buckets that matching stats should use.
- */
-export interface HistogramBucketSettings {
-  /**
-   * The stats that this rule applies to. The match is applied to the original stat name
-   * before tag-extraction, for example `cluster.exampleclustername.upstream_cx_length_ms`.
-   */
-  'match'?: (_envoy_type_matcher_v3_StringMatcher | null);
-  /**
-   * Each value is the upper bound of a bucket. Each bucket must be greater than 0 and unique.
-   * The order of the buckets does not matter.
-   */
-  'buckets'?: (number | string)[];
-}
-
-/**
- * Specifies a matcher for stats and the buckets that matching stats should use.
- */
-export interface HistogramBucketSettings__Output {
-  /**
-   * The stats that this rule applies to. The match is applied to the original stat name
-   * before tag-extraction, for example `cluster.exampleclustername.upstream_cx_length_ms`.
-   */
-  'match': (_envoy_type_matcher_v3_StringMatcher__Output | null);
-  /**
-   * Each value is the upper bound of a bucket. Each bucket must be greater than 0 and unique.
-   * The order of the buckets does not matter.
-   */
-  'buckets': (number)[];
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/HystrixSink.ts b/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/HystrixSink.ts
deleted file mode 100644
index b8fb2ed8e..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/HystrixSink.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/metrics/v3/stats.proto
-
-import type { Long } from '@grpc/proto-loader';
-
-/**
- * Stats configuration proto schema for built-in *envoy.stat_sinks.hystrix* sink.
- * The sink emits stats in `text/event-stream
- * <https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events>`_
- * formatted stream for use by `Hystrix dashboard
- * <https://github.com/Netflix-Skunkworks/hystrix-dashboard/wiki>`_.
- * 
- * Note that only a single HystrixSink should be configured.
- * 
- * Streaming is started through an admin endpoint :http:get:`/hystrix_event_stream`.
- * [#extension: envoy.stat_sinks.hystrix]
- */
-export interface HystrixSink {
-  /**
-   * The number of buckets the rolling statistical window is divided into.
-   * 
-   * Each time the sink is flushed, all relevant Envoy statistics are sampled and
-   * added to the rolling window (removing the oldest samples in the window
-   * in the process). The sink then outputs the aggregate statistics across the
-   * current rolling window to the event stream(s).
-   * 
-   * rolling_window(ms) = stats_flush_interval(ms) * num_of_buckets
-   * 
-   * More detailed explanation can be found in `Hystrix wiki
-   * <https://github.com/Netflix/Hystrix/wiki/Metrics-and-Monitoring#hystrixrollingnumber>`_.
-   */
-  'num_buckets'?: (number | string | Long);
-}
-
-/**
- * Stats configuration proto schema for built-in *envoy.stat_sinks.hystrix* sink.
- * The sink emits stats in `text/event-stream
- * <https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events/Using_server-sent_events>`_
- * formatted stream for use by `Hystrix dashboard
- * <https://github.com/Netflix-Skunkworks/hystrix-dashboard/wiki>`_.
- * 
- * Note that only a single HystrixSink should be configured.
- * 
- * Streaming is started through an admin endpoint :http:get:`/hystrix_event_stream`.
- * [#extension: envoy.stat_sinks.hystrix]
- */
-export interface HystrixSink__Output {
-  /**
-   * The number of buckets the rolling statistical window is divided into.
-   * 
-   * Each time the sink is flushed, all relevant Envoy statistics are sampled and
-   * added to the rolling window (removing the oldest samples in the window
-   * in the process). The sink then outputs the aggregate statistics across the
-   * current rolling window to the event stream(s).
-   * 
-   * rolling_window(ms) = stats_flush_interval(ms) * num_of_buckets
-   * 
-   * More detailed explanation can be found in `Hystrix wiki
-   * <https://github.com/Netflix/Hystrix/wiki/Metrics-and-Monitoring#hystrixrollingnumber>`_.
-   */
-  'num_buckets': (string);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/StatsConfig.ts b/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/StatsConfig.ts
deleted file mode 100644
index df5d7c7e4..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/StatsConfig.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/metrics/v3/stats.proto
-
-import type { TagSpecifier as _envoy_config_metrics_v3_TagSpecifier, TagSpecifier__Output as _envoy_config_metrics_v3_TagSpecifier__Output } from '../../../../envoy/config/metrics/v3/TagSpecifier';
-import type { BoolValue as _google_protobuf_BoolValue, BoolValue__Output as _google_protobuf_BoolValue__Output } from '../../../../google/protobuf/BoolValue';
-import type { StatsMatcher as _envoy_config_metrics_v3_StatsMatcher, StatsMatcher__Output as _envoy_config_metrics_v3_StatsMatcher__Output } from '../../../../envoy/config/metrics/v3/StatsMatcher';
-import type { HistogramBucketSettings as _envoy_config_metrics_v3_HistogramBucketSettings, HistogramBucketSettings__Output as _envoy_config_metrics_v3_HistogramBucketSettings__Output } from '../../../../envoy/config/metrics/v3/HistogramBucketSettings';
-
-/**
- * Statistics configuration such as tagging.
- */
-export interface StatsConfig {
-  /**
-   * Each stat name is iteratively processed through these tag specifiers.
-   * When a tag is matched, the first capture group is removed from the name so
-   * later :ref:`TagSpecifiers <envoy_v3_api_msg_config.metrics.v3.TagSpecifier>` cannot match that
-   * same portion of the match.
-   */
-  'stats_tags'?: (_envoy_config_metrics_v3_TagSpecifier)[];
-  /**
-   * Use all default tag regexes specified in Envoy. These can be combined with
-   * custom tags specified in :ref:`stats_tags
-   * <envoy_v3_api_field_config.metrics.v3.StatsConfig.stats_tags>`. They will be processed before
-   * the custom tags.
-   * 
-   * .. note::
-   * 
-   * If any default tags are specified twice, the config will be considered
-   * invalid.
-   * 
-   * See :repo:`well_known_names.h <source/common/config/well_known_names.h>` for a list of the
-   * default tags in Envoy.
-   * 
-   * If not provided, the value is assumed to be true.
-   */
-  'use_all_default_tags'?: (_google_protobuf_BoolValue | null);
-  /**
-   * Inclusion/exclusion matcher for stat name creation. If not provided, all stats are instantiated
-   * as normal. Preventing the instantiation of certain families of stats can improve memory
-   * performance for Envoys running especially large configs.
-   * 
-   * .. warning::
-   * Excluding stats may affect Envoy's behavior in undocumented ways. See
-   * `issue #8771 <https://github.com/envoyproxy/envoy/issues/8771>`_ for more information.
-   * If any unexpected behavior changes are observed, please open a new issue immediately.
-   */
-  'stats_matcher'?: (_envoy_config_metrics_v3_StatsMatcher | null);
-  /**
-   * Defines rules for setting the histogram buckets. Rules are evaluated in order, and the first
-   * match is applied. If no match is found (or if no rules are set), the following default buckets
-   * are used:
-   * 
-   * .. code-block:: json
-   * 
-   * [
-   * 0.5,
-   * 1,
-   * 5,
-   * 10,
-   * 25,
-   * 50,
-   * 100,
-   * 250,
-   * 500,
-   * 1000,
-   * 2500,
-   * 5000,
-   * 10000,
-   * 30000,
-   * 60000,
-   * 300000,
-   * 600000,
-   * 1800000,
-   * 3600000
-   * ]
-   */
-  'histogram_bucket_settings'?: (_envoy_config_metrics_v3_HistogramBucketSettings)[];
-}
-
-/**
- * Statistics configuration such as tagging.
- */
-export interface StatsConfig__Output {
-  /**
-   * Each stat name is iteratively processed through these tag specifiers.
-   * When a tag is matched, the first capture group is removed from the name so
-   * later :ref:`TagSpecifiers <envoy_v3_api_msg_config.metrics.v3.TagSpecifier>` cannot match that
-   * same portion of the match.
-   */
-  'stats_tags': (_envoy_config_metrics_v3_TagSpecifier__Output)[];
-  /**
-   * Use all default tag regexes specified in Envoy. These can be combined with
-   * custom tags specified in :ref:`stats_tags
-   * <envoy_v3_api_field_config.metrics.v3.StatsConfig.stats_tags>`. They will be processed before
-   * the custom tags.
-   * 
-   * .. note::
-   * 
-   * If any default tags are specified twice, the config will be considered
-   * invalid.
-   * 
-   * See :repo:`well_known_names.h <source/common/config/well_known_names.h>` for a list of the
-   * default tags in Envoy.
-   * 
-   * If not provided, the value is assumed to be true.
-   */
-  'use_all_default_tags': (_google_protobuf_BoolValue__Output | null);
-  /**
-   * Inclusion/exclusion matcher for stat name creation. If not provided, all stats are instantiated
-   * as normal. Preventing the instantiation of certain families of stats can improve memory
-   * performance for Envoys running especially large configs.
-   * 
-   * .. warning::
-   * Excluding stats may affect Envoy's behavior in undocumented ways. See
-   * `issue #8771 <https://github.com/envoyproxy/envoy/issues/8771>`_ for more information.
-   * If any unexpected behavior changes are observed, please open a new issue immediately.
-   */
-  'stats_matcher': (_envoy_config_metrics_v3_StatsMatcher__Output | null);
-  /**
-   * Defines rules for setting the histogram buckets. Rules are evaluated in order, and the first
-   * match is applied. If no match is found (or if no rules are set), the following default buckets
-   * are used:
-   * 
-   * .. code-block:: json
-   * 
-   * [
-   * 0.5,
-   * 1,
-   * 5,
-   * 10,
-   * 25,
-   * 50,
-   * 100,
-   * 250,
-   * 500,
-   * 1000,
-   * 2500,
-   * 5000,
-   * 10000,
-   * 30000,
-   * 60000,
-   * 300000,
-   * 600000,
-   * 1800000,
-   * 3600000
-   * ]
-   */
-  'histogram_bucket_settings': (_envoy_config_metrics_v3_HistogramBucketSettings__Output)[];
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/StatsMatcher.ts b/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/StatsMatcher.ts
deleted file mode 100644
index 9df9e9529..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/StatsMatcher.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/metrics/v3/stats.proto
-
-import type { ListStringMatcher as _envoy_type_matcher_v3_ListStringMatcher, ListStringMatcher__Output as _envoy_type_matcher_v3_ListStringMatcher__Output } from '../../../../envoy/type/matcher/v3/ListStringMatcher';
-
-/**
- * Configuration for disabling stat instantiation.
- */
-export interface StatsMatcher {
-  /**
-   * If `reject_all` is true, then all stats are disabled. If `reject_all` is false, then all
-   * stats are enabled.
-   */
-  'reject_all'?: (boolean);
-  /**
-   * Exclusive match. All stats are enabled except for those matching one of the supplied
-   * StringMatcher protos.
-   */
-  'exclusion_list'?: (_envoy_type_matcher_v3_ListStringMatcher | null);
-  /**
-   * Inclusive match. No stats are enabled except for those matching one of the supplied
-   * StringMatcher protos.
-   */
-  'inclusion_list'?: (_envoy_type_matcher_v3_ListStringMatcher | null);
-  'stats_matcher'?: "reject_all"|"exclusion_list"|"inclusion_list";
-}
-
-/**
- * Configuration for disabling stat instantiation.
- */
-export interface StatsMatcher__Output {
-  /**
-   * If `reject_all` is true, then all stats are disabled. If `reject_all` is false, then all
-   * stats are enabled.
-   */
-  'reject_all'?: (boolean);
-  /**
-   * Exclusive match. All stats are enabled except for those matching one of the supplied
-   * StringMatcher protos.
-   */
-  'exclusion_list'?: (_envoy_type_matcher_v3_ListStringMatcher__Output | null);
-  /**
-   * Inclusive match. No stats are enabled except for those matching one of the supplied
-   * StringMatcher protos.
-   */
-  'inclusion_list'?: (_envoy_type_matcher_v3_ListStringMatcher__Output | null);
-  'stats_matcher': "reject_all"|"exclusion_list"|"inclusion_list";
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/StatsSink.ts b/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/StatsSink.ts
deleted file mode 100644
index 3eb8926fa..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/StatsSink.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/metrics/v3/stats.proto
-
-import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../../google/protobuf/Any';
-
-/**
- * Configuration for pluggable stats sinks.
- */
-export interface StatsSink {
-  /**
-   * The name of the stats sink to instantiate. The name must match a supported
-   * stats sink.
-   * See the :ref:`extensions listed in typed_config below <extension_category_envoy.stats_sinks>` for the default list of available stats sink.
-   * Sinks optionally support tagged/multiple dimensional metrics.
-   */
-  'name'?: (string);
-  'typed_config'?: (_google_protobuf_Any | null);
-  /**
-   * Stats sink specific configuration which depends on the sink being instantiated. See
-   * :ref:`StatsdSink <envoy_v3_api_msg_config.metrics.v3.StatsdSink>` for an example.
-   * [#extension-category: envoy.stats_sinks]
-   */
-  'config_type'?: "typed_config";
-}
-
-/**
- * Configuration for pluggable stats sinks.
- */
-export interface StatsSink__Output {
-  /**
-   * The name of the stats sink to instantiate. The name must match a supported
-   * stats sink.
-   * See the :ref:`extensions listed in typed_config below <extension_category_envoy.stats_sinks>` for the default list of available stats sink.
-   * Sinks optionally support tagged/multiple dimensional metrics.
-   */
-  'name': (string);
-  'typed_config'?: (_google_protobuf_Any__Output | null);
-  /**
-   * Stats sink specific configuration which depends on the sink being instantiated. See
-   * :ref:`StatsdSink <envoy_v3_api_msg_config.metrics.v3.StatsdSink>` for an example.
-   * [#extension-category: envoy.stats_sinks]
-   */
-  'config_type': "typed_config";
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/StatsdSink.ts b/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/StatsdSink.ts
deleted file mode 100644
index 69d978920..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/StatsdSink.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/metrics/v3/stats.proto
-
-import type { Address as _envoy_config_core_v3_Address, Address__Output as _envoy_config_core_v3_Address__Output } from '../../../../envoy/config/core/v3/Address';
-
-/**
- * Stats configuration proto schema for built-in *envoy.stat_sinks.statsd* sink. This sink does not support
- * tagged metrics.
- * [#extension: envoy.stat_sinks.statsd]
- */
-export interface StatsdSink {
-  /**
-   * The UDP address of a running `statsd <https://github.com/etsy/statsd>`_
-   * compliant listener. If specified, statistics will be flushed to this
-   * address.
-   */
-  'address'?: (_envoy_config_core_v3_Address | null);
-  /**
-   * The name of a cluster that is running a TCP `statsd
-   * <https://github.com/etsy/statsd>`_ compliant listener. If specified,
-   * Envoy will connect to this cluster to flush statistics.
-   */
-  'tcp_cluster_name'?: (string);
-  /**
-   * Optional custom prefix for StatsdSink. If
-   * specified, this will override the default prefix.
-   * For example:
-   * 
-   * .. code-block:: json
-   * 
-   * {
-   * "prefix" : "envoy-prod"
-   * }
-   * 
-   * will change emitted stats to
-   * 
-   * .. code-block:: cpp
-   * 
-   * envoy-prod.test_counter:1|c
-   * envoy-prod.test_timer:5|ms
-   * 
-   * Note that the default prefix, "envoy", will be used if a prefix is not
-   * specified.
-   * 
-   * Stats with default prefix:
-   * 
-   * .. code-block:: cpp
-   * 
-   * envoy.test_counter:1|c
-   * envoy.test_timer:5|ms
-   */
-  'prefix'?: (string);
-  'statsd_specifier'?: "address"|"tcp_cluster_name";
-}
-
-/**
- * Stats configuration proto schema for built-in *envoy.stat_sinks.statsd* sink. This sink does not support
- * tagged metrics.
- * [#extension: envoy.stat_sinks.statsd]
- */
-export interface StatsdSink__Output {
-  /**
-   * The UDP address of a running `statsd <https://github.com/etsy/statsd>`_
-   * compliant listener. If specified, statistics will be flushed to this
-   * address.
-   */
-  'address'?: (_envoy_config_core_v3_Address__Output | null);
-  /**
-   * The name of a cluster that is running a TCP `statsd
-   * <https://github.com/etsy/statsd>`_ compliant listener. If specified,
-   * Envoy will connect to this cluster to flush statistics.
-   */
-  'tcp_cluster_name'?: (string);
-  /**
-   * Optional custom prefix for StatsdSink. If
-   * specified, this will override the default prefix.
-   * For example:
-   * 
-   * .. code-block:: json
-   * 
-   * {
-   * "prefix" : "envoy-prod"
-   * }
-   * 
-   * will change emitted stats to
-   * 
-   * .. code-block:: cpp
-   * 
-   * envoy-prod.test_counter:1|c
-   * envoy-prod.test_timer:5|ms
-   * 
-   * Note that the default prefix, "envoy", will be used if a prefix is not
-   * specified.
-   * 
-   * Stats with default prefix:
-   * 
-   * .. code-block:: cpp
-   * 
-   * envoy.test_counter:1|c
-   * envoy.test_timer:5|ms
-   */
-  'prefix': (string);
-  'statsd_specifier': "address"|"tcp_cluster_name";
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/TagSpecifier.ts b/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/TagSpecifier.ts
deleted file mode 100644
index 9b0bb2467..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/metrics/v3/TagSpecifier.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/metrics/v3/stats.proto
-
-
-/**
- * Designates a tag name and value pair. The value may be either a fixed value
- * or a regex providing the value via capture groups. The specified tag will be
- * unconditionally set if a fixed value, otherwise it will only be set if one
- * or more capture groups in the regex match.
- */
-export interface TagSpecifier {
-  /**
-   * Attaches an identifier to the tag values to identify the tag being in the
-   * sink. Envoy has a set of default names and regexes to extract dynamic
-   * portions of existing stats, which can be found in :repo:`well_known_names.h
-   * <source/common/config/well_known_names.h>` in the Envoy repository. If a :ref:`tag_name
-   * <envoy_v3_api_field_config.metrics.v3.TagSpecifier.tag_name>` is provided in the config and
-   * neither :ref:`regex <envoy_v3_api_field_config.metrics.v3.TagSpecifier.regex>` or
-   * :ref:`fixed_value <envoy_v3_api_field_config.metrics.v3.TagSpecifier.fixed_value>` were specified,
-   * Envoy will attempt to find that name in its set of defaults and use the accompanying regex.
-   * 
-   * .. note::
-   * 
-   * It is invalid to specify the same tag name twice in a config.
-   */
-  'tag_name'?: (string);
-  /**
-   * Designates a tag to strip from the tag extracted name and provide as a named
-   * tag value for all statistics. This will only occur if any part of the name
-   * matches the regex provided with one or more capture groups.
-   * 
-   * The first capture group identifies the portion of the name to remove. The
-   * second capture group (which will normally be nested inside the first) will
-   * designate the value of the tag for the statistic. If no second capture
-   * group is provided, the first will also be used to set the value of the tag.
-   * All other capture groups will be ignored.
-   * 
-   * Example 1. a stat name ``cluster.foo_cluster.upstream_rq_timeout`` and
-   * one tag specifier:
-   * 
-   * .. code-block:: json
-   * 
-   * {
-   * "tag_name": "envoy.cluster_name",
-   * "regex": "^cluster\\.((.+?)\\.)"
-   * }
-   * 
-   * Note that the regex will remove ``foo_cluster.`` making the tag extracted
-   * name ``cluster.upstream_rq_timeout`` and the tag value for
-   * ``envoy.cluster_name`` will be ``foo_cluster`` (note: there will be no
-   * ``.`` character because of the second capture group).
-   * 
-   * Example 2. a stat name
-   * ``http.connection_manager_1.user_agent.ios.downstream_cx_total`` and two
-   * tag specifiers:
-   * 
-   * .. code-block:: json
-   * 
-   * [
-   * {
-   * "tag_name": "envoy.http_user_agent",
-   * "regex": "^http(?=\\.).*?\\.user_agent\\.((.+?)\\.)\\w+?$"
-   * },
-   * {
-   * "tag_name": "envoy.http_conn_manager_prefix",
-   * "regex": "^http\\.((.*?)\\.)"
-   * }
-   * ]
-   * 
-   * The two regexes of the specifiers will be processed in the definition order.
-   * 
-   * The first regex will remove ``ios.``, leaving the tag extracted name
-   * ``http.connection_manager_1.user_agent.downstream_cx_total``. The tag
-   * ``envoy.http_user_agent`` will be added with tag value ``ios``.
-   * 
-   * The second regex will remove ``connection_manager_1.`` from the tag
-   * extracted name produced by the first regex
-   * ``http.connection_manager_1.user_agent.downstream_cx_total``, leaving
-   * ``http.user_agent.downstream_cx_total`` as the tag extracted name. The tag
-   * ``envoy.http_conn_manager_prefix`` will be added with the tag value
-   * ``connection_manager_1``.
-   */
-  'regex'?: (string);
-  /**
-   * Specifies a fixed tag value for the ``tag_name``.
-   */
-  'fixed_value'?: (string);
-  'tag_value'?: "regex"|"fixed_value";
-}
-
-/**
- * Designates a tag name and value pair. The value may be either a fixed value
- * or a regex providing the value via capture groups. The specified tag will be
- * unconditionally set if a fixed value, otherwise it will only be set if one
- * or more capture groups in the regex match.
- */
-export interface TagSpecifier__Output {
-  /**
-   * Attaches an identifier to the tag values to identify the tag being in the
-   * sink. Envoy has a set of default names and regexes to extract dynamic
-   * portions of existing stats, which can be found in :repo:`well_known_names.h
-   * <source/common/config/well_known_names.h>` in the Envoy repository. If a :ref:`tag_name
-   * <envoy_v3_api_field_config.metrics.v3.TagSpecifier.tag_name>` is provided in the config and
-   * neither :ref:`regex <envoy_v3_api_field_config.metrics.v3.TagSpecifier.regex>` or
-   * :ref:`fixed_value <envoy_v3_api_field_config.metrics.v3.TagSpecifier.fixed_value>` were specified,
-   * Envoy will attempt to find that name in its set of defaults and use the accompanying regex.
-   * 
-   * .. note::
-   * 
-   * It is invalid to specify the same tag name twice in a config.
-   */
-  'tag_name': (string);
-  /**
-   * Designates a tag to strip from the tag extracted name and provide as a named
-   * tag value for all statistics. This will only occur if any part of the name
-   * matches the regex provided with one or more capture groups.
-   * 
-   * The first capture group identifies the portion of the name to remove. The
-   * second capture group (which will normally be nested inside the first) will
-   * designate the value of the tag for the statistic. If no second capture
-   * group is provided, the first will also be used to set the value of the tag.
-   * All other capture groups will be ignored.
-   * 
-   * Example 1. a stat name ``cluster.foo_cluster.upstream_rq_timeout`` and
-   * one tag specifier:
-   * 
-   * .. code-block:: json
-   * 
-   * {
-   * "tag_name": "envoy.cluster_name",
-   * "regex": "^cluster\\.((.+?)\\.)"
-   * }
-   * 
-   * Note that the regex will remove ``foo_cluster.`` making the tag extracted
-   * name ``cluster.upstream_rq_timeout`` and the tag value for
-   * ``envoy.cluster_name`` will be ``foo_cluster`` (note: there will be no
-   * ``.`` character because of the second capture group).
-   * 
-   * Example 2. a stat name
-   * ``http.connection_manager_1.user_agent.ios.downstream_cx_total`` and two
-   * tag specifiers:
-   * 
-   * .. code-block:: json
-   * 
-   * [
-   * {
-   * "tag_name": "envoy.http_user_agent",
-   * "regex": "^http(?=\\.).*?\\.user_agent\\.((.+?)\\.)\\w+?$"
-   * },
-   * {
-   * "tag_name": "envoy.http_conn_manager_prefix",
-   * "regex": "^http\\.((.*?)\\.)"
-   * }
-   * ]
-   * 
-   * The two regexes of the specifiers will be processed in the definition order.
-   * 
-   * The first regex will remove ``ios.``, leaving the tag extracted name
-   * ``http.connection_manager_1.user_agent.downstream_cx_total``. The tag
-   * ``envoy.http_user_agent`` will be added with tag value ``ios``.
-   * 
-   * The second regex will remove ``connection_manager_1.`` from the tag
-   * extracted name produced by the first regex
-   * ``http.connection_manager_1.user_agent.downstream_cx_total``, leaving
-   * ``http.user_agent.downstream_cx_total`` as the tag extracted name. The tag
-   * ``envoy.http_conn_manager_prefix`` will be added with the tag value
-   * ``connection_manager_1``.
-   */
-  'regex'?: (string);
-  /**
-   * Specifies a fixed tag value for the ``tag_name``.
-   */
-  'fixed_value'?: (string);
-  'tag_value': "regex"|"fixed_value";
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/BufferFactoryConfig.ts b/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/BufferFactoryConfig.ts
deleted file mode 100644
index b3fbe1459..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/BufferFactoryConfig.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/overload/v3/overload.proto
-
-
-/**
- * Configuration for which accounts the WatermarkBuffer Factories should
- * track.
- */
-export interface BufferFactoryConfig {
-  /**
-   * The minimum power of two at which Envoy starts tracking an account.
-   * 
-   * Envoy has 8 power of two buckets starting with the provided exponent below.
-   * Concretely the 1st bucket contains accounts for streams that use
-   * [2^minimum_account_to_track_power_of_two,
-   * 2^(minimum_account_to_track_power_of_two + 1)) bytes.
-   * With the 8th bucket tracking accounts
-   * >= 128 * 2^minimum_account_to_track_power_of_two.
-   * 
-   * The maximum value is 56, since we're using uint64_t for bytes counting,
-   * and that's the last value that would use the 8 buckets. In practice,
-   * we don't expect the proxy to be holding 2^56 bytes.
-   * 
-   * If omitted, Envoy should not do any tracking.
-   */
-  'minimum_account_to_track_power_of_two'?: (number);
-}
-
-/**
- * Configuration for which accounts the WatermarkBuffer Factories should
- * track.
- */
-export interface BufferFactoryConfig__Output {
-  /**
-   * The minimum power of two at which Envoy starts tracking an account.
-   * 
-   * Envoy has 8 power of two buckets starting with the provided exponent below.
-   * Concretely the 1st bucket contains accounts for streams that use
-   * [2^minimum_account_to_track_power_of_two,
-   * 2^(minimum_account_to_track_power_of_two + 1)) bytes.
-   * With the 8th bucket tracking accounts
-   * >= 128 * 2^minimum_account_to_track_power_of_two.
-   * 
-   * The maximum value is 56, since we're using uint64_t for bytes counting,
-   * and that's the last value that would use the 8 buckets. In practice,
-   * we don't expect the proxy to be holding 2^56 bytes.
-   * 
-   * If omitted, Envoy should not do any tracking.
-   */
-  'minimum_account_to_track_power_of_two': (number);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/OverloadAction.ts b/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/OverloadAction.ts
deleted file mode 100644
index 84f4db34b..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/OverloadAction.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/overload/v3/overload.proto
-
-import type { Trigger as _envoy_config_overload_v3_Trigger, Trigger__Output as _envoy_config_overload_v3_Trigger__Output } from '../../../../envoy/config/overload/v3/Trigger';
-import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../../google/protobuf/Any';
-
-export interface OverloadAction {
-  /**
-   * The name of the overload action. This is just a well-known string that listeners can
-   * use for registering callbacks. Custom overload actions should be named using reverse
-   * DNS to ensure uniqueness.
-   */
-  'name'?: (string);
-  /**
-   * A set of triggers for this action. The state of the action is the maximum
-   * state of all triggers, which can be scaling between 0 and 1 or saturated. Listeners
-   * are notified when the overload action changes state.
-   */
-  'triggers'?: (_envoy_config_overload_v3_Trigger)[];
-  /**
-   * Configuration for the action being instantiated.
-   */
-  'typed_config'?: (_google_protobuf_Any | null);
-}
-
-export interface OverloadAction__Output {
-  /**
-   * The name of the overload action. This is just a well-known string that listeners can
-   * use for registering callbacks. Custom overload actions should be named using reverse
-   * DNS to ensure uniqueness.
-   */
-  'name': (string);
-  /**
-   * A set of triggers for this action. The state of the action is the maximum
-   * state of all triggers, which can be scaling between 0 and 1 or saturated. Listeners
-   * are notified when the overload action changes state.
-   */
-  'triggers': (_envoy_config_overload_v3_Trigger__Output)[];
-  /**
-   * Configuration for the action being instantiated.
-   */
-  'typed_config': (_google_protobuf_Any__Output | null);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/OverloadManager.ts b/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/OverloadManager.ts
deleted file mode 100644
index e7f75b8e9..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/OverloadManager.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/overload/v3/overload.proto
-
-import type { Duration as _google_protobuf_Duration, Duration__Output as _google_protobuf_Duration__Output } from '../../../../google/protobuf/Duration';
-import type { ResourceMonitor as _envoy_config_overload_v3_ResourceMonitor, ResourceMonitor__Output as _envoy_config_overload_v3_ResourceMonitor__Output } from '../../../../envoy/config/overload/v3/ResourceMonitor';
-import type { OverloadAction as _envoy_config_overload_v3_OverloadAction, OverloadAction__Output as _envoy_config_overload_v3_OverloadAction__Output } from '../../../../envoy/config/overload/v3/OverloadAction';
-import type { BufferFactoryConfig as _envoy_config_overload_v3_BufferFactoryConfig, BufferFactoryConfig__Output as _envoy_config_overload_v3_BufferFactoryConfig__Output } from '../../../../envoy/config/overload/v3/BufferFactoryConfig';
-
-export interface OverloadManager {
-  /**
-   * The interval for refreshing resource usage.
-   */
-  'refresh_interval'?: (_google_protobuf_Duration | null);
-  /**
-   * The set of resources to monitor.
-   */
-  'resource_monitors'?: (_envoy_config_overload_v3_ResourceMonitor)[];
-  /**
-   * The set of overload actions.
-   */
-  'actions'?: (_envoy_config_overload_v3_OverloadAction)[];
-  /**
-   * Configuration for buffer factory.
-   */
-  'buffer_factory_config'?: (_envoy_config_overload_v3_BufferFactoryConfig | null);
-}
-
-export interface OverloadManager__Output {
-  /**
-   * The interval for refreshing resource usage.
-   */
-  'refresh_interval': (_google_protobuf_Duration__Output | null);
-  /**
-   * The set of resources to monitor.
-   */
-  'resource_monitors': (_envoy_config_overload_v3_ResourceMonitor__Output)[];
-  /**
-   * The set of overload actions.
-   */
-  'actions': (_envoy_config_overload_v3_OverloadAction__Output)[];
-  /**
-   * Configuration for buffer factory.
-   */
-  'buffer_factory_config': (_envoy_config_overload_v3_BufferFactoryConfig__Output | null);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/ResourceMonitor.ts b/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/ResourceMonitor.ts
deleted file mode 100644
index 02fde2411..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/ResourceMonitor.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/overload/v3/overload.proto
-
-import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../../google/protobuf/Any';
-
-export interface ResourceMonitor {
-  /**
-   * The name of the resource monitor to instantiate. Must match a registered
-   * resource monitor type.
-   * See the :ref:`extensions listed in typed_config below <extension_category_envoy.resource_monitors>` for the default list of available resource monitor.
-   */
-  'name'?: (string);
-  'typed_config'?: (_google_protobuf_Any | null);
-  /**
-   * Configuration for the resource monitor being instantiated.
-   * [#extension-category: envoy.resource_monitors]
-   */
-  'config_type'?: "typed_config";
-}
-
-export interface ResourceMonitor__Output {
-  /**
-   * The name of the resource monitor to instantiate. Must match a registered
-   * resource monitor type.
-   * See the :ref:`extensions listed in typed_config below <extension_category_envoy.resource_monitors>` for the default list of available resource monitor.
-   */
-  'name': (string);
-  'typed_config'?: (_google_protobuf_Any__Output | null);
-  /**
-   * Configuration for the resource monitor being instantiated.
-   * [#extension-category: envoy.resource_monitors]
-   */
-  'config_type': "typed_config";
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/ScaleTimersOverloadActionConfig.ts b/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/ScaleTimersOverloadActionConfig.ts
deleted file mode 100644
index bb48fe3f6..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/ScaleTimersOverloadActionConfig.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/overload/v3/overload.proto
-
-import type { Duration as _google_protobuf_Duration, Duration__Output as _google_protobuf_Duration__Output } from '../../../../google/protobuf/Duration';
-import type { Percent as _envoy_type_v3_Percent, Percent__Output as _envoy_type_v3_Percent__Output } from '../../../../envoy/type/v3/Percent';
-
-export interface _envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer {
-  /**
-   * The type of timer this minimum applies to.
-   */
-  'timer'?: (_envoy_config_overload_v3_ScaleTimersOverloadActionConfig_TimerType | keyof typeof _envoy_config_overload_v3_ScaleTimersOverloadActionConfig_TimerType);
-  /**
-   * Sets the minimum duration as an absolute value.
-   */
-  'min_timeout'?: (_google_protobuf_Duration | null);
-  /**
-   * Sets the minimum duration as a percentage of the maximum value.
-   */
-  'min_scale'?: (_envoy_type_v3_Percent | null);
-  'overload_adjust'?: "min_timeout"|"min_scale";
-}
-
-export interface _envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__Output {
-  /**
-   * The type of timer this minimum applies to.
-   */
-  'timer': (keyof typeof _envoy_config_overload_v3_ScaleTimersOverloadActionConfig_TimerType);
-  /**
-   * Sets the minimum duration as an absolute value.
-   */
-  'min_timeout'?: (_google_protobuf_Duration__Output | null);
-  /**
-   * Sets the minimum duration as a percentage of the maximum value.
-   */
-  'min_scale'?: (_envoy_type_v3_Percent__Output | null);
-  'overload_adjust': "min_timeout"|"min_scale";
-}
-
-// Original file: deps/envoy-api/envoy/config/overload/v3/overload.proto
-
-export enum _envoy_config_overload_v3_ScaleTimersOverloadActionConfig_TimerType {
-  /**
-   * Unsupported value; users must explicitly specify the timer they want scaled.
-   */
-  UNSPECIFIED = 0,
-  /**
-   * Adjusts the idle timer for downstream HTTP connections that takes effect when there are no active streams.
-   * This affects the value of :ref:`HttpConnectionManager.common_http_protocol_options.idle_timeout
-   * <envoy_v3_api_field_config.core.v3.HttpProtocolOptions.idle_timeout>`
-   */
-  HTTP_DOWNSTREAM_CONNECTION_IDLE = 1,
-  /**
-   * Adjusts the idle timer for HTTP streams initiated by downstream clients.
-   * This affects the value of :ref:`RouteAction.idle_timeout <envoy_v3_api_field_config.route.v3.RouteAction.idle_timeout>` and
-   * :ref:`HttpConnectionManager.stream_idle_timeout
-   * <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.stream_idle_timeout>`
-   */
-  HTTP_DOWNSTREAM_STREAM_IDLE = 2,
-  /**
-   * Adjusts the timer for how long downstream clients have to finish transport-level negotiations
-   * before the connection is closed.
-   * This affects the value of
-   * :ref:`FilterChain.transport_socket_connect_timeout <envoy_v3_api_field_config.listener.v3.FilterChain.transport_socket_connect_timeout>`.
-   */
-  TRANSPORT_SOCKET_CONNECT = 3,
-}
-
-/**
- * Typed configuration for the "envoy.overload_actions.reduce_timeouts" action. See
- * :ref:`the docs <config_overload_manager_reducing_timeouts>` for an example of how to configure
- * the action with different timeouts and minimum values.
- */
-export interface ScaleTimersOverloadActionConfig {
-  /**
-   * A set of timer scaling rules to be applied.
-   */
-  'timer_scale_factors'?: (_envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer)[];
-}
-
-/**
- * Typed configuration for the "envoy.overload_actions.reduce_timeouts" action. See
- * :ref:`the docs <config_overload_manager_reducing_timeouts>` for an example of how to configure
- * the action with different timeouts and minimum values.
- */
-export interface ScaleTimersOverloadActionConfig__Output {
-  /**
-   * A set of timer scaling rules to be applied.
-   */
-  'timer_scale_factors': (_envoy_config_overload_v3_ScaleTimersOverloadActionConfig_ScaleTimer__Output)[];
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/ScaledTrigger.ts b/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/ScaledTrigger.ts
deleted file mode 100644
index 8c6574f56..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/ScaledTrigger.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/overload/v3/overload.proto
-
-
-export interface ScaledTrigger {
-  /**
-   * If the resource pressure is greater than this value, the trigger will be in the
-   * :ref:`scaling <arch_overview_overload_manager-triggers-state>` state with value
-   * `(pressure - scaling_threshold) / (saturation_threshold - scaling_threshold)`.
-   */
-  'scaling_threshold'?: (number | string);
-  /**
-   * If the resource pressure is greater than this value, the trigger will enter saturation.
-   */
-  'saturation_threshold'?: (number | string);
-}
-
-export interface ScaledTrigger__Output {
-  /**
-   * If the resource pressure is greater than this value, the trigger will be in the
-   * :ref:`scaling <arch_overview_overload_manager-triggers-state>` state with value
-   * `(pressure - scaling_threshold) / (saturation_threshold - scaling_threshold)`.
-   */
-  'scaling_threshold': (number);
-  /**
-   * If the resource pressure is greater than this value, the trigger will enter saturation.
-   */
-  'saturation_threshold': (number);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/ThresholdTrigger.ts b/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/ThresholdTrigger.ts
deleted file mode 100644
index b02ddd47d..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/ThresholdTrigger.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/overload/v3/overload.proto
-
-
-export interface ThresholdTrigger {
-  /**
-   * If the resource pressure is greater than or equal to this value, the trigger
-   * will enter saturation.
-   */
-  'value'?: (number | string);
-}
-
-export interface ThresholdTrigger__Output {
-  /**
-   * If the resource pressure is greater than or equal to this value, the trigger
-   * will enter saturation.
-   */
-  'value': (number);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/Trigger.ts b/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/Trigger.ts
deleted file mode 100644
index 38f360ee7..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/config/overload/v3/Trigger.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-// Original file: deps/envoy-api/envoy/config/overload/v3/overload.proto
-
-import type { ThresholdTrigger as _envoy_config_overload_v3_ThresholdTrigger, ThresholdTrigger__Output as _envoy_config_overload_v3_ThresholdTrigger__Output } from '../../../../envoy/config/overload/v3/ThresholdTrigger';
-import type { ScaledTrigger as _envoy_config_overload_v3_ScaledTrigger, ScaledTrigger__Output as _envoy_config_overload_v3_ScaledTrigger__Output } from '../../../../envoy/config/overload/v3/ScaledTrigger';
-
-export interface Trigger {
-  /**
-   * The name of the resource this is a trigger for.
-   */
-  'name'?: (string);
-  'threshold'?: (_envoy_config_overload_v3_ThresholdTrigger | null);
-  'scaled'?: (_envoy_config_overload_v3_ScaledTrigger | null);
-  'trigger_oneof'?: "threshold"|"scaled";
-}
-
-export interface Trigger__Output {
-  /**
-   * The name of the resource this is a trigger for.
-   */
-  'name': (string);
-  'threshold'?: (_envoy_config_overload_v3_ThresholdTrigger__Output | null);
-  'scaled'?: (_envoy_config_overload_v3_ScaledTrigger__Output | null);
-  'trigger_oneof': "threshold"|"scaled";
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/route/v3/HeaderMatcher.ts b/packages/grpc-js-xds/src/generated/envoy/config/route/v3/HeaderMatcher.ts
index e073a8f13..b5b085ae7 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/route/v3/HeaderMatcher.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/route/v3/HeaderMatcher.ts
@@ -3,7 +3,6 @@
 import type { Int64Range as _envoy_type_v3_Int64Range, Int64Range__Output as _envoy_type_v3_Int64Range__Output } from '../../../../envoy/type/v3/Int64Range';
 import type { RegexMatcher as _envoy_type_matcher_v3_RegexMatcher, RegexMatcher__Output as _envoy_type_matcher_v3_RegexMatcher__Output } from '../../../../envoy/type/matcher/v3/RegexMatcher';
 import type { StringMatcher as _envoy_type_matcher_v3_StringMatcher, StringMatcher__Output as _envoy_type_matcher_v3_StringMatcher__Output } from '../../../../envoy/type/matcher/v3/StringMatcher';
-import type { Long } from '@grpc/proto-loader';
 
 /**
  * .. attention::
@@ -42,6 +41,7 @@ export interface HeaderMatcher {
   /**
    * If specified, header match will be performed based on the value of the header.
    * This field is deprecated. Please use :ref:`string_match <envoy_v3_api_field_config.route.v3.HeaderMatcher.string_match>`.
+   * @deprecated
    */
   'exact_match'?: (string);
   /**
@@ -80,6 +80,7 @@ export interface HeaderMatcher {
    * Examples:
    * 
    * * The prefix ``abcd`` matches the value ``abcdxyz``, but not for ``abcxyz``.
+   * @deprecated
    */
   'prefix_match'?: (string);
   /**
@@ -90,6 +91,7 @@ export interface HeaderMatcher {
    * Examples:
    * 
    * * The suffix ``abcd`` matches the value ``xyzabcd``, but not for ``xyzbcd``.
+   * @deprecated
    */
   'suffix_match'?: (string);
   /**
@@ -97,6 +99,7 @@ export interface HeaderMatcher {
    * header value must match the regex. The rule will not match if only a subsequence of the
    * request header value matches the regex.
    * This field is deprecated. Please use :ref:`string_match <envoy_v3_api_field_config.route.v3.HeaderMatcher.string_match>`.
+   * @deprecated
    */
   'safe_regex_match'?: (_envoy_type_matcher_v3_RegexMatcher | null);
   /**
@@ -108,6 +111,7 @@ export interface HeaderMatcher {
    * Examples:
    * 
    * * The value ``abcd`` matches the value ``xyzabcdpqr``, but not for ``xyzbcdpqr``.
+   * @deprecated
    */
   'contains_match'?: (string);
   /**
@@ -186,6 +190,7 @@ export interface HeaderMatcher__Output {
   /**
    * If specified, header match will be performed based on the value of the header.
    * This field is deprecated. Please use :ref:`string_match <envoy_v3_api_field_config.route.v3.HeaderMatcher.string_match>`.
+   * @deprecated
    */
   'exact_match'?: (string);
   /**
@@ -224,6 +229,7 @@ export interface HeaderMatcher__Output {
    * Examples:
    * 
    * * The prefix ``abcd`` matches the value ``abcdxyz``, but not for ``abcxyz``.
+   * @deprecated
    */
   'prefix_match'?: (string);
   /**
@@ -234,6 +240,7 @@ export interface HeaderMatcher__Output {
    * Examples:
    * 
    * * The suffix ``abcd`` matches the value ``xyzabcd``, but not for ``xyzbcd``.
+   * @deprecated
    */
   'suffix_match'?: (string);
   /**
@@ -241,6 +248,7 @@ export interface HeaderMatcher__Output {
    * header value must match the regex. The rule will not match if only a subsequence of the
    * request header value matches the regex.
    * This field is deprecated. Please use :ref:`string_match <envoy_v3_api_field_config.route.v3.HeaderMatcher.string_match>`.
+   * @deprecated
    */
   'safe_regex_match'?: (_envoy_type_matcher_v3_RegexMatcher__Output | null);
   /**
@@ -252,6 +260,7 @@ export interface HeaderMatcher__Output {
    * Examples:
    * 
    * * The value ``abcd`` matches the value ``xyzabcdpqr``, but not for ``xyzbcdpqr``.
+   * @deprecated
    */
   'contains_match'?: (string);
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RateLimit.ts b/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RateLimit.ts
index cd47e471a..28d17667f 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RateLimit.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RateLimit.ts
@@ -40,6 +40,7 @@ export interface _envoy_config_route_v3_RateLimit_Action {
    * 
    * .. attention::
    * This field has been deprecated in favor of the :ref:`metadata <envoy_v3_api_field_config.route.v3.RateLimit.Action.metadata>` field
+   * @deprecated
    */
   'dynamic_metadata'?: (_envoy_config_route_v3_RateLimit_Action_DynamicMetaData | null);
   /**
@@ -101,6 +102,7 @@ export interface _envoy_config_route_v3_RateLimit_Action__Output {
    * 
    * .. attention::
    * This field has been deprecated in favor of the :ref:`metadata <envoy_v3_api_field_config.route.v3.RateLimit.Action.metadata>` field
+   * @deprecated
    */
   'dynamic_metadata'?: (_envoy_config_route_v3_RateLimit_Action_DynamicMetaData__Output | null);
   /**
@@ -438,7 +440,7 @@ export interface _envoy_config_route_v3_RateLimit_Action_MetaData {
   /**
    * Source of metadata
    */
-  'source'?: (_envoy_config_route_v3_RateLimit_Action_MetaData_Source | keyof typeof _envoy_config_route_v3_RateLimit_Action_MetaData_Source);
+  'source'?: (_envoy_config_route_v3_RateLimit_Action_MetaData_Source);
   /**
    * If set to true, Envoy skips the descriptor while calling rate limiting service
    * when ``metadata_key`` is empty and ``default_value`` is not set. By default it skips calling the
@@ -474,7 +476,7 @@ export interface _envoy_config_route_v3_RateLimit_Action_MetaData__Output {
   /**
    * Source of metadata
    */
-  'source': (keyof typeof _envoy_config_route_v3_RateLimit_Action_MetaData_Source);
+  'source': (_envoy_config_route_v3_RateLimit_Action_MetaData_Source__Output);
   /**
    * If set to true, Envoy skips the descriptor while calling rate limiting service
    * when ``metadata_key`` is empty and ``default_value`` is not set. By default it skips calling the
@@ -643,16 +645,30 @@ export interface _envoy_config_route_v3_RateLimit_Action_RequestHeaders__Output
 
 // Original file: deps/envoy-api/envoy/config/route/v3/route_components.proto
 
-export enum _envoy_config_route_v3_RateLimit_Action_MetaData_Source {
+export const _envoy_config_route_v3_RateLimit_Action_MetaData_Source = {
   /**
    * Query :ref:`dynamic metadata <well_known_dynamic_metadata>`
    */
-  DYNAMIC = 0,
+  DYNAMIC: 'DYNAMIC',
   /**
    * Query :ref:`route entry metadata <envoy_v3_api_field_config.route.v3.Route.metadata>`
    */
-  ROUTE_ENTRY = 1,
-}
+  ROUTE_ENTRY: 'ROUTE_ENTRY',
+} as const;
+
+export type _envoy_config_route_v3_RateLimit_Action_MetaData_Source =
+  /**
+   * Query :ref:`dynamic metadata <well_known_dynamic_metadata>`
+   */
+  | 'DYNAMIC'
+  | 0
+  /**
+   * Query :ref:`route entry metadata <envoy_v3_api_field_config.route.v3.Route.metadata>`
+   */
+  | 'ROUTE_ENTRY'
+  | 1
+
+export type _envoy_config_route_v3_RateLimit_Action_MetaData_Source__Output = typeof _envoy_config_route_v3_RateLimit_Action_MetaData_Source[keyof typeof _envoy_config_route_v3_RateLimit_Action_MetaData_Source]
 
 /**
  * The following descriptor entry is appended to the descriptor:
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RedirectAction.ts b/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RedirectAction.ts
index fd11a681b..070470af3 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RedirectAction.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RedirectAction.ts
@@ -4,28 +4,57 @@ import type { RegexMatchAndSubstitute as _envoy_type_matcher_v3_RegexMatchAndSub
 
 // Original file: deps/envoy-api/envoy/config/route/v3/route_components.proto
 
-export enum _envoy_config_route_v3_RedirectAction_RedirectResponseCode {
+export const _envoy_config_route_v3_RedirectAction_RedirectResponseCode = {
   /**
    * Moved Permanently HTTP Status Code - 301.
    */
-  MOVED_PERMANENTLY = 0,
+  MOVED_PERMANENTLY: 'MOVED_PERMANENTLY',
   /**
    * Found HTTP Status Code - 302.
    */
-  FOUND = 1,
+  FOUND: 'FOUND',
   /**
    * See Other HTTP Status Code - 303.
    */
-  SEE_OTHER = 2,
+  SEE_OTHER: 'SEE_OTHER',
   /**
    * Temporary Redirect HTTP Status Code - 307.
    */
-  TEMPORARY_REDIRECT = 3,
+  TEMPORARY_REDIRECT: 'TEMPORARY_REDIRECT',
   /**
    * Permanent Redirect HTTP Status Code - 308.
    */
-  PERMANENT_REDIRECT = 4,
-}
+  PERMANENT_REDIRECT: 'PERMANENT_REDIRECT',
+} as const;
+
+export type _envoy_config_route_v3_RedirectAction_RedirectResponseCode =
+  /**
+   * Moved Permanently HTTP Status Code - 301.
+   */
+  | 'MOVED_PERMANENTLY'
+  | 0
+  /**
+   * Found HTTP Status Code - 302.
+   */
+  | 'FOUND'
+  | 1
+  /**
+   * See Other HTTP Status Code - 303.
+   */
+  | 'SEE_OTHER'
+  | 2
+  /**
+   * Temporary Redirect HTTP Status Code - 307.
+   */
+  | 'TEMPORARY_REDIRECT'
+  | 3
+  /**
+   * Permanent Redirect HTTP Status Code - 308.
+   */
+  | 'PERMANENT_REDIRECT'
+  | 4
+
+export type _envoy_config_route_v3_RedirectAction_RedirectResponseCode__Output = typeof _envoy_config_route_v3_RedirectAction_RedirectResponseCode[keyof typeof _envoy_config_route_v3_RedirectAction_RedirectResponseCode]
 
 /**
  * [#next-free-field: 10]
@@ -58,7 +87,7 @@ export interface RedirectAction {
    * The HTTP status code to use in the redirect response. The default response
    * code is MOVED_PERMANENTLY (301).
    */
-  'response_code'?: (_envoy_config_route_v3_RedirectAction_RedirectResponseCode | keyof typeof _envoy_config_route_v3_RedirectAction_RedirectResponseCode);
+  'response_code'?: (_envoy_config_route_v3_RedirectAction_RedirectResponseCode);
   /**
    * The scheme portion of the URL will be swapped with "https".
    */
@@ -155,7 +184,7 @@ export interface RedirectAction__Output {
    * The HTTP status code to use in the redirect response. The default response
    * code is MOVED_PERMANENTLY (301).
    */
-  'response_code': (keyof typeof _envoy_config_route_v3_RedirectAction_RedirectResponseCode);
+  'response_code': (_envoy_config_route_v3_RedirectAction_RedirectResponseCode__Output);
   /**
    * The scheme portion of the URL will be swapped with "https".
    */
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RetryPolicy.ts b/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RetryPolicy.ts
index d60458728..773943b7f 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RetryPolicy.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RetryPolicy.ts
@@ -141,7 +141,7 @@ export interface _envoy_config_route_v3_RetryPolicy_ResetHeader {
   /**
    * The format of the reset header.
    */
-  'format'?: (_envoy_config_route_v3_RetryPolicy_ResetHeaderFormat | keyof typeof _envoy_config_route_v3_RetryPolicy_ResetHeaderFormat);
+  'format'?: (_envoy_config_route_v3_RetryPolicy_ResetHeaderFormat);
 }
 
 export interface _envoy_config_route_v3_RetryPolicy_ResetHeader__Output {
@@ -156,15 +156,23 @@ export interface _envoy_config_route_v3_RetryPolicy_ResetHeader__Output {
   /**
    * The format of the reset header.
    */
-  'format': (keyof typeof _envoy_config_route_v3_RetryPolicy_ResetHeaderFormat);
+  'format': (_envoy_config_route_v3_RetryPolicy_ResetHeaderFormat__Output);
 }
 
 // Original file: deps/envoy-api/envoy/config/route/v3/route_components.proto
 
-export enum _envoy_config_route_v3_RetryPolicy_ResetHeaderFormat {
-  SECONDS = 0,
-  UNIX_TIMESTAMP = 1,
-}
+export const _envoy_config_route_v3_RetryPolicy_ResetHeaderFormat = {
+  SECONDS: 'SECONDS',
+  UNIX_TIMESTAMP: 'UNIX_TIMESTAMP',
+} as const;
+
+export type _envoy_config_route_v3_RetryPolicy_ResetHeaderFormat =
+  | 'SECONDS'
+  | 0
+  | 'UNIX_TIMESTAMP'
+  | 1
+
+export type _envoy_config_route_v3_RetryPolicy_ResetHeaderFormat__Output = typeof _envoy_config_route_v3_RetryPolicy_ResetHeaderFormat[keyof typeof _envoy_config_route_v3_RetryPolicy_ResetHeaderFormat]
 
 export interface _envoy_config_route_v3_RetryPolicy_RetryBackOff {
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RouteAction.ts b/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RouteAction.ts
index 808d4ba51..96910696d 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RouteAction.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/route/v3/RouteAction.ts
@@ -5,7 +5,7 @@ import type { Metadata as _envoy_config_core_v3_Metadata, Metadata__Output as _e
 import type { BoolValue as _google_protobuf_BoolValue, BoolValue__Output as _google_protobuf_BoolValue__Output } from '../../../../google/protobuf/BoolValue';
 import type { Duration as _google_protobuf_Duration, Duration__Output as _google_protobuf_Duration__Output } from '../../../../google/protobuf/Duration';
 import type { RetryPolicy as _envoy_config_route_v3_RetryPolicy, RetryPolicy__Output as _envoy_config_route_v3_RetryPolicy__Output } from '../../../../envoy/config/route/v3/RetryPolicy';
-import type { RoutingPriority as _envoy_config_core_v3_RoutingPriority } from '../../../../envoy/config/core/v3/RoutingPriority';
+import type { RoutingPriority as _envoy_config_core_v3_RoutingPriority, RoutingPriority__Output as _envoy_config_core_v3_RoutingPriority__Output } from '../../../../envoy/config/core/v3/RoutingPriority';
 import type { RateLimit as _envoy_config_route_v3_RateLimit, RateLimit__Output as _envoy_config_route_v3_RateLimit__Output } from '../../../../envoy/config/route/v3/RateLimit';
 import type { CorsPolicy as _envoy_config_route_v3_CorsPolicy, CorsPolicy__Output as _envoy_config_route_v3_CorsPolicy__Output } from '../../../../envoy/config/route/v3/CorsPolicy';
 import type { HedgePolicy as _envoy_config_route_v3_HedgePolicy, HedgePolicy__Output as _envoy_config_route_v3_HedgePolicy__Output } from '../../../../envoy/config/route/v3/HedgePolicy';
@@ -20,20 +20,39 @@ import type { ProxyProtocolConfig as _envoy_config_core_v3_ProxyProtocolConfig,
 
 // Original file: deps/envoy-api/envoy/config/route/v3/route_components.proto
 
-export enum _envoy_config_route_v3_RouteAction_ClusterNotFoundResponseCode {
+export const _envoy_config_route_v3_RouteAction_ClusterNotFoundResponseCode = {
   /**
    * HTTP status code - 503 Service Unavailable.
    */
-  SERVICE_UNAVAILABLE = 0,
+  SERVICE_UNAVAILABLE: 'SERVICE_UNAVAILABLE',
   /**
    * HTTP status code - 404 Not Found.
    */
-  NOT_FOUND = 1,
+  NOT_FOUND: 'NOT_FOUND',
   /**
    * HTTP status code - 500 Internal Server Error.
    */
-  INTERNAL_SERVER_ERROR = 2,
-}
+  INTERNAL_SERVER_ERROR: 'INTERNAL_SERVER_ERROR',
+} as const;
+
+export type _envoy_config_route_v3_RouteAction_ClusterNotFoundResponseCode =
+  /**
+   * HTTP status code - 503 Service Unavailable.
+   */
+  | 'SERVICE_UNAVAILABLE'
+  | 0
+  /**
+   * HTTP status code - 404 Not Found.
+   */
+  | 'NOT_FOUND'
+  | 1
+  /**
+   * HTTP status code - 500 Internal Server Error.
+   */
+  | 'INTERNAL_SERVER_ERROR'
+  | 2
+
+export type _envoy_config_route_v3_RouteAction_ClusterNotFoundResponseCode__Output = typeof _envoy_config_route_v3_RouteAction_ClusterNotFoundResponseCode[keyof typeof _envoy_config_route_v3_RouteAction_ClusterNotFoundResponseCode]
 
 /**
  * Configuration for sending data upstream as a raw data payload. This is used for
@@ -338,11 +357,30 @@ export interface _envoy_config_route_v3_RouteAction_HashPolicy_Header__Output {
 /**
  * Configures :ref:`internal redirect <arch_overview_internal_redirects>` behavior.
  * [#next-major-version: remove this definition - it's defined in the InternalRedirectPolicy message.]
+ * @deprecated
  */
-export enum _envoy_config_route_v3_RouteAction_InternalRedirectAction {
-  PASS_THROUGH_INTERNAL_REDIRECT = 0,
-  HANDLE_INTERNAL_REDIRECT = 1,
-}
+export const _envoy_config_route_v3_RouteAction_InternalRedirectAction = {
+  PASS_THROUGH_INTERNAL_REDIRECT: 'PASS_THROUGH_INTERNAL_REDIRECT',
+  HANDLE_INTERNAL_REDIRECT: 'HANDLE_INTERNAL_REDIRECT',
+} as const;
+
+/**
+ * Configures :ref:`internal redirect <arch_overview_internal_redirects>` behavior.
+ * [#next-major-version: remove this definition - it's defined in the InternalRedirectPolicy message.]
+ * @deprecated
+ */
+export type _envoy_config_route_v3_RouteAction_InternalRedirectAction =
+  | 'PASS_THROUGH_INTERNAL_REDIRECT'
+  | 0
+  | 'HANDLE_INTERNAL_REDIRECT'
+  | 1
+
+/**
+ * Configures :ref:`internal redirect <arch_overview_internal_redirects>` behavior.
+ * [#next-major-version: remove this definition - it's defined in the InternalRedirectPolicy message.]
+ * @deprecated
+ */
+export type _envoy_config_route_v3_RouteAction_InternalRedirectAction__Output = typeof _envoy_config_route_v3_RouteAction_InternalRedirectAction[keyof typeof _envoy_config_route_v3_RouteAction_InternalRedirectAction]
 
 export interface _envoy_config_route_v3_RouteAction_MaxStreamDuration {
   /**
@@ -719,7 +757,7 @@ export interface RouteAction {
   /**
    * Optionally specifies the :ref:`routing priority <arch_overview_http_routing_priority>`.
    */
-  'priority'?: (_envoy_config_core_v3_RoutingPriority | keyof typeof _envoy_config_core_v3_RoutingPriority);
+  'priority'?: (_envoy_config_core_v3_RoutingPriority);
   /**
    * Specifies a set of rate limit configurations that could be applied to the
    * route.
@@ -732,6 +770,7 @@ export interface RouteAction {
    * request.
    * 
    * This field is deprecated. Please use :ref:`vh_rate_limits <envoy_v3_api_field_extensions.filters.http.ratelimit.v3.RateLimitPerRoute.vh_rate_limits>`
+   * @deprecated
    */
   'include_vh_rate_limits'?: (_google_protobuf_BoolValue | null);
   /**
@@ -760,13 +799,14 @@ export interface RouteAction {
    * :ref:`Route.typed_per_filter_config<envoy_v3_api_field_config.route.v3.Route.typed_per_filter_config>` or
    * :ref:`WeightedCluster.ClusterWeight.typed_per_filter_config<envoy_v3_api_field_config.route.v3.WeightedCluster.ClusterWeight.typed_per_filter_config>`
    * to configure the CORS HTTP filter.
+   * @deprecated
    */
   'cors'?: (_envoy_config_route_v3_CorsPolicy | null);
   /**
    * The HTTP status code to use when configured cluster is not found.
    * The default response code is 503 Service Unavailable.
    */
-  'cluster_not_found_response_code'?: (_envoy_config_route_v3_RouteAction_ClusterNotFoundResponseCode | keyof typeof _envoy_config_route_v3_RouteAction_ClusterNotFoundResponseCode);
+  'cluster_not_found_response_code'?: (_envoy_config_route_v3_RouteAction_ClusterNotFoundResponseCode);
   /**
    * Deprecated by :ref:`grpc_timeout_header_max <envoy_v3_api_field_config.route.v3.RouteAction.MaxStreamDuration.grpc_timeout_header_max>`
    * If present, and the request is a gRPC request, use the
@@ -788,6 +828,7 @@ export interface RouteAction {
    * :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`,
    * :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the
    * :ref:`retry overview <arch_overview_http_routing_retry>`.
+   * @deprecated
    */
   'max_grpc_timeout'?: (_google_protobuf_Duration | null);
   /**
@@ -816,7 +857,10 @@ export interface RouteAction {
    */
   'idle_timeout'?: (_google_protobuf_Duration | null);
   'upgrade_configs'?: (_envoy_config_route_v3_RouteAction_UpgradeConfig)[];
-  'internal_redirect_action'?: (_envoy_config_route_v3_RouteAction_InternalRedirectAction | keyof typeof _envoy_config_route_v3_RouteAction_InternalRedirectAction);
+  /**
+   * @deprecated
+   */
+  'internal_redirect_action'?: (_envoy_config_route_v3_RouteAction_InternalRedirectAction);
   /**
    * Indicates that the route has a hedge policy. Note that if this is set,
    * it'll take precedence over the virtual host level hedge policy entirely
@@ -832,6 +876,7 @@ export interface RouteAction {
    * The offset will only be applied if the provided grpc_timeout is greater than the offset. This
    * ensures that the offset will only ever decrease the timeout and never set it to 0 (meaning
    * infinity).
+   * @deprecated
    */
   'grpc_timeout_offset'?: (_google_protobuf_Duration | null);
   /**
@@ -873,6 +918,7 @@ export interface RouteAction {
    * will pass the redirect back to downstream.
    * 
    * If not specified, at most one redirect will be followed.
+   * @deprecated
    */
   'max_internal_redirects'?: (_google_protobuf_UInt32Value | null);
   /**
@@ -1105,7 +1151,7 @@ export interface RouteAction__Output {
   /**
    * Optionally specifies the :ref:`routing priority <arch_overview_http_routing_priority>`.
    */
-  'priority': (keyof typeof _envoy_config_core_v3_RoutingPriority);
+  'priority': (_envoy_config_core_v3_RoutingPriority__Output);
   /**
    * Specifies a set of rate limit configurations that could be applied to the
    * route.
@@ -1118,6 +1164,7 @@ export interface RouteAction__Output {
    * request.
    * 
    * This field is deprecated. Please use :ref:`vh_rate_limits <envoy_v3_api_field_extensions.filters.http.ratelimit.v3.RateLimitPerRoute.vh_rate_limits>`
+   * @deprecated
    */
   'include_vh_rate_limits': (_google_protobuf_BoolValue__Output | null);
   /**
@@ -1146,13 +1193,14 @@ export interface RouteAction__Output {
    * :ref:`Route.typed_per_filter_config<envoy_v3_api_field_config.route.v3.Route.typed_per_filter_config>` or
    * :ref:`WeightedCluster.ClusterWeight.typed_per_filter_config<envoy_v3_api_field_config.route.v3.WeightedCluster.ClusterWeight.typed_per_filter_config>`
    * to configure the CORS HTTP filter.
+   * @deprecated
    */
   'cors': (_envoy_config_route_v3_CorsPolicy__Output | null);
   /**
    * The HTTP status code to use when configured cluster is not found.
    * The default response code is 503 Service Unavailable.
    */
-  'cluster_not_found_response_code': (keyof typeof _envoy_config_route_v3_RouteAction_ClusterNotFoundResponseCode);
+  'cluster_not_found_response_code': (_envoy_config_route_v3_RouteAction_ClusterNotFoundResponseCode__Output);
   /**
    * Deprecated by :ref:`grpc_timeout_header_max <envoy_v3_api_field_config.route.v3.RouteAction.MaxStreamDuration.grpc_timeout_header_max>`
    * If present, and the request is a gRPC request, use the
@@ -1174,6 +1222,7 @@ export interface RouteAction__Output {
    * :ref:`config_http_filters_router_x-envoy-upstream-rq-timeout-ms`,
    * :ref:`config_http_filters_router_x-envoy-upstream-rq-per-try-timeout-ms`, and the
    * :ref:`retry overview <arch_overview_http_routing_retry>`.
+   * @deprecated
    */
   'max_grpc_timeout': (_google_protobuf_Duration__Output | null);
   /**
@@ -1202,7 +1251,10 @@ export interface RouteAction__Output {
    */
   'idle_timeout': (_google_protobuf_Duration__Output | null);
   'upgrade_configs': (_envoy_config_route_v3_RouteAction_UpgradeConfig__Output)[];
-  'internal_redirect_action': (keyof typeof _envoy_config_route_v3_RouteAction_InternalRedirectAction);
+  /**
+   * @deprecated
+   */
+  'internal_redirect_action': (_envoy_config_route_v3_RouteAction_InternalRedirectAction__Output);
   /**
    * Indicates that the route has a hedge policy. Note that if this is set,
    * it'll take precedence over the virtual host level hedge policy entirely
@@ -1218,6 +1270,7 @@ export interface RouteAction__Output {
    * The offset will only be applied if the provided grpc_timeout is greater than the offset. This
    * ensures that the offset will only ever decrease the timeout and never set it to 0 (meaning
    * infinity).
+   * @deprecated
    */
   'grpc_timeout_offset': (_google_protobuf_Duration__Output | null);
   /**
@@ -1259,6 +1312,7 @@ export interface RouteAction__Output {
    * will pass the redirect back to downstream.
    * 
    * If not specified, at most one redirect will be followed.
+   * @deprecated
    */
   'max_internal_redirects': (_google_protobuf_UInt32Value__Output | null);
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/route/v3/VirtualHost.ts b/packages/grpc-js-xds/src/generated/envoy/config/route/v3/VirtualHost.ts
index 532176ea2..6176e05e8 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/route/v3/VirtualHost.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/route/v3/VirtualHost.ts
@@ -15,22 +15,43 @@ import type { Metadata as _envoy_config_core_v3_Metadata, Metadata__Output as _e
 
 // Original file: deps/envoy-api/envoy/config/route/v3/route_components.proto
 
-export enum _envoy_config_route_v3_VirtualHost_TlsRequirementType {
+export const _envoy_config_route_v3_VirtualHost_TlsRequirementType = {
   /**
    * No TLS requirement for the virtual host.
    */
-  NONE = 0,
+  NONE: 'NONE',
   /**
    * External requests must use TLS. If a request is external and it is not
    * using TLS, a 301 redirect will be sent telling the client to use HTTPS.
    */
-  EXTERNAL_ONLY = 1,
+  EXTERNAL_ONLY: 'EXTERNAL_ONLY',
   /**
    * All requests must use TLS. If a request is not using TLS, a 301 redirect
    * will be sent telling the client to use HTTPS.
    */
-  ALL = 2,
-}
+  ALL: 'ALL',
+} as const;
+
+export type _envoy_config_route_v3_VirtualHost_TlsRequirementType =
+  /**
+   * No TLS requirement for the virtual host.
+   */
+  | 'NONE'
+  | 0
+  /**
+   * External requests must use TLS. If a request is external and it is not
+   * using TLS, a 301 redirect will be sent telling the client to use HTTPS.
+   */
+  | 'EXTERNAL_ONLY'
+  | 1
+  /**
+   * All requests must use TLS. If a request is not using TLS, a 301 redirect
+   * will be sent telling the client to use HTTPS.
+   */
+  | 'ALL'
+  | 2
+
+export type _envoy_config_route_v3_VirtualHost_TlsRequirementType__Output = typeof _envoy_config_route_v3_VirtualHost_TlsRequirementType[keyof typeof _envoy_config_route_v3_VirtualHost_TlsRequirementType]
 
 /**
  * The top level element in the routing configuration is a virtual host. Each virtual host has
@@ -77,7 +98,7 @@ export interface VirtualHost {
    * Specifies the type of TLS enforcement the virtual host expects. If this option is not
    * specified, there is no TLS requirement for the virtual host.
    */
-  'require_tls'?: (_envoy_config_route_v3_VirtualHost_TlsRequirementType | keyof typeof _envoy_config_route_v3_VirtualHost_TlsRequirementType);
+  'require_tls'?: (_envoy_config_route_v3_VirtualHost_TlsRequirementType);
   /**
    * A list of virtual clusters defined for this virtual host. Virtual clusters
    * are used for additional statistics gathering.
@@ -107,6 +128,7 @@ export interface VirtualHost {
    * This option has been deprecated. Please use
    * :ref:`VirtualHost.typed_per_filter_config<envoy_v3_api_field_config.route.v3.VirtualHost.typed_per_filter_config>`
    * to configure the CORS HTTP filter.
+   * @deprecated
    */
   'cors'?: (_envoy_config_route_v3_CorsPolicy | null);
   /**
@@ -261,7 +283,7 @@ export interface VirtualHost__Output {
    * Specifies the type of TLS enforcement the virtual host expects. If this option is not
    * specified, there is no TLS requirement for the virtual host.
    */
-  'require_tls': (keyof typeof _envoy_config_route_v3_VirtualHost_TlsRequirementType);
+  'require_tls': (_envoy_config_route_v3_VirtualHost_TlsRequirementType__Output);
   /**
    * A list of virtual clusters defined for this virtual host. Virtual clusters
    * are used for additional statistics gathering.
@@ -291,6 +313,7 @@ export interface VirtualHost__Output {
    * This option has been deprecated. Please use
    * :ref:`VirtualHost.typed_per_filter_config<envoy_v3_api_field_config.route.v3.VirtualHost.typed_per_filter_config>`
    * to configure the CORS HTTP filter.
+   * @deprecated
    */
   'cors': (_envoy_config_route_v3_CorsPolicy__Output | null);
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/config/route/v3/WeightedCluster.ts b/packages/grpc-js-xds/src/generated/envoy/config/route/v3/WeightedCluster.ts
index 3a03d1ce8..c13310e9d 100644
--- a/packages/grpc-js-xds/src/generated/envoy/config/route/v3/WeightedCluster.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/config/route/v3/WeightedCluster.ts
@@ -222,6 +222,7 @@ export interface WeightedCluster {
    * value, if this is greater than 0.
    * This field is now deprecated, and the client will use the sum of all
    * cluster weights. It is up to the management server to supply the correct weights.
+   * @deprecated
    */
   'total_weight'?: (_google_protobuf_UInt32Value | null);
   /**
@@ -264,6 +265,7 @@ export interface WeightedCluster__Output {
    * value, if this is greater than 0.
    * This field is now deprecated, and the client will use the sum of all
    * cluster weights. It is up to the management server to supply the correct weights.
+   * @deprecated
    */
   'total_weight': (_google_protobuf_UInt32Value__Output | null);
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/AccessLogCommon.ts b/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/AccessLogCommon.ts
index 7679dfac1..7ca3c5b19 100644
--- a/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/AccessLogCommon.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/AccessLogCommon.ts
@@ -7,7 +7,7 @@ import type { Duration as _google_protobuf_Duration, Duration__Output as _google
 import type { ResponseFlags as _envoy_data_accesslog_v3_ResponseFlags, ResponseFlags__Output as _envoy_data_accesslog_v3_ResponseFlags__Output } from '../../../../envoy/data/accesslog/v3/ResponseFlags';
 import type { Metadata as _envoy_config_core_v3_Metadata, Metadata__Output as _envoy_config_core_v3_Metadata__Output } from '../../../../envoy/config/core/v3/Metadata';
 import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../../google/protobuf/Any';
-import type { AccessLogType as _envoy_data_accesslog_v3_AccessLogType } from '../../../../envoy/data/accesslog/v3/AccessLogType';
+import type { AccessLogType as _envoy_data_accesslog_v3_AccessLogType, AccessLogType__Output as _envoy_data_accesslog_v3_AccessLogType__Output } from '../../../../envoy/data/accesslog/v3/AccessLogType';
 import type { Long } from '@grpc/proto-loader';
 
 /**
@@ -176,6 +176,7 @@ export interface AccessLogCommon {
    * 
    * This field is deprecated in favor of ``access_log_type`` for better indication of the
    * type of the access log record.
+   * @deprecated
    */
   'intermediate_log_entry'?: (boolean);
   /**
@@ -212,7 +213,7 @@ export interface AccessLogCommon {
    * For more information about how access log behaves and when it is being recorded,
    * please refer to :ref:`access logging <arch_overview_access_logs>`.
    */
-  'access_log_type'?: (_envoy_data_accesslog_v3_AccessLogType | keyof typeof _envoy_data_accesslog_v3_AccessLogType);
+  'access_log_type'?: (_envoy_data_accesslog_v3_AccessLogType);
 }
 
 /**
@@ -381,6 +382,7 @@ export interface AccessLogCommon__Output {
    * 
    * This field is deprecated in favor of ``access_log_type`` for better indication of the
    * type of the access log record.
+   * @deprecated
    */
   'intermediate_log_entry': (boolean);
   /**
@@ -417,5 +419,5 @@ export interface AccessLogCommon__Output {
    * For more information about how access log behaves and when it is being recorded,
    * please refer to :ref:`access logging <arch_overview_access_logs>`.
    */
-  'access_log_type': (keyof typeof _envoy_data_accesslog_v3_AccessLogType);
+  'access_log_type': (_envoy_data_accesslog_v3_AccessLogType__Output);
 }
diff --git a/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/AccessLogType.ts b/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/AccessLogType.ts
index d0da614e8..983ba35ef 100644
--- a/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/AccessLogType.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/AccessLogType.ts
@@ -1,18 +1,50 @@
 // Original file: deps/envoy-api/envoy/data/accesslog/v3/accesslog.proto
 
-export enum AccessLogType {
-  NotSet = 0,
-  TcpUpstreamConnected = 1,
-  TcpPeriodic = 2,
-  TcpConnectionEnd = 3,
-  DownstreamStart = 4,
-  DownstreamPeriodic = 5,
-  DownstreamEnd = 6,
-  UpstreamPoolReady = 7,
-  UpstreamPeriodic = 8,
-  UpstreamEnd = 9,
-  DownstreamTunnelSuccessfullyEstablished = 10,
-  UdpTunnelUpstreamConnected = 11,
-  UdpPeriodic = 12,
-  UdpSessionEnd = 13,
-}
+export const AccessLogType = {
+  NotSet: 'NotSet',
+  TcpUpstreamConnected: 'TcpUpstreamConnected',
+  TcpPeriodic: 'TcpPeriodic',
+  TcpConnectionEnd: 'TcpConnectionEnd',
+  DownstreamStart: 'DownstreamStart',
+  DownstreamPeriodic: 'DownstreamPeriodic',
+  DownstreamEnd: 'DownstreamEnd',
+  UpstreamPoolReady: 'UpstreamPoolReady',
+  UpstreamPeriodic: 'UpstreamPeriodic',
+  UpstreamEnd: 'UpstreamEnd',
+  DownstreamTunnelSuccessfullyEstablished: 'DownstreamTunnelSuccessfullyEstablished',
+  UdpTunnelUpstreamConnected: 'UdpTunnelUpstreamConnected',
+  UdpPeriodic: 'UdpPeriodic',
+  UdpSessionEnd: 'UdpSessionEnd',
+} as const;
+
+export type AccessLogType =
+  | 'NotSet'
+  | 0
+  | 'TcpUpstreamConnected'
+  | 1
+  | 'TcpPeriodic'
+  | 2
+  | 'TcpConnectionEnd'
+  | 3
+  | 'DownstreamStart'
+  | 4
+  | 'DownstreamPeriodic'
+  | 5
+  | 'DownstreamEnd'
+  | 6
+  | 'UpstreamPoolReady'
+  | 7
+  | 'UpstreamPeriodic'
+  | 8
+  | 'UpstreamEnd'
+  | 9
+  | 'DownstreamTunnelSuccessfullyEstablished'
+  | 10
+  | 'UdpTunnelUpstreamConnected'
+  | 11
+  | 'UdpPeriodic'
+  | 12
+  | 'UdpSessionEnd'
+  | 13
+
+export type AccessLogType__Output = typeof AccessLogType[keyof typeof AccessLogType]
diff --git a/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/HTTPAccessLogEntry.ts b/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/HTTPAccessLogEntry.ts
index 760954bb1..31daac364 100644
--- a/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/HTTPAccessLogEntry.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/HTTPAccessLogEntry.ts
@@ -9,20 +9,40 @@ import type { HTTPResponseProperties as _envoy_data_accesslog_v3_HTTPResponsePro
 /**
  * HTTP version
  */
-export enum _envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTPVersion {
-  PROTOCOL_UNSPECIFIED = 0,
-  HTTP10 = 1,
-  HTTP11 = 2,
-  HTTP2 = 3,
-  HTTP3 = 4,
-}
+export const _envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTPVersion = {
+  PROTOCOL_UNSPECIFIED: 'PROTOCOL_UNSPECIFIED',
+  HTTP10: 'HTTP10',
+  HTTP11: 'HTTP11',
+  HTTP2: 'HTTP2',
+  HTTP3: 'HTTP3',
+} as const;
+
+/**
+ * HTTP version
+ */
+export type _envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTPVersion =
+  | 'PROTOCOL_UNSPECIFIED'
+  | 0
+  | 'HTTP10'
+  | 1
+  | 'HTTP11'
+  | 2
+  | 'HTTP2'
+  | 3
+  | 'HTTP3'
+  | 4
+
+/**
+ * HTTP version
+ */
+export type _envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTPVersion__Output = typeof _envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTPVersion[keyof typeof _envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTPVersion]
 
 export interface HTTPAccessLogEntry {
   /**
    * Common properties shared by all Envoy access logs.
    */
   'common_properties'?: (_envoy_data_accesslog_v3_AccessLogCommon | null);
-  'protocol_version'?: (_envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTPVersion | keyof typeof _envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTPVersion);
+  'protocol_version'?: (_envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTPVersion);
   /**
    * Description of the incoming HTTP request.
    */
@@ -38,7 +58,7 @@ export interface HTTPAccessLogEntry__Output {
    * Common properties shared by all Envoy access logs.
    */
   'common_properties': (_envoy_data_accesslog_v3_AccessLogCommon__Output | null);
-  'protocol_version': (keyof typeof _envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTPVersion);
+  'protocol_version': (_envoy_data_accesslog_v3_HTTPAccessLogEntry_HTTPVersion__Output);
   /**
    * Description of the incoming HTTP request.
    */
diff --git a/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/HTTPRequestProperties.ts b/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/HTTPRequestProperties.ts
index 9e145503c..f1271ba16 100644
--- a/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/HTTPRequestProperties.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/HTTPRequestProperties.ts
@@ -1,6 +1,6 @@
 // Original file: deps/envoy-api/envoy/data/accesslog/v3/accesslog.proto
 
-import type { RequestMethod as _envoy_config_core_v3_RequestMethod } from '../../../../envoy/config/core/v3/RequestMethod';
+import type { RequestMethod as _envoy_config_core_v3_RequestMethod, RequestMethod__Output as _envoy_config_core_v3_RequestMethod__Output } from '../../../../envoy/config/core/v3/RequestMethod';
 import type { UInt32Value as _google_protobuf_UInt32Value, UInt32Value__Output as _google_protobuf_UInt32Value__Output } from '../../../../google/protobuf/UInt32Value';
 import type { Long } from '@grpc/proto-loader';
 
@@ -11,7 +11,7 @@ export interface HTTPRequestProperties {
   /**
    * The request method (RFC 7231/2616).
    */
-  'request_method'?: (_envoy_config_core_v3_RequestMethod | keyof typeof _envoy_config_core_v3_RequestMethod);
+  'request_method'?: (_envoy_config_core_v3_RequestMethod);
   /**
    * The scheme portion of the incoming request URI.
    */
@@ -90,7 +90,7 @@ export interface HTTPRequestProperties__Output {
   /**
    * The request method (RFC 7231/2616).
    */
-  'request_method': (keyof typeof _envoy_config_core_v3_RequestMethod);
+  'request_method': (_envoy_config_core_v3_RequestMethod__Output);
   /**
    * The scheme portion of the incoming request URI.
    */
diff --git a/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/ResponseFlags.ts b/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/ResponseFlags.ts
index ec45824b3..f42e11ee3 100644
--- a/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/ResponseFlags.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/ResponseFlags.ts
@@ -6,20 +6,37 @@
 /**
  * Reasons why the request was unauthorized
  */
-export enum _envoy_data_accesslog_v3_ResponseFlags_Unauthorized_Reason {
-  REASON_UNSPECIFIED = 0,
+export const _envoy_data_accesslog_v3_ResponseFlags_Unauthorized_Reason = {
+  REASON_UNSPECIFIED: 'REASON_UNSPECIFIED',
   /**
    * The request was denied by the external authorization service.
    */
-  EXTERNAL_SERVICE = 1,
-}
+  EXTERNAL_SERVICE: 'EXTERNAL_SERVICE',
+} as const;
+
+/**
+ * Reasons why the request was unauthorized
+ */
+export type _envoy_data_accesslog_v3_ResponseFlags_Unauthorized_Reason =
+  | 'REASON_UNSPECIFIED'
+  | 0
+  /**
+   * The request was denied by the external authorization service.
+   */
+  | 'EXTERNAL_SERVICE'
+  | 1
+
+/**
+ * Reasons why the request was unauthorized
+ */
+export type _envoy_data_accesslog_v3_ResponseFlags_Unauthorized_Reason__Output = typeof _envoy_data_accesslog_v3_ResponseFlags_Unauthorized_Reason[keyof typeof _envoy_data_accesslog_v3_ResponseFlags_Unauthorized_Reason]
 
 export interface _envoy_data_accesslog_v3_ResponseFlags_Unauthorized {
-  'reason'?: (_envoy_data_accesslog_v3_ResponseFlags_Unauthorized_Reason | keyof typeof _envoy_data_accesslog_v3_ResponseFlags_Unauthorized_Reason);
+  'reason'?: (_envoy_data_accesslog_v3_ResponseFlags_Unauthorized_Reason);
 }
 
 export interface _envoy_data_accesslog_v3_ResponseFlags_Unauthorized__Output {
-  'reason': (keyof typeof _envoy_data_accesslog_v3_ResponseFlags_Unauthorized_Reason);
+  'reason': (_envoy_data_accesslog_v3_ResponseFlags_Unauthorized_Reason__Output);
 }
 
 /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/TLSProperties.ts b/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/TLSProperties.ts
index fb5ea3629..f66341c7a 100644
--- a/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/TLSProperties.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/data/accesslog/v3/TLSProperties.ts
@@ -52,13 +52,27 @@ export interface _envoy_data_accesslog_v3_TLSProperties_CertificateProperties_Su
 
 // Original file: deps/envoy-api/envoy/data/accesslog/v3/accesslog.proto
 
-export enum _envoy_data_accesslog_v3_TLSProperties_TLSVersion {
-  VERSION_UNSPECIFIED = 0,
-  TLSv1 = 1,
-  TLSv1_1 = 2,
-  TLSv1_2 = 3,
-  TLSv1_3 = 4,
-}
+export const _envoy_data_accesslog_v3_TLSProperties_TLSVersion = {
+  VERSION_UNSPECIFIED: 'VERSION_UNSPECIFIED',
+  TLSv1: 'TLSv1',
+  TLSv1_1: 'TLSv1_1',
+  TLSv1_2: 'TLSv1_2',
+  TLSv1_3: 'TLSv1_3',
+} as const;
+
+export type _envoy_data_accesslog_v3_TLSProperties_TLSVersion =
+  | 'VERSION_UNSPECIFIED'
+  | 0
+  | 'TLSv1'
+  | 1
+  | 'TLSv1_1'
+  | 2
+  | 'TLSv1_2'
+  | 3
+  | 'TLSv1_3'
+  | 4
+
+export type _envoy_data_accesslog_v3_TLSProperties_TLSVersion__Output = typeof _envoy_data_accesslog_v3_TLSProperties_TLSVersion[keyof typeof _envoy_data_accesslog_v3_TLSProperties_TLSVersion]
 
 /**
  * Properties of a negotiated TLS connection.
@@ -68,7 +82,7 @@ export interface TLSProperties {
   /**
    * Version of TLS that was negotiated.
    */
-  'tls_version'?: (_envoy_data_accesslog_v3_TLSProperties_TLSVersion | keyof typeof _envoy_data_accesslog_v3_TLSProperties_TLSVersion);
+  'tls_version'?: (_envoy_data_accesslog_v3_TLSProperties_TLSVersion);
   /**
    * TLS cipher suite negotiated during handshake. The value is a
    * four-digit hex code defined by the IANA TLS Cipher Suite Registry
@@ -107,7 +121,7 @@ export interface TLSProperties__Output {
   /**
    * Version of TLS that was negotiated.
    */
-  'tls_version': (keyof typeof _envoy_data_accesslog_v3_TLSProperties_TLSVersion);
+  'tls_version': (_envoy_data_accesslog_v3_TLSProperties_TLSVersion__Output);
   /**
    * TLS cipher suite negotiated during handshake. The value is a
    * four-digit hex code defined by the IANA TLS Cipher Suite Registry
diff --git a/packages/grpc-js-xds/src/generated/envoy/extensions/filters/common/fault/v3/FaultDelay.ts b/packages/grpc-js-xds/src/generated/envoy/extensions/filters/common/fault/v3/FaultDelay.ts
index bec0403e4..e070ae913 100644
--- a/packages/grpc-js-xds/src/generated/envoy/extensions/filters/common/fault/v3/FaultDelay.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/extensions/filters/common/fault/v3/FaultDelay.ts
@@ -5,12 +5,21 @@ import type { FractionalPercent as _envoy_type_v3_FractionalPercent, FractionalP
 
 // Original file: deps/envoy-api/envoy/extensions/filters/common/fault/v3/fault.proto
 
-export enum _envoy_extensions_filters_common_fault_v3_FaultDelay_FaultDelayType {
+export const _envoy_extensions_filters_common_fault_v3_FaultDelay_FaultDelayType = {
   /**
    * Unused and deprecated.
    */
-  FIXED = 0,
-}
+  FIXED: 'FIXED',
+} as const;
+
+export type _envoy_extensions_filters_common_fault_v3_FaultDelay_FaultDelayType =
+  /**
+   * Unused and deprecated.
+   */
+  | 'FIXED'
+  | 0
+
+export type _envoy_extensions_filters_common_fault_v3_FaultDelay_FaultDelayType__Output = typeof _envoy_extensions_filters_common_fault_v3_FaultDelay_FaultDelayType[keyof typeof _envoy_extensions_filters_common_fault_v3_FaultDelay_FaultDelayType]
 
 /**
  * Fault delays are controlled via an HTTP header (if applicable). See the
diff --git a/packages/grpc-js-xds/src/generated/envoy/extensions/filters/network/http_connection_manager/v3/HttpConnectionManager.ts b/packages/grpc-js-xds/src/generated/envoy/extensions/filters/network/http_connection_manager/v3/HttpConnectionManager.ts
index 83b083782..58a25bb54 100644
--- a/packages/grpc-js-xds/src/generated/envoy/extensions/filters/network/http_connection_manager/v3/HttpConnectionManager.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/extensions/filters/network/http_connection_manager/v3/HttpConnectionManager.ts
@@ -24,7 +24,7 @@ import type { PathTransformation as _envoy_type_http_v3_PathTransformation, Path
 
 // Original file: deps/envoy-api/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto
 
-export enum _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_CodecType {
+export const _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_CodecType = {
   /**
    * For every new connection, the connection manager will determine which
    * codec to use. This mode supports both ALPN for TLS listeners as well as
@@ -32,24 +32,56 @@ export enum _envoy_extensions_filters_network_http_connection_manager_v3_HttpCon
    * is preferred, otherwise protocol inference is used. In almost all cases,
    * this is the right option to choose for this setting.
    */
-  AUTO = 0,
+  AUTO: 'AUTO',
   /**
    * The connection manager will assume that the client is speaking HTTP/1.1.
    */
-  HTTP1 = 1,
+  HTTP1: 'HTTP1',
   /**
    * The connection manager will assume that the client is speaking HTTP/2
    * (Envoy does not require HTTP/2 to take place over TLS or to use ALPN.
    * Prior knowledge is allowed).
    */
-  HTTP2 = 2,
+  HTTP2: 'HTTP2',
   /**
    * [#not-implemented-hide:] QUIC implementation is not production ready yet. Use this enum with
    * caution to prevent accidental execution of QUIC code. I.e. `!= HTTP2` is no longer sufficient
    * to distinguish HTTP1 and HTTP2 traffic.
    */
-  HTTP3 = 3,
-}
+  HTTP3: 'HTTP3',
+} as const;
+
+export type _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_CodecType =
+  /**
+   * For every new connection, the connection manager will determine which
+   * codec to use. This mode supports both ALPN for TLS listeners as well as
+   * protocol inference for plaintext listeners. If ALPN data is available, it
+   * is preferred, otherwise protocol inference is used. In almost all cases,
+   * this is the right option to choose for this setting.
+   */
+  | 'AUTO'
+  | 0
+  /**
+   * The connection manager will assume that the client is speaking HTTP/1.1.
+   */
+  | 'HTTP1'
+  | 1
+  /**
+   * The connection manager will assume that the client is speaking HTTP/2
+   * (Envoy does not require HTTP/2 to take place over TLS or to use ALPN.
+   * Prior knowledge is allowed).
+   */
+  | 'HTTP2'
+  | 2
+  /**
+   * [#not-implemented-hide:] QUIC implementation is not production ready yet. Use this enum with
+   * caution to prevent accidental execution of QUIC code. I.e. `!= HTTP2` is no longer sufficient
+   * to distinguish HTTP1 and HTTP2 traffic.
+   */
+  | 'HTTP3'
+  | 3
+
+export type _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_CodecType__Output = typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_CodecType[keyof typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_CodecType]
 
 // Original file: deps/envoy-api/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto
 
@@ -57,32 +89,73 @@ export enum _envoy_extensions_filters_network_http_connection_manager_v3_HttpCon
  * How to handle the :ref:`config_http_conn_man_headers_x-forwarded-client-cert` (XFCC) HTTP
  * header.
  */
-export enum _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ForwardClientCertDetails {
+export const _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ForwardClientCertDetails = {
   /**
    * Do not send the XFCC header to the next hop. This is the default value.
    */
-  SANITIZE = 0,
+  SANITIZE: 'SANITIZE',
   /**
    * When the client connection is mTLS (Mutual TLS), forward the XFCC header
    * in the request.
    */
-  FORWARD_ONLY = 1,
+  FORWARD_ONLY: 'FORWARD_ONLY',
   /**
    * When the client connection is mTLS, append the client certificate
    * information to the request’s XFCC header and forward it.
    */
-  APPEND_FORWARD = 2,
+  APPEND_FORWARD: 'APPEND_FORWARD',
   /**
    * When the client connection is mTLS, reset the XFCC header with the client
    * certificate information and send it to the next hop.
    */
-  SANITIZE_SET = 3,
+  SANITIZE_SET: 'SANITIZE_SET',
   /**
    * Always forward the XFCC header in the request, regardless of whether the
    * client connection is mTLS.
    */
-  ALWAYS_FORWARD_ONLY = 4,
-}
+  ALWAYS_FORWARD_ONLY: 'ALWAYS_FORWARD_ONLY',
+} as const;
+
+/**
+ * How to handle the :ref:`config_http_conn_man_headers_x-forwarded-client-cert` (XFCC) HTTP
+ * header.
+ */
+export type _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ForwardClientCertDetails =
+  /**
+   * Do not send the XFCC header to the next hop. This is the default value.
+   */
+  | 'SANITIZE'
+  | 0
+  /**
+   * When the client connection is mTLS (Mutual TLS), forward the XFCC header
+   * in the request.
+   */
+  | 'FORWARD_ONLY'
+  | 1
+  /**
+   * When the client connection is mTLS, append the client certificate
+   * information to the request’s XFCC header and forward it.
+   */
+  | 'APPEND_FORWARD'
+  | 2
+  /**
+   * When the client connection is mTLS, reset the XFCC header with the client
+   * certificate information and send it to the next hop.
+   */
+  | 'SANITIZE_SET'
+  | 3
+  /**
+   * Always forward the XFCC header in the request, regardless of whether the
+   * client connection is mTLS.
+   */
+  | 'ALWAYS_FORWARD_ONLY'
+  | 4
+
+/**
+ * How to handle the :ref:`config_http_conn_man_headers_x-forwarded-client-cert` (XFCC) HTTP
+ * header.
+ */
+export type _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ForwardClientCertDetails__Output = typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ForwardClientCertDetails[keyof typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ForwardClientCertDetails]
 
 export interface _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_HcmAccessLogOptions {
   /**
@@ -162,16 +235,30 @@ export interface _envoy_extensions_filters_network_http_connection_manager_v3_Ht
 
 // Original file: deps/envoy-api/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto
 
-export enum _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_OperationName {
+export const _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_OperationName = {
   /**
    * The HTTP listener is used for ingress/incoming requests.
    */
-  INGRESS = 0,
+  INGRESS: 'INGRESS',
   /**
    * The HTTP listener is used for egress/outgoing requests.
    */
-  EGRESS = 1,
-}
+  EGRESS: 'EGRESS',
+} as const;
+
+export type _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_OperationName =
+  /**
+   * The HTTP listener is used for ingress/incoming requests.
+   */
+  | 'INGRESS'
+  | 0
+  /**
+   * The HTTP listener is used for egress/outgoing requests.
+   */
+  | 'EGRESS'
+  | 1
+
+export type _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_OperationName__Output = typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_OperationName[keyof typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_Tracing_OperationName]
 
 /**
  * [#not-implemented-hide:] Transformations that apply to path headers. Transformations are applied
@@ -253,22 +340,22 @@ export interface _envoy_extensions_filters_network_http_connection_manager_v3_Ht
  * Determines the action for request that contain %2F, %2f, %5C or %5c sequences in the URI path.
  * This operation occurs before URL normalization and the merge slashes transformations if they were enabled.
  */
-export enum _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathWithEscapedSlashesAction {
+export const _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathWithEscapedSlashesAction = {
   /**
    * Default behavior specific to implementation (i.e. Envoy) of this configuration option.
    * Envoy, by default, takes the KEEP_UNCHANGED action.
    * NOTE: the implementation may change the default behavior at-will.
    */
-  IMPLEMENTATION_SPECIFIC_DEFAULT = 0,
+  IMPLEMENTATION_SPECIFIC_DEFAULT: 'IMPLEMENTATION_SPECIFIC_DEFAULT',
   /**
    * Keep escaped slashes.
    */
-  KEEP_UNCHANGED = 1,
+  KEEP_UNCHANGED: 'KEEP_UNCHANGED',
   /**
    * Reject client request with the 400 status. gRPC requests will be rejected with the INTERNAL (13) error code.
    * The "httpN.downstream_rq_failed_path_normalization" counter is incremented for each rejected request.
    */
-  REJECT_REQUEST = 2,
+  REJECT_REQUEST: 'REJECT_REQUEST',
   /**
    * Unescape %2F and %5C sequences and redirect request to the new path if these sequences were present.
    * Redirect occurs after path normalization and merge slashes transformations if they were configured.
@@ -278,14 +365,62 @@ export enum _envoy_extensions_filters_network_http_connection_manager_v3_HttpCon
    * The "httpN.downstream_rq_redirected_with_normalized_path" counter is incremented for each
    * redirected request.
    */
-  UNESCAPE_AND_REDIRECT = 3,
+  UNESCAPE_AND_REDIRECT: 'UNESCAPE_AND_REDIRECT',
   /**
    * Unescape %2F and %5C sequences.
    * Note: this option should not be enabled if intermediaries perform path based access control as
    * it may lead to path confusion vulnerabilities.
    */
-  UNESCAPE_AND_FORWARD = 4,
-}
+  UNESCAPE_AND_FORWARD: 'UNESCAPE_AND_FORWARD',
+} as const;
+
+/**
+ * Determines the action for request that contain %2F, %2f, %5C or %5c sequences in the URI path.
+ * This operation occurs before URL normalization and the merge slashes transformations if they were enabled.
+ */
+export type _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathWithEscapedSlashesAction =
+  /**
+   * Default behavior specific to implementation (i.e. Envoy) of this configuration option.
+   * Envoy, by default, takes the KEEP_UNCHANGED action.
+   * NOTE: the implementation may change the default behavior at-will.
+   */
+  | 'IMPLEMENTATION_SPECIFIC_DEFAULT'
+  | 0
+  /**
+   * Keep escaped slashes.
+   */
+  | 'KEEP_UNCHANGED'
+  | 1
+  /**
+   * Reject client request with the 400 status. gRPC requests will be rejected with the INTERNAL (13) error code.
+   * The "httpN.downstream_rq_failed_path_normalization" counter is incremented for each rejected request.
+   */
+  | 'REJECT_REQUEST'
+  | 2
+  /**
+   * Unescape %2F and %5C sequences and redirect request to the new path if these sequences were present.
+   * Redirect occurs after path normalization and merge slashes transformations if they were configured.
+   * NOTE: gRPC requests will be rejected with the INTERNAL (13) error code.
+   * This option minimizes possibility of path confusion exploits by forcing request with unescaped slashes to
+   * traverse all parties: downstream client, intermediate proxies, Envoy and upstream server.
+   * The "httpN.downstream_rq_redirected_with_normalized_path" counter is incremented for each
+   * redirected request.
+   */
+  | 'UNESCAPE_AND_REDIRECT'
+  | 3
+  /**
+   * Unescape %2F and %5C sequences.
+   * Note: this option should not be enabled if intermediaries perform path based access control as
+   * it may lead to path confusion vulnerabilities.
+   */
+  | 'UNESCAPE_AND_FORWARD'
+  | 4
+
+/**
+ * Determines the action for request that contain %2F, %2f, %5C or %5c sequences in the URI path.
+ * This operation occurs before URL normalization and the merge slashes transformations if they were enabled.
+ */
+export type _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathWithEscapedSlashesAction__Output = typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathWithEscapedSlashesAction[keyof typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathWithEscapedSlashesAction]
 
 /**
  * Configures the manner in which the Proxy-Status HTTP response header is
@@ -405,22 +540,43 @@ export interface _envoy_extensions_filters_network_http_connection_manager_v3_Ht
 
 // Original file: deps/envoy-api/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.proto
 
-export enum _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ServerHeaderTransformation {
+export const _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ServerHeaderTransformation = {
   /**
    * Overwrite any Server header with the contents of server_name.
    */
-  OVERWRITE = 0,
+  OVERWRITE: 'OVERWRITE',
   /**
    * If no Server header is present, append Server server_name
    * If a Server header is present, pass it through.
    */
-  APPEND_IF_ABSENT = 1,
+  APPEND_IF_ABSENT: 'APPEND_IF_ABSENT',
   /**
    * Pass through the value of the server header, and do not append a header
    * if none is present.
    */
-  PASS_THROUGH = 2,
-}
+  PASS_THROUGH: 'PASS_THROUGH',
+} as const;
+
+export type _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ServerHeaderTransformation =
+  /**
+   * Overwrite any Server header with the contents of server_name.
+   */
+  | 'OVERWRITE'
+  | 0
+  /**
+   * If no Server header is present, append Server server_name
+   * If a Server header is present, pass it through.
+   */
+  | 'APPEND_IF_ABSENT'
+  | 1
+  /**
+   * Pass through the value of the server header, and do not append a header
+   * if none is present.
+   */
+  | 'PASS_THROUGH'
+  | 2
+
+export type _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ServerHeaderTransformation__Output = typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ServerHeaderTransformation[keyof typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ServerHeaderTransformation]
 
 /**
  * [#next-free-field: 7]
@@ -737,7 +893,7 @@ export interface HttpConnectionManager {
   /**
    * Supplies the type of codec that the connection manager should use.
    */
-  'codec_type'?: (_envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_CodecType | keyof typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_CodecType);
+  'codec_type'?: (_envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_CodecType);
   /**
    * The human readable prefix to use when emitting statistics for the
    * connection manager. See the :ref:`statistics documentation <config_http_conn_man_stats>` for
@@ -825,7 +981,7 @@ export interface HttpConnectionManager {
    * How to handle the :ref:`config_http_conn_man_headers_x-forwarded-client-cert` (XFCC) HTTP
    * header.
    */
-  'forward_client_cert_details'?: (_envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ForwardClientCertDetails | keyof typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ForwardClientCertDetails);
+  'forward_client_cert_details'?: (_envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ForwardClientCertDetails);
   /**
    * This field is valid only when :ref:`forward_client_cert_details
    * <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.forward_client_cert_details>`
@@ -1025,7 +1181,7 @@ export interface HttpConnectionManager {
    * By default, Envoy will overwrite the header with the value specified in
    * server_name.
    */
-  'server_header_transformation'?: (_envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ServerHeaderTransformation | keyof typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ServerHeaderTransformation);
+  'server_header_transformation'?: (_envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ServerHeaderTransformation);
   /**
    * Additional settings for HTTP requests handled by the connection manager. These will be
    * applicable to both HTTP1 and HTTP2 requests.
@@ -1136,7 +1292,7 @@ export interface HttpConnectionManager {
    * :ref:`header validation configuration <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.typed_header_validation_config>`
    * is present.]
    */
-  'path_with_escaped_slashes_action'?: (_envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathWithEscapedSlashesAction | keyof typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathWithEscapedSlashesAction);
+  'path_with_escaped_slashes_action'?: (_envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathWithEscapedSlashesAction);
   /**
    * The configuration for the original IP detection extensions.
    * 
@@ -1234,6 +1390,7 @@ export interface HttpConnectionManager {
    * Note that if both this field and :ref:`access_log_flush_interval
    * <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.HcmAccessLogOptions.access_log_flush_interval>`
    * are specified, the former (deprecated field) is ignored.
+   * @deprecated
    */
   'access_log_flush_interval'?: (_google_protobuf_Duration | null);
   /**
@@ -1244,6 +1401,7 @@ export interface HttpConnectionManager {
    * Note that if both this field and :ref:`flush_access_log_on_new_request
    * <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.HcmAccessLogOptions.flush_access_log_on_new_request>`
    * are specified, the former (deprecated field) is ignored.
+   * @deprecated
    */
   'flush_access_log_on_new_request'?: (boolean);
   /**
@@ -1261,7 +1419,7 @@ export interface HttpConnectionManager__Output {
   /**
    * Supplies the type of codec that the connection manager should use.
    */
-  'codec_type': (keyof typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_CodecType);
+  'codec_type': (_envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_CodecType__Output);
   /**
    * The human readable prefix to use when emitting statistics for the
    * connection manager. See the :ref:`statistics documentation <config_http_conn_man_stats>` for
@@ -1349,7 +1507,7 @@ export interface HttpConnectionManager__Output {
    * How to handle the :ref:`config_http_conn_man_headers_x-forwarded-client-cert` (XFCC) HTTP
    * header.
    */
-  'forward_client_cert_details': (keyof typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ForwardClientCertDetails);
+  'forward_client_cert_details': (_envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ForwardClientCertDetails__Output);
   /**
    * This field is valid only when :ref:`forward_client_cert_details
    * <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.forward_client_cert_details>`
@@ -1549,7 +1707,7 @@ export interface HttpConnectionManager__Output {
    * By default, Envoy will overwrite the header with the value specified in
    * server_name.
    */
-  'server_header_transformation': (keyof typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ServerHeaderTransformation);
+  'server_header_transformation': (_envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_ServerHeaderTransformation__Output);
   /**
    * Additional settings for HTTP requests handled by the connection manager. These will be
    * applicable to both HTTP1 and HTTP2 requests.
@@ -1660,7 +1818,7 @@ export interface HttpConnectionManager__Output {
    * :ref:`header validation configuration <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.typed_header_validation_config>`
    * is present.]
    */
-  'path_with_escaped_slashes_action': (keyof typeof _envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathWithEscapedSlashesAction);
+  'path_with_escaped_slashes_action': (_envoy_extensions_filters_network_http_connection_manager_v3_HttpConnectionManager_PathWithEscapedSlashesAction__Output);
   /**
    * The configuration for the original IP detection extensions.
    * 
@@ -1758,6 +1916,7 @@ export interface HttpConnectionManager__Output {
    * Note that if both this field and :ref:`access_log_flush_interval
    * <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.HcmAccessLogOptions.access_log_flush_interval>`
    * are specified, the former (deprecated field) is ignored.
+   * @deprecated
    */
   'access_log_flush_interval': (_google_protobuf_Duration__Output | null);
   /**
@@ -1768,6 +1927,7 @@ export interface HttpConnectionManager__Output {
    * Note that if both this field and :ref:`flush_access_log_on_new_request
    * <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.HcmAccessLogOptions.flush_access_log_on_new_request>`
    * are specified, the former (deprecated field) is ignored.
+   * @deprecated
    */
   'flush_access_log_on_new_request': (boolean);
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/extensions/load_balancing_policies/common/v3/LocalityLbConfig.ts b/packages/grpc-js-xds/src/generated/envoy/extensions/load_balancing_policies/common/v3/LocalityLbConfig.ts
index d6fecd36b..4e3d9659e 100644
--- a/packages/grpc-js-xds/src/generated/envoy/extensions/load_balancing_policies/common/v3/LocalityLbConfig.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/extensions/load_balancing_policies/common/v3/LocalityLbConfig.ts
@@ -2,7 +2,6 @@
 
 import type { Percent as _envoy_type_v3_Percent, Percent__Output as _envoy_type_v3_Percent__Output } from '../../../../../envoy/type/v3/Percent';
 import type { UInt64Value as _google_protobuf_UInt64Value, UInt64Value__Output as _google_protobuf_UInt64Value__Output } from '../../../../../google/protobuf/UInt64Value';
-import type { Long } from '@grpc/proto-loader';
 
 /**
  * Configuration for :ref:`locality weighted load balancing
diff --git a/packages/grpc-js-xds/src/generated/envoy/extensions/load_balancing_policies/ring_hash/v3/RingHash.ts b/packages/grpc-js-xds/src/generated/envoy/extensions/load_balancing_policies/ring_hash/v3/RingHash.ts
index 3330a8ec1..88a092d13 100644
--- a/packages/grpc-js-xds/src/generated/envoy/extensions/load_balancing_policies/ring_hash/v3/RingHash.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/extensions/load_balancing_policies/ring_hash/v3/RingHash.ts
@@ -4,29 +4,55 @@ import type { UInt64Value as _google_protobuf_UInt64Value, UInt64Value__Output a
 import type { UInt32Value as _google_protobuf_UInt32Value, UInt32Value__Output as _google_protobuf_UInt32Value__Output } from '../../../../../google/protobuf/UInt32Value';
 import type { ConsistentHashingLbConfig as _envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig, ConsistentHashingLbConfig__Output as _envoy_extensions_load_balancing_policies_common_v3_ConsistentHashingLbConfig__Output } from '../../../../../envoy/extensions/load_balancing_policies/common/v3/ConsistentHashingLbConfig';
 import type { _envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig, _envoy_extensions_load_balancing_policies_common_v3_LocalityLbConfig_LocalityWeightedLbConfig__Output } from '../../../../../envoy/extensions/load_balancing_policies/common/v3/LocalityLbConfig';
-import type { Long } from '@grpc/proto-loader';
 
 // Original file: deps/envoy-api/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.proto
 
 /**
  * The hash function used to hash hosts onto the ketama ring.
  */
-export enum _envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_HashFunction {
+export const _envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_HashFunction = {
   /**
    * Currently defaults to XX_HASH.
    */
-  DEFAULT_HASH = 0,
+  DEFAULT_HASH: 'DEFAULT_HASH',
   /**
    * Use `xxHash <https://github.com/Cyan4973/xxHash>`_.
    */
-  XX_HASH = 1,
+  XX_HASH: 'XX_HASH',
   /**
    * Use `MurmurHash2 <https://sites.google.com/site/murmurhash/>`_, this is compatible with
    * std:hash<string> in GNU libstdc++ 3.4.20 or above. This is typically the case when compiled
    * on Linux and not macOS.
    */
-  MURMUR_HASH_2 = 2,
-}
+  MURMUR_HASH_2: 'MURMUR_HASH_2',
+} as const;
+
+/**
+ * The hash function used to hash hosts onto the ketama ring.
+ */
+export type _envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_HashFunction =
+  /**
+   * Currently defaults to XX_HASH.
+   */
+  | 'DEFAULT_HASH'
+  | 0
+  /**
+   * Use `xxHash <https://github.com/Cyan4973/xxHash>`_.
+   */
+  | 'XX_HASH'
+  | 1
+  /**
+   * Use `MurmurHash2 <https://sites.google.com/site/murmurhash/>`_, this is compatible with
+   * std:hash<string> in GNU libstdc++ 3.4.20 or above. This is typically the case when compiled
+   * on Linux and not macOS.
+   */
+  | 'MURMUR_HASH_2'
+  | 2
+
+/**
+ * The hash function used to hash hosts onto the ketama ring.
+ */
+export type _envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_HashFunction__Output = typeof _envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_HashFunction[keyof typeof _envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_HashFunction]
 
 /**
  * This configuration allows the built-in RING_HASH LB policy to be configured via the LB policy
@@ -39,7 +65,7 @@ export interface RingHash {
    * The hash function used to hash hosts onto the ketama ring. The value defaults to
    * :ref:`XX_HASH<envoy_v3_api_enum_value_config.cluster.v3.Cluster.RingHashLbConfig.HashFunction.XX_HASH>`.
    */
-  'hash_function'?: (_envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_HashFunction | keyof typeof _envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_HashFunction);
+  'hash_function'?: (_envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_HashFunction);
   /**
    * Minimum hash ring size. The larger the ring is (that is, the more hashes there are for each
    * provided host) the better the request distribution will reflect the desired weights. Defaults
@@ -60,6 +86,7 @@ export interface RingHash {
    * .. note::
    * This is deprecated and please use :ref:`consistent_hashing_lb_config
    * <envoy_v3_api_field_extensions.load_balancing_policies.ring_hash.v3.RingHash.consistent_hashing_lb_config>` instead.
+   * @deprecated
    */
   'use_hostname_for_hashing'?: (boolean);
   /**
@@ -83,6 +110,7 @@ export interface RingHash {
    * .. note::
    * This is deprecated and please use :ref:`consistent_hashing_lb_config
    * <envoy_v3_api_field_extensions.load_balancing_policies.ring_hash.v3.RingHash.consistent_hashing_lb_config>` instead.
+   * @deprecated
    */
   'hash_balance_factor'?: (_google_protobuf_UInt32Value | null);
   /**
@@ -106,7 +134,7 @@ export interface RingHash__Output {
    * The hash function used to hash hosts onto the ketama ring. The value defaults to
    * :ref:`XX_HASH<envoy_v3_api_enum_value_config.cluster.v3.Cluster.RingHashLbConfig.HashFunction.XX_HASH>`.
    */
-  'hash_function': (keyof typeof _envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_HashFunction);
+  'hash_function': (_envoy_extensions_load_balancing_policies_ring_hash_v3_RingHash_HashFunction__Output);
   /**
    * Minimum hash ring size. The larger the ring is (that is, the more hashes there are for each
    * provided host) the better the request distribution will reflect the desired weights. Defaults
@@ -127,6 +155,7 @@ export interface RingHash__Output {
    * .. note::
    * This is deprecated and please use :ref:`consistent_hashing_lb_config
    * <envoy_v3_api_field_extensions.load_balancing_policies.ring_hash.v3.RingHash.consistent_hashing_lb_config>` instead.
+   * @deprecated
    */
   'use_hostname_for_hashing': (boolean);
   /**
@@ -150,6 +179,7 @@ export interface RingHash__Output {
    * .. note::
    * This is deprecated and please use :ref:`consistent_hashing_lb_config
    * <envoy_v3_api_field_extensions.load_balancing_policies.ring_hash.v3.RingHash.consistent_hashing_lb_config>` instead.
+   * @deprecated
    */
   'hash_balance_factor': (_google_protobuf_UInt32Value__Output | null);
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/CertificateProviderPluginInstance.ts b/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/CertificateProviderPluginInstance.ts
deleted file mode 100644
index 3a3100f55..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/CertificateProviderPluginInstance.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// Original file: deps/envoy-api/envoy/extensions/transport_sockets/tls/v3/common.proto
-
-
-/**
- * Indicates a certificate to be obtained from a named CertificateProvider plugin instance.
- * The plugin instances are defined in the client's bootstrap file.
- * The plugin allows certificates to be fetched/refreshed over the network asynchronously with
- * respect to the TLS handshake.
- * [#not-implemented-hide:]
- */
-export interface CertificateProviderPluginInstance {
-  /**
-   * Provider instance name. If not present, defaults to "default".
-   * 
-   * Instance names should generally be defined not in terms of the underlying provider
-   * implementation (e.g., "file_watcher") but rather in terms of the function of the
-   * certificates (e.g., "foo_deployment_identity").
-   */
-  'instance_name'?: (string);
-  /**
-   * Opaque name used to specify certificate instances or types. For example, "ROOTCA" to specify
-   * a root-certificate (validation context) or "example.com" to specify a certificate for a
-   * particular domain. Not all provider instances will actually use this field, so the value
-   * defaults to the empty string.
-   */
-  'certificate_name'?: (string);
-}
-
-/**
- * Indicates a certificate to be obtained from a named CertificateProvider plugin instance.
- * The plugin instances are defined in the client's bootstrap file.
- * The plugin allows certificates to be fetched/refreshed over the network asynchronously with
- * respect to the TLS handshake.
- * [#not-implemented-hide:]
- */
-export interface CertificateProviderPluginInstance__Output {
-  /**
-   * Provider instance name. If not present, defaults to "default".
-   * 
-   * Instance names should generally be defined not in terms of the underlying provider
-   * implementation (e.g., "file_watcher") but rather in terms of the function of the
-   * certificates (e.g., "foo_deployment_identity").
-   */
-  'instance_name': (string);
-  /**
-   * Opaque name used to specify certificate instances or types. For example, "ROOTCA" to specify
-   * a root-certificate (validation context) or "example.com" to specify a certificate for a
-   * particular domain. Not all provider instances will actually use this field, so the value
-   * defaults to the empty string.
-   */
-  'certificate_name': (string);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/CertificateValidationContext.ts b/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/CertificateValidationContext.ts
deleted file mode 100644
index 379320086..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/CertificateValidationContext.ts
+++ /dev/null
@@ -1,372 +0,0 @@
-// Original file: deps/envoy-api/envoy/extensions/transport_sockets/tls/v3/common.proto
-
-import type { DataSource as _envoy_config_core_v3_DataSource, DataSource__Output as _envoy_config_core_v3_DataSource__Output } from '../../../../../envoy/config/core/v3/DataSource';
-import type { BoolValue as _google_protobuf_BoolValue, BoolValue__Output as _google_protobuf_BoolValue__Output } from '../../../../../google/protobuf/BoolValue';
-import type { StringMatcher as _envoy_type_matcher_v3_StringMatcher, StringMatcher__Output as _envoy_type_matcher_v3_StringMatcher__Output } from '../../../../../envoy/type/matcher/v3/StringMatcher';
-import type { WatchedDirectory as _envoy_config_core_v3_WatchedDirectory, WatchedDirectory__Output as _envoy_config_core_v3_WatchedDirectory__Output } from '../../../../../envoy/config/core/v3/WatchedDirectory';
-import type { TypedExtensionConfig as _envoy_config_core_v3_TypedExtensionConfig, TypedExtensionConfig__Output as _envoy_config_core_v3_TypedExtensionConfig__Output } from '../../../../../envoy/config/core/v3/TypedExtensionConfig';
-import type { CertificateProviderPluginInstance as _envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance, CertificateProviderPluginInstance__Output as _envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance__Output } from '../../../../../envoy/extensions/transport_sockets/tls/v3/CertificateProviderPluginInstance';
-
-// Original file: deps/envoy-api/envoy/extensions/transport_sockets/tls/v3/common.proto
-
-/**
- * Peer certificate verification mode.
- */
-export enum _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_TrustChainVerification {
-  /**
-   * Perform default certificate verification (e.g., against CA / verification lists)
-   */
-  VERIFY_TRUST_CHAIN = 0,
-  /**
-   * Connections where the certificate fails verification will be permitted.
-   * For HTTP connections, the result of certificate verification can be used in route matching. (
-   * see :ref:`validated <envoy_v3_api_field_config.route.v3.RouteMatch.TlsContextMatchOptions.validated>` ).
-   */
-  ACCEPT_UNTRUSTED = 1,
-}
-
-/**
- * [#next-free-field: 14]
- */
-export interface CertificateValidationContext {
-  /**
-   * TLS certificate data containing certificate authority certificates to use in verifying
-   * a presented peer certificate (e.g. server certificate for clusters or client certificate
-   * for listeners). If not specified and a peer certificate is presented it will not be
-   * verified. By default, a client certificate is optional, unless one of the additional
-   * options (:ref:`require_client_certificate
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.DownstreamTlsContext.require_client_certificate>`,
-   * :ref:`verify_certificate_spki
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_spki>`,
-   * :ref:`verify_certificate_hash
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_hash>`, or
-   * :ref:`match_subject_alt_names
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.match_subject_alt_names>`) is also
-   * specified.
-   * 
-   * It can optionally contain certificate revocation lists, in which case Envoy will verify
-   * that the presented peer certificate has not been revoked by one of the included CRLs. Note
-   * that if a CRL is provided for any certificate authority in a trust chain, a CRL must be
-   * provided for all certificate authorities in that chain. Failure to do so will result in
-   * verification failure for both revoked and unrevoked certificates from that chain.
-   * 
-   * See :ref:`the TLS overview <arch_overview_ssl_enabling_verification>` for a list of common
-   * system CA locations.
-   * 
-   * If *trusted_ca* is a filesystem path, a watch will be added to the parent
-   * directory for any file moves to support rotation. This currently only
-   * applies to dynamic secrets, when the *CertificateValidationContext* is
-   * delivered via SDS.
-   * 
-   * Only one of *trusted_ca* and *ca_certificate_provider_instance* may be specified.
-   * 
-   * [#next-major-version: This field and watched_directory below should ideally be moved into a
-   * separate sub-message, since there's no point in specifying the latter field without this one.]
-   */
-  'trusted_ca'?: (_envoy_config_core_v3_DataSource | null);
-  /**
-   * An optional list of hex-encoded SHA-256 hashes. If specified, Envoy will verify that
-   * the SHA-256 of the DER-encoded presented certificate matches one of the specified values.
-   * 
-   * A hex-encoded SHA-256 of the certificate can be generated with the following command:
-   * 
-   * .. code-block:: bash
-   * 
-   * $ openssl x509 -in path/to/client.crt -outform DER | openssl dgst -sha256 | cut -d" " -f2
-   * df6ff72fe9116521268f6f2dd4966f51df479883fe7037b39f75916ac3049d1a
-   * 
-   * A long hex-encoded and colon-separated SHA-256 (a.k.a. "fingerprint") of the certificate
-   * can be generated with the following command:
-   * 
-   * .. code-block:: bash
-   * 
-   * $ openssl x509 -in path/to/client.crt -noout -fingerprint -sha256 | cut -d"=" -f2
-   * DF:6F:F7:2F:E9:11:65:21:26:8F:6F:2D:D4:96:6F:51:DF:47:98:83:FE:70:37:B3:9F:75:91:6A:C3:04:9D:1A
-   * 
-   * Both of those formats are acceptable.
-   * 
-   * When both:
-   * :ref:`verify_certificate_hash
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_hash>` and
-   * :ref:`verify_certificate_spki
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_spki>` are specified,
-   * a hash matching value from either of the lists will result in the certificate being accepted.
-   */
-  'verify_certificate_hash'?: (string)[];
-  /**
-   * An optional list of base64-encoded SHA-256 hashes. If specified, Envoy will verify that the
-   * SHA-256 of the DER-encoded Subject Public Key Information (SPKI) of the presented certificate
-   * matches one of the specified values.
-   * 
-   * A base64-encoded SHA-256 of the Subject Public Key Information (SPKI) of the certificate
-   * can be generated with the following command:
-   * 
-   * .. code-block:: bash
-   * 
-   * $ openssl x509 -in path/to/client.crt -noout -pubkey
-   * | openssl pkey -pubin -outform DER
-   * | openssl dgst -sha256 -binary
-   * | openssl enc -base64
-   * NvqYIYSbgK2vCJpQhObf77vv+bQWtc5ek5RIOwPiC9A=
-   * 
-   * This is the format used in HTTP Public Key Pinning.
-   * 
-   * When both:
-   * :ref:`verify_certificate_hash
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_hash>` and
-   * :ref:`verify_certificate_spki
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_spki>` are specified,
-   * a hash matching value from either of the lists will result in the certificate being accepted.
-   * 
-   * .. attention::
-   * 
-   * This option is preferred over :ref:`verify_certificate_hash
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_hash>`,
-   * because SPKI is tied to a private key, so it doesn't change when the certificate
-   * is renewed using the same private key.
-   */
-  'verify_certificate_spki'?: (string)[];
-  /**
-   * [#not-implemented-hide:] Must present signed certificate time-stamp.
-   */
-  'require_signed_certificate_timestamp'?: (_google_protobuf_BoolValue | null);
-  /**
-   * An optional `certificate revocation list
-   * <https://en.wikipedia.org/wiki/Certificate_revocation_list>`_
-   * (in PEM format). If specified, Envoy will verify that the presented peer
-   * certificate has not been revoked by this CRL. If this DataSource contains
-   * multiple CRLs, all of them will be used. Note that if a CRL is provided
-   * for any certificate authority in a trust chain, a CRL must be provided
-   * for all certificate authorities in that chain. Failure to do so will
-   * result in verification failure for both revoked and unrevoked certificates
-   * from that chain.
-   */
-  'crl'?: (_envoy_config_core_v3_DataSource | null);
-  /**
-   * If specified, Envoy will not reject expired certificates.
-   */
-  'allow_expired_certificate'?: (boolean);
-  /**
-   * An optional list of Subject Alternative name matchers. If specified, Envoy will verify that the
-   * Subject Alternative Name of the presented certificate matches one of the specified matchers.
-   * 
-   * When a certificate has wildcard DNS SAN entries, to match a specific client, it should be
-   * configured with exact match type in the :ref:`string matcher <envoy_v3_api_msg_type.matcher.v3.StringMatcher>`.
-   * For example if the certificate has "\*.example.com" as DNS SAN entry, to allow only "api.example.com",
-   * it should be configured as shown below.
-   * 
-   * .. code-block:: yaml
-   * 
-   * match_subject_alt_names:
-   * exact: "api.example.com"
-   * 
-   * .. attention::
-   * 
-   * Subject Alternative Names are easily spoofable and verifying only them is insecure,
-   * therefore this option must be used together with :ref:`trusted_ca
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.trusted_ca>`.
-   */
-  'match_subject_alt_names'?: (_envoy_type_matcher_v3_StringMatcher)[];
-  /**
-   * Certificate trust chain verification mode.
-   */
-  'trust_chain_verification'?: (_envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_TrustChainVerification | keyof typeof _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_TrustChainVerification);
-  /**
-   * If specified, updates of a file-based *trusted_ca* source will be triggered
-   * by this watch. This allows explicit control over the path watched, by
-   * default the parent directory of the filesystem path in *trusted_ca* is
-   * watched if this field is not specified. This only applies when a
-   * *CertificateValidationContext* is delivered by SDS with references to
-   * filesystem paths. See the :ref:`SDS key rotation <sds_key_rotation>`
-   * documentation for further details.
-   */
-  'watched_directory'?: (_envoy_config_core_v3_WatchedDirectory | null);
-  /**
-   * The configuration of an extension specific certificate validator.
-   * If specified, all validation is done by the specified validator,
-   * and the behavior of all other validation settings is defined by the specified validator (and may be entirely ignored, unused, and unvalidated).
-   * Refer to the documentation for the specified validator. If you do not want a custom validation algorithm, do not set this field.
-   * [#extension-category: envoy.tls.cert_validator]
-   */
-  'custom_validator_config'?: (_envoy_config_core_v3_TypedExtensionConfig | null);
-  /**
-   * Certificate provider instance for fetching TLS certificates.
-   * 
-   * Only one of *trusted_ca* and *ca_certificate_provider_instance* may be specified.
-   * [#not-implemented-hide:]
-   */
-  'ca_certificate_provider_instance'?: (_envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance | null);
-}
-
-/**
- * [#next-free-field: 14]
- */
-export interface CertificateValidationContext__Output {
-  /**
-   * TLS certificate data containing certificate authority certificates to use in verifying
-   * a presented peer certificate (e.g. server certificate for clusters or client certificate
-   * for listeners). If not specified and a peer certificate is presented it will not be
-   * verified. By default, a client certificate is optional, unless one of the additional
-   * options (:ref:`require_client_certificate
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.DownstreamTlsContext.require_client_certificate>`,
-   * :ref:`verify_certificate_spki
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_spki>`,
-   * :ref:`verify_certificate_hash
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_hash>`, or
-   * :ref:`match_subject_alt_names
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.match_subject_alt_names>`) is also
-   * specified.
-   * 
-   * It can optionally contain certificate revocation lists, in which case Envoy will verify
-   * that the presented peer certificate has not been revoked by one of the included CRLs. Note
-   * that if a CRL is provided for any certificate authority in a trust chain, a CRL must be
-   * provided for all certificate authorities in that chain. Failure to do so will result in
-   * verification failure for both revoked and unrevoked certificates from that chain.
-   * 
-   * See :ref:`the TLS overview <arch_overview_ssl_enabling_verification>` for a list of common
-   * system CA locations.
-   * 
-   * If *trusted_ca* is a filesystem path, a watch will be added to the parent
-   * directory for any file moves to support rotation. This currently only
-   * applies to dynamic secrets, when the *CertificateValidationContext* is
-   * delivered via SDS.
-   * 
-   * Only one of *trusted_ca* and *ca_certificate_provider_instance* may be specified.
-   * 
-   * [#next-major-version: This field and watched_directory below should ideally be moved into a
-   * separate sub-message, since there's no point in specifying the latter field without this one.]
-   */
-  'trusted_ca': (_envoy_config_core_v3_DataSource__Output | null);
-  /**
-   * An optional list of hex-encoded SHA-256 hashes. If specified, Envoy will verify that
-   * the SHA-256 of the DER-encoded presented certificate matches one of the specified values.
-   * 
-   * A hex-encoded SHA-256 of the certificate can be generated with the following command:
-   * 
-   * .. code-block:: bash
-   * 
-   * $ openssl x509 -in path/to/client.crt -outform DER | openssl dgst -sha256 | cut -d" " -f2
-   * df6ff72fe9116521268f6f2dd4966f51df479883fe7037b39f75916ac3049d1a
-   * 
-   * A long hex-encoded and colon-separated SHA-256 (a.k.a. "fingerprint") of the certificate
-   * can be generated with the following command:
-   * 
-   * .. code-block:: bash
-   * 
-   * $ openssl x509 -in path/to/client.crt -noout -fingerprint -sha256 | cut -d"=" -f2
-   * DF:6F:F7:2F:E9:11:65:21:26:8F:6F:2D:D4:96:6F:51:DF:47:98:83:FE:70:37:B3:9F:75:91:6A:C3:04:9D:1A
-   * 
-   * Both of those formats are acceptable.
-   * 
-   * When both:
-   * :ref:`verify_certificate_hash
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_hash>` and
-   * :ref:`verify_certificate_spki
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_spki>` are specified,
-   * a hash matching value from either of the lists will result in the certificate being accepted.
-   */
-  'verify_certificate_hash': (string)[];
-  /**
-   * An optional list of base64-encoded SHA-256 hashes. If specified, Envoy will verify that the
-   * SHA-256 of the DER-encoded Subject Public Key Information (SPKI) of the presented certificate
-   * matches one of the specified values.
-   * 
-   * A base64-encoded SHA-256 of the Subject Public Key Information (SPKI) of the certificate
-   * can be generated with the following command:
-   * 
-   * .. code-block:: bash
-   * 
-   * $ openssl x509 -in path/to/client.crt -noout -pubkey
-   * | openssl pkey -pubin -outform DER
-   * | openssl dgst -sha256 -binary
-   * | openssl enc -base64
-   * NvqYIYSbgK2vCJpQhObf77vv+bQWtc5ek5RIOwPiC9A=
-   * 
-   * This is the format used in HTTP Public Key Pinning.
-   * 
-   * When both:
-   * :ref:`verify_certificate_hash
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_hash>` and
-   * :ref:`verify_certificate_spki
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_spki>` are specified,
-   * a hash matching value from either of the lists will result in the certificate being accepted.
-   * 
-   * .. attention::
-   * 
-   * This option is preferred over :ref:`verify_certificate_hash
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.verify_certificate_hash>`,
-   * because SPKI is tied to a private key, so it doesn't change when the certificate
-   * is renewed using the same private key.
-   */
-  'verify_certificate_spki': (string)[];
-  /**
-   * [#not-implemented-hide:] Must present signed certificate time-stamp.
-   */
-  'require_signed_certificate_timestamp': (_google_protobuf_BoolValue__Output | null);
-  /**
-   * An optional `certificate revocation list
-   * <https://en.wikipedia.org/wiki/Certificate_revocation_list>`_
-   * (in PEM format). If specified, Envoy will verify that the presented peer
-   * certificate has not been revoked by this CRL. If this DataSource contains
-   * multiple CRLs, all of them will be used. Note that if a CRL is provided
-   * for any certificate authority in a trust chain, a CRL must be provided
-   * for all certificate authorities in that chain. Failure to do so will
-   * result in verification failure for both revoked and unrevoked certificates
-   * from that chain.
-   */
-  'crl': (_envoy_config_core_v3_DataSource__Output | null);
-  /**
-   * If specified, Envoy will not reject expired certificates.
-   */
-  'allow_expired_certificate': (boolean);
-  /**
-   * An optional list of Subject Alternative name matchers. If specified, Envoy will verify that the
-   * Subject Alternative Name of the presented certificate matches one of the specified matchers.
-   * 
-   * When a certificate has wildcard DNS SAN entries, to match a specific client, it should be
-   * configured with exact match type in the :ref:`string matcher <envoy_v3_api_msg_type.matcher.v3.StringMatcher>`.
-   * For example if the certificate has "\*.example.com" as DNS SAN entry, to allow only "api.example.com",
-   * it should be configured as shown below.
-   * 
-   * .. code-block:: yaml
-   * 
-   * match_subject_alt_names:
-   * exact: "api.example.com"
-   * 
-   * .. attention::
-   * 
-   * Subject Alternative Names are easily spoofable and verifying only them is insecure,
-   * therefore this option must be used together with :ref:`trusted_ca
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.CertificateValidationContext.trusted_ca>`.
-   */
-  'match_subject_alt_names': (_envoy_type_matcher_v3_StringMatcher__Output)[];
-  /**
-   * Certificate trust chain verification mode.
-   */
-  'trust_chain_verification': (keyof typeof _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext_TrustChainVerification);
-  /**
-   * If specified, updates of a file-based *trusted_ca* source will be triggered
-   * by this watch. This allows explicit control over the path watched, by
-   * default the parent directory of the filesystem path in *trusted_ca* is
-   * watched if this field is not specified. This only applies when a
-   * *CertificateValidationContext* is delivered by SDS with references to
-   * filesystem paths. See the :ref:`SDS key rotation <sds_key_rotation>`
-   * documentation for further details.
-   */
-  'watched_directory': (_envoy_config_core_v3_WatchedDirectory__Output | null);
-  /**
-   * The configuration of an extension specific certificate validator.
-   * If specified, all validation is done by the specified validator,
-   * and the behavior of all other validation settings is defined by the specified validator (and may be entirely ignored, unused, and unvalidated).
-   * Refer to the documentation for the specified validator. If you do not want a custom validation algorithm, do not set this field.
-   * [#extension-category: envoy.tls.cert_validator]
-   */
-  'custom_validator_config': (_envoy_config_core_v3_TypedExtensionConfig__Output | null);
-  /**
-   * Certificate provider instance for fetching TLS certificates.
-   * 
-   * Only one of *trusted_ca* and *ca_certificate_provider_instance* may be specified.
-   * [#not-implemented-hide:]
-   */
-  'ca_certificate_provider_instance': (_envoy_extensions_transport_sockets_tls_v3_CertificateProviderPluginInstance__Output | null);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/GenericSecret.ts b/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/GenericSecret.ts
deleted file mode 100644
index b206fb13a..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/GenericSecret.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// Original file: deps/envoy-api/envoy/extensions/transport_sockets/tls/v3/secret.proto
-
-import type { DataSource as _envoy_config_core_v3_DataSource, DataSource__Output as _envoy_config_core_v3_DataSource__Output } from '../../../../../envoy/config/core/v3/DataSource';
-
-export interface GenericSecret {
-  /**
-   * Secret of generic type and is available to filters.
-   */
-  'secret'?: (_envoy_config_core_v3_DataSource | null);
-}
-
-export interface GenericSecret__Output {
-  /**
-   * Secret of generic type and is available to filters.
-   */
-  'secret': (_envoy_config_core_v3_DataSource__Output | null);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/PrivateKeyProvider.ts b/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/PrivateKeyProvider.ts
deleted file mode 100644
index b4a2ad933..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/PrivateKeyProvider.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-// Original file: deps/envoy-api/envoy/extensions/transport_sockets/tls/v3/common.proto
-
-import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../../../google/protobuf/Any';
-
-/**
- * BoringSSL private key method configuration. The private key methods are used for external
- * (potentially asynchronous) signing and decryption operations. Some use cases for private key
- * methods would be TPM support and TLS acceleration.
- */
-export interface PrivateKeyProvider {
-  /**
-   * Private key method provider name. The name must match a
-   * supported private key method provider type.
-   */
-  'provider_name'?: (string);
-  'typed_config'?: (_google_protobuf_Any | null);
-  /**
-   * Private key method provider specific configuration.
-   */
-  'config_type'?: "typed_config";
-}
-
-/**
- * BoringSSL private key method configuration. The private key methods are used for external
- * (potentially asynchronous) signing and decryption operations. Some use cases for private key
- * methods would be TPM support and TLS acceleration.
- */
-export interface PrivateKeyProvider__Output {
-  /**
-   * Private key method provider name. The name must match a
-   * supported private key method provider type.
-   */
-  'provider_name': (string);
-  'typed_config'?: (_google_protobuf_Any__Output | null);
-  /**
-   * Private key method provider specific configuration.
-   */
-  'config_type': "typed_config";
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/SdsSecretConfig.ts b/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/SdsSecretConfig.ts
deleted file mode 100644
index 38b850c50..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/SdsSecretConfig.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// Original file: deps/envoy-api/envoy/extensions/transport_sockets/tls/v3/secret.proto
-
-import type { ConfigSource as _envoy_config_core_v3_ConfigSource, ConfigSource__Output as _envoy_config_core_v3_ConfigSource__Output } from '../../../../../envoy/config/core/v3/ConfigSource';
-
-export interface SdsSecretConfig {
-  /**
-   * Name by which the secret can be uniquely referred to. When both name and config are specified,
-   * then secret can be fetched and/or reloaded via SDS. When only name is specified, then secret
-   * will be loaded from static resources.
-   */
-  'name'?: (string);
-  'sds_config'?: (_envoy_config_core_v3_ConfigSource | null);
-}
-
-export interface SdsSecretConfig__Output {
-  /**
-   * Name by which the secret can be uniquely referred to. When both name and config are specified,
-   * then secret can be fetched and/or reloaded via SDS. When only name is specified, then secret
-   * will be loaded from static resources.
-   */
-  'name': (string);
-  'sds_config': (_envoy_config_core_v3_ConfigSource__Output | null);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/Secret.ts b/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/Secret.ts
deleted file mode 100644
index c86957da5..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/Secret.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// Original file: deps/envoy-api/envoy/extensions/transport_sockets/tls/v3/secret.proto
-
-import type { TlsCertificate as _envoy_extensions_transport_sockets_tls_v3_TlsCertificate, TlsCertificate__Output as _envoy_extensions_transport_sockets_tls_v3_TlsCertificate__Output } from '../../../../../envoy/extensions/transport_sockets/tls/v3/TlsCertificate';
-import type { TlsSessionTicketKeys as _envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys, TlsSessionTicketKeys__Output as _envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys__Output } from '../../../../../envoy/extensions/transport_sockets/tls/v3/TlsSessionTicketKeys';
-import type { CertificateValidationContext as _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext, CertificateValidationContext__Output as _envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__Output } from '../../../../../envoy/extensions/transport_sockets/tls/v3/CertificateValidationContext';
-import type { GenericSecret as _envoy_extensions_transport_sockets_tls_v3_GenericSecret, GenericSecret__Output as _envoy_extensions_transport_sockets_tls_v3_GenericSecret__Output } from '../../../../../envoy/extensions/transport_sockets/tls/v3/GenericSecret';
-
-/**
- * [#next-free-field: 6]
- */
-export interface Secret {
-  /**
-   * Name (FQDN, UUID, SPKI, SHA256, etc.) by which the secret can be uniquely referred to.
-   */
-  'name'?: (string);
-  'tls_certificate'?: (_envoy_extensions_transport_sockets_tls_v3_TlsCertificate | null);
-  'session_ticket_keys'?: (_envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys | null);
-  'validation_context'?: (_envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext | null);
-  'generic_secret'?: (_envoy_extensions_transport_sockets_tls_v3_GenericSecret | null);
-  'type'?: "tls_certificate"|"session_ticket_keys"|"validation_context"|"generic_secret";
-}
-
-/**
- * [#next-free-field: 6]
- */
-export interface Secret__Output {
-  /**
-   * Name (FQDN, UUID, SPKI, SHA256, etc.) by which the secret can be uniquely referred to.
-   */
-  'name': (string);
-  'tls_certificate'?: (_envoy_extensions_transport_sockets_tls_v3_TlsCertificate__Output | null);
-  'session_ticket_keys'?: (_envoy_extensions_transport_sockets_tls_v3_TlsSessionTicketKeys__Output | null);
-  'validation_context'?: (_envoy_extensions_transport_sockets_tls_v3_CertificateValidationContext__Output | null);
-  'generic_secret'?: (_envoy_extensions_transport_sockets_tls_v3_GenericSecret__Output | null);
-  'type': "tls_certificate"|"session_ticket_keys"|"validation_context"|"generic_secret";
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/TlsCertificate.ts b/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/TlsCertificate.ts
deleted file mode 100644
index ce8046e95..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/TlsCertificate.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-// Original file: deps/envoy-api/envoy/extensions/transport_sockets/tls/v3/common.proto
-
-import type { DataSource as _envoy_config_core_v3_DataSource, DataSource__Output as _envoy_config_core_v3_DataSource__Output } from '../../../../../envoy/config/core/v3/DataSource';
-import type { PrivateKeyProvider as _envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider, PrivateKeyProvider__Output as _envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider__Output } from '../../../../../envoy/extensions/transport_sockets/tls/v3/PrivateKeyProvider';
-import type { WatchedDirectory as _envoy_config_core_v3_WatchedDirectory, WatchedDirectory__Output as _envoy_config_core_v3_WatchedDirectory__Output } from '../../../../../envoy/config/core/v3/WatchedDirectory';
-
-/**
- * [#next-free-field: 8]
- */
-export interface TlsCertificate {
-  /**
-   * The TLS certificate chain.
-   * 
-   * If *certificate_chain* is a filesystem path, a watch will be added to the
-   * parent directory for any file moves to support rotation. This currently
-   * only applies to dynamic secrets, when the *TlsCertificate* is delivered via
-   * SDS.
-   */
-  'certificate_chain'?: (_envoy_config_core_v3_DataSource | null);
-  /**
-   * The TLS private key.
-   * 
-   * If *private_key* is a filesystem path, a watch will be added to the parent
-   * directory for any file moves to support rotation. This currently only
-   * applies to dynamic secrets, when the *TlsCertificate* is delivered via SDS.
-   */
-  'private_key'?: (_envoy_config_core_v3_DataSource | null);
-  /**
-   * The password to decrypt the TLS private key. If this field is not set, it is assumed that the
-   * TLS private key is not password encrypted.
-   */
-  'password'?: (_envoy_config_core_v3_DataSource | null);
-  /**
-   * The OCSP response to be stapled with this certificate during the handshake.
-   * The response must be DER-encoded and may only be  provided via ``filename`` or
-   * ``inline_bytes``. The response may pertain to only one certificate.
-   */
-  'ocsp_staple'?: (_envoy_config_core_v3_DataSource | null);
-  /**
-   * [#not-implemented-hide:]
-   */
-  'signed_certificate_timestamp'?: (_envoy_config_core_v3_DataSource)[];
-  /**
-   * BoringSSL private key method provider. This is an alternative to :ref:`private_key
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.TlsCertificate.private_key>` field. This can't be
-   * marked as ``oneof`` due to API compatibility reasons. Setting both :ref:`private_key
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.TlsCertificate.private_key>` and
-   * :ref:`private_key_provider
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.TlsCertificate.private_key_provider>` fields will result in an
-   * error.
-   */
-  'private_key_provider'?: (_envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider | null);
-  /**
-   * If specified, updates of file-based *certificate_chain* and *private_key*
-   * sources will be triggered by this watch. The certificate/key pair will be
-   * read together and validated for atomic read consistency (i.e. no
-   * intervening modification occurred between cert/key read, verified by file
-   * hash comparisons). This allows explicit control over the path watched, by
-   * default the parent directories of the filesystem paths in
-   * *certificate_chain* and *private_key* are watched if this field is not
-   * specified. This only applies when a *TlsCertificate* is delivered by SDS
-   * with references to filesystem paths. See the :ref:`SDS key rotation
-   * <sds_key_rotation>` documentation for further details.
-   */
-  'watched_directory'?: (_envoy_config_core_v3_WatchedDirectory | null);
-}
-
-/**
- * [#next-free-field: 8]
- */
-export interface TlsCertificate__Output {
-  /**
-   * The TLS certificate chain.
-   * 
-   * If *certificate_chain* is a filesystem path, a watch will be added to the
-   * parent directory for any file moves to support rotation. This currently
-   * only applies to dynamic secrets, when the *TlsCertificate* is delivered via
-   * SDS.
-   */
-  'certificate_chain': (_envoy_config_core_v3_DataSource__Output | null);
-  /**
-   * The TLS private key.
-   * 
-   * If *private_key* is a filesystem path, a watch will be added to the parent
-   * directory for any file moves to support rotation. This currently only
-   * applies to dynamic secrets, when the *TlsCertificate* is delivered via SDS.
-   */
-  'private_key': (_envoy_config_core_v3_DataSource__Output | null);
-  /**
-   * The password to decrypt the TLS private key. If this field is not set, it is assumed that the
-   * TLS private key is not password encrypted.
-   */
-  'password': (_envoy_config_core_v3_DataSource__Output | null);
-  /**
-   * The OCSP response to be stapled with this certificate during the handshake.
-   * The response must be DER-encoded and may only be  provided via ``filename`` or
-   * ``inline_bytes``. The response may pertain to only one certificate.
-   */
-  'ocsp_staple': (_envoy_config_core_v3_DataSource__Output | null);
-  /**
-   * [#not-implemented-hide:]
-   */
-  'signed_certificate_timestamp': (_envoy_config_core_v3_DataSource__Output)[];
-  /**
-   * BoringSSL private key method provider. This is an alternative to :ref:`private_key
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.TlsCertificate.private_key>` field. This can't be
-   * marked as ``oneof`` due to API compatibility reasons. Setting both :ref:`private_key
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.TlsCertificate.private_key>` and
-   * :ref:`private_key_provider
-   * <envoy_v3_api_field_extensions.transport_sockets.tls.v3.TlsCertificate.private_key_provider>` fields will result in an
-   * error.
-   */
-  'private_key_provider': (_envoy_extensions_transport_sockets_tls_v3_PrivateKeyProvider__Output | null);
-  /**
-   * If specified, updates of file-based *certificate_chain* and *private_key*
-   * sources will be triggered by this watch. The certificate/key pair will be
-   * read together and validated for atomic read consistency (i.e. no
-   * intervening modification occurred between cert/key read, verified by file
-   * hash comparisons). This allows explicit control over the path watched, by
-   * default the parent directories of the filesystem paths in
-   * *certificate_chain* and *private_key* are watched if this field is not
-   * specified. This only applies when a *TlsCertificate* is delivered by SDS
-   * with references to filesystem paths. See the :ref:`SDS key rotation
-   * <sds_key_rotation>` documentation for further details.
-   */
-  'watched_directory': (_envoy_config_core_v3_WatchedDirectory__Output | null);
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/TlsParameters.ts b/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/TlsParameters.ts
deleted file mode 100644
index e68464c8b..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/TlsParameters.ts
+++ /dev/null
@@ -1,211 +0,0 @@
-// Original file: deps/envoy-api/envoy/extensions/transport_sockets/tls/v3/common.proto
-
-
-// Original file: deps/envoy-api/envoy/extensions/transport_sockets/tls/v3/common.proto
-
-export enum _envoy_extensions_transport_sockets_tls_v3_TlsParameters_TlsProtocol {
-  /**
-   * Envoy will choose the optimal TLS version.
-   */
-  TLS_AUTO = 0,
-  /**
-   * TLS 1.0
-   */
-  TLSv1_0 = 1,
-  /**
-   * TLS 1.1
-   */
-  TLSv1_1 = 2,
-  /**
-   * TLS 1.2
-   */
-  TLSv1_2 = 3,
-  /**
-   * TLS 1.3
-   */
-  TLSv1_3 = 4,
-}
-
-export interface TlsParameters {
-  /**
-   * Minimum TLS protocol version. By default, it's ``TLSv1_2`` for clients and ``TLSv1_0`` for
-   * servers.
-   */
-  'tls_minimum_protocol_version'?: (_envoy_extensions_transport_sockets_tls_v3_TlsParameters_TlsProtocol | keyof typeof _envoy_extensions_transport_sockets_tls_v3_TlsParameters_TlsProtocol);
-  /**
-   * Maximum TLS protocol version. By default, it's ``TLSv1_2`` for clients and ``TLSv1_3`` for
-   * servers.
-   */
-  'tls_maximum_protocol_version'?: (_envoy_extensions_transport_sockets_tls_v3_TlsParameters_TlsProtocol | keyof typeof _envoy_extensions_transport_sockets_tls_v3_TlsParameters_TlsProtocol);
-  /**
-   * If specified, the TLS listener will only support the specified `cipher list
-   * <https://commondatastorage.googleapis.com/chromium-boringssl-docs/ssl.h.html#Cipher-suite-configuration>`_
-   * when negotiating TLS 1.0-1.2 (this setting has no effect when negotiating TLS 1.3).
-   * 
-   * If not specified, a default list will be used. Defaults are different for server (downstream) and
-   * client (upstream) TLS configurations.
-   * 
-   * In non-FIPS builds, the default server cipher list is:
-   * 
-   * .. code-block:: none
-   * 
-   * [ECDHE-ECDSA-AES128-GCM-SHA256|ECDHE-ECDSA-CHACHA20-POLY1305]
-   * [ECDHE-RSA-AES128-GCM-SHA256|ECDHE-RSA-CHACHA20-POLY1305]
-   * ECDHE-ECDSA-AES128-SHA
-   * ECDHE-RSA-AES128-SHA
-   * AES128-GCM-SHA256
-   * AES128-SHA
-   * ECDHE-ECDSA-AES256-GCM-SHA384
-   * ECDHE-RSA-AES256-GCM-SHA384
-   * ECDHE-ECDSA-AES256-SHA
-   * ECDHE-RSA-AES256-SHA
-   * AES256-GCM-SHA384
-   * AES256-SHA
-   * 
-   * In builds using :ref:`BoringSSL FIPS <arch_overview_ssl_fips>`, the default server cipher list is:
-   * 
-   * .. code-block:: none
-   * 
-   * ECDHE-ECDSA-AES128-GCM-SHA256
-   * ECDHE-RSA-AES128-GCM-SHA256
-   * ECDHE-ECDSA-AES128-SHA
-   * ECDHE-RSA-AES128-SHA
-   * AES128-GCM-SHA256
-   * AES128-SHA
-   * ECDHE-ECDSA-AES256-GCM-SHA384
-   * ECDHE-RSA-AES256-GCM-SHA384
-   * ECDHE-ECDSA-AES256-SHA
-   * ECDHE-RSA-AES256-SHA
-   * AES256-GCM-SHA384
-   * AES256-SHA
-   * 
-   * In non-FIPS builds, the default client cipher list is:
-   * 
-   * .. code-block:: none
-   * 
-   * [ECDHE-ECDSA-AES128-GCM-SHA256|ECDHE-ECDSA-CHACHA20-POLY1305]
-   * [ECDHE-RSA-AES128-GCM-SHA256|ECDHE-RSA-CHACHA20-POLY1305]
-   * ECDHE-ECDSA-AES256-GCM-SHA384
-   * ECDHE-RSA-AES256-GCM-SHA384
-   * 
-   * In builds using :ref:`BoringSSL FIPS <arch_overview_ssl_fips>`, the default client cipher list is:
-   * 
-   * .. code-block:: none
-   * 
-   * ECDHE-ECDSA-AES128-GCM-SHA256
-   * ECDHE-RSA-AES128-GCM-SHA256
-   * ECDHE-ECDSA-AES256-GCM-SHA384
-   * ECDHE-RSA-AES256-GCM-SHA384
-   */
-  'cipher_suites'?: (string)[];
-  /**
-   * If specified, the TLS connection will only support the specified ECDH
-   * curves. If not specified, the default curves will be used.
-   * 
-   * In non-FIPS builds, the default curves are:
-   * 
-   * .. code-block:: none
-   * 
-   * X25519
-   * P-256
-   * 
-   * In builds using :ref:`BoringSSL FIPS <arch_overview_ssl_fips>`, the default curve is:
-   * 
-   * .. code-block:: none
-   * 
-   * P-256
-   */
-  'ecdh_curves'?: (string)[];
-}
-
-export interface TlsParameters__Output {
-  /**
-   * Minimum TLS protocol version. By default, it's ``TLSv1_2`` for clients and ``TLSv1_0`` for
-   * servers.
-   */
-  'tls_minimum_protocol_version': (keyof typeof _envoy_extensions_transport_sockets_tls_v3_TlsParameters_TlsProtocol);
-  /**
-   * Maximum TLS protocol version. By default, it's ``TLSv1_2`` for clients and ``TLSv1_3`` for
-   * servers.
-   */
-  'tls_maximum_protocol_version': (keyof typeof _envoy_extensions_transport_sockets_tls_v3_TlsParameters_TlsProtocol);
-  /**
-   * If specified, the TLS listener will only support the specified `cipher list
-   * <https://commondatastorage.googleapis.com/chromium-boringssl-docs/ssl.h.html#Cipher-suite-configuration>`_
-   * when negotiating TLS 1.0-1.2 (this setting has no effect when negotiating TLS 1.3).
-   * 
-   * If not specified, a default list will be used. Defaults are different for server (downstream) and
-   * client (upstream) TLS configurations.
-   * 
-   * In non-FIPS builds, the default server cipher list is:
-   * 
-   * .. code-block:: none
-   * 
-   * [ECDHE-ECDSA-AES128-GCM-SHA256|ECDHE-ECDSA-CHACHA20-POLY1305]
-   * [ECDHE-RSA-AES128-GCM-SHA256|ECDHE-RSA-CHACHA20-POLY1305]
-   * ECDHE-ECDSA-AES128-SHA
-   * ECDHE-RSA-AES128-SHA
-   * AES128-GCM-SHA256
-   * AES128-SHA
-   * ECDHE-ECDSA-AES256-GCM-SHA384
-   * ECDHE-RSA-AES256-GCM-SHA384
-   * ECDHE-ECDSA-AES256-SHA
-   * ECDHE-RSA-AES256-SHA
-   * AES256-GCM-SHA384
-   * AES256-SHA
-   * 
-   * In builds using :ref:`BoringSSL FIPS <arch_overview_ssl_fips>`, the default server cipher list is:
-   * 
-   * .. code-block:: none
-   * 
-   * ECDHE-ECDSA-AES128-GCM-SHA256
-   * ECDHE-RSA-AES128-GCM-SHA256
-   * ECDHE-ECDSA-AES128-SHA
-   * ECDHE-RSA-AES128-SHA
-   * AES128-GCM-SHA256
-   * AES128-SHA
-   * ECDHE-ECDSA-AES256-GCM-SHA384
-   * ECDHE-RSA-AES256-GCM-SHA384
-   * ECDHE-ECDSA-AES256-SHA
-   * ECDHE-RSA-AES256-SHA
-   * AES256-GCM-SHA384
-   * AES256-SHA
-   * 
-   * In non-FIPS builds, the default client cipher list is:
-   * 
-   * .. code-block:: none
-   * 
-   * [ECDHE-ECDSA-AES128-GCM-SHA256|ECDHE-ECDSA-CHACHA20-POLY1305]
-   * [ECDHE-RSA-AES128-GCM-SHA256|ECDHE-RSA-CHACHA20-POLY1305]
-   * ECDHE-ECDSA-AES256-GCM-SHA384
-   * ECDHE-RSA-AES256-GCM-SHA384
-   * 
-   * In builds using :ref:`BoringSSL FIPS <arch_overview_ssl_fips>`, the default client cipher list is:
-   * 
-   * .. code-block:: none
-   * 
-   * ECDHE-ECDSA-AES128-GCM-SHA256
-   * ECDHE-RSA-AES128-GCM-SHA256
-   * ECDHE-ECDSA-AES256-GCM-SHA384
-   * ECDHE-RSA-AES256-GCM-SHA384
-   */
-  'cipher_suites': (string)[];
-  /**
-   * If specified, the TLS connection will only support the specified ECDH
-   * curves. If not specified, the default curves will be used.
-   * 
-   * In non-FIPS builds, the default curves are:
-   * 
-   * .. code-block:: none
-   * 
-   * X25519
-   * P-256
-   * 
-   * In builds using :ref:`BoringSSL FIPS <arch_overview_ssl_fips>`, the default curve is:
-   * 
-   * .. code-block:: none
-   * 
-   * P-256
-   */
-  'ecdh_curves': (string)[];
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/TlsSessionTicketKeys.ts b/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/TlsSessionTicketKeys.ts
deleted file mode 100644
index 152bccac7..000000000
--- a/packages/grpc-js-xds/src/generated/envoy/extensions/transport_sockets/tls/v3/TlsSessionTicketKeys.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-// Original file: deps/envoy-api/envoy/extensions/transport_sockets/tls/v3/common.proto
-
-import type { DataSource as _envoy_config_core_v3_DataSource, DataSource__Output as _envoy_config_core_v3_DataSource__Output } from '../../../../../envoy/config/core/v3/DataSource';
-
-export interface TlsSessionTicketKeys {
-  /**
-   * Keys for encrypting and decrypting TLS session tickets. The
-   * first key in the array contains the key to encrypt all new sessions created by this context.
-   * All keys are candidates for decrypting received tickets. This allows for easy rotation of keys
-   * by, for example, putting the new key first, and the previous key second.
-   * 
-   * If :ref:`session_ticket_keys <envoy_v3_api_field_extensions.transport_sockets.tls.v3.DownstreamTlsContext.session_ticket_keys>`
-   * is not specified, the TLS library will still support resuming sessions via tickets, but it will
-   * use an internally-generated and managed key, so sessions cannot be resumed across hot restarts
-   * or on different hosts.
-   * 
-   * Each key must contain exactly 80 bytes of cryptographically-secure random data. For
-   * example, the output of ``openssl rand 80``.
-   * 
-   * .. attention::
-   * 
-   * Using this feature has serious security considerations and risks. Improper handling of keys
-   * may result in loss of secrecy in connections, even if ciphers supporting perfect forward
-   * secrecy are used. See https://www.imperialviolet.org/2013/06/27/botchingpfs.html for some
-   * discussion. To minimize the risk, you must:
-   * 
-   * * Keep the session ticket keys at least as secure as your TLS certificate private keys
-   * * Rotate session ticket keys at least daily, and preferably hourly
-   * * Always generate keys using a cryptographically-secure random data source
-   */
-  'keys'?: (_envoy_config_core_v3_DataSource)[];
-}
-
-export interface TlsSessionTicketKeys__Output {
-  /**
-   * Keys for encrypting and decrypting TLS session tickets. The
-   * first key in the array contains the key to encrypt all new sessions created by this context.
-   * All keys are candidates for decrypting received tickets. This allows for easy rotation of keys
-   * by, for example, putting the new key first, and the previous key second.
-   * 
-   * If :ref:`session_ticket_keys <envoy_v3_api_field_extensions.transport_sockets.tls.v3.DownstreamTlsContext.session_ticket_keys>`
-   * is not specified, the TLS library will still support resuming sessions via tickets, but it will
-   * use an internally-generated and managed key, so sessions cannot be resumed across hot restarts
-   * or on different hosts.
-   * 
-   * Each key must contain exactly 80 bytes of cryptographically-secure random data. For
-   * example, the output of ``openssl rand 80``.
-   * 
-   * .. attention::
-   * 
-   * Using this feature has serious security considerations and risks. Improper handling of keys
-   * may result in loss of secrecy in connections, even if ciphers supporting perfect forward
-   * secrecy are used. See https://www.imperialviolet.org/2013/06/27/botchingpfs.html for some
-   * discussion. To minimize the risk, you must:
-   * 
-   * * Keep the session ticket keys at least as secure as your TLS certificate private keys
-   * * Rotate session ticket keys at least daily, and preferably hourly
-   * * Always generate keys using a cryptographically-secure random data source
-   */
-  'keys': (_envoy_config_core_v3_DataSource__Output)[];
-}
diff --git a/packages/grpc-js-xds/src/generated/envoy/service/status/v3/ClientConfig.ts b/packages/grpc-js-xds/src/generated/envoy/service/status/v3/ClientConfig.ts
index a4a8ab2fd..98521b6e3 100644
--- a/packages/grpc-js-xds/src/generated/envoy/service/status/v3/ClientConfig.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/service/status/v3/ClientConfig.ts
@@ -4,8 +4,8 @@ import type { Node as _envoy_config_core_v3_Node, Node__Output as _envoy_config_
 import type { PerXdsConfig as _envoy_service_status_v3_PerXdsConfig, PerXdsConfig__Output as _envoy_service_status_v3_PerXdsConfig__Output } from '../../../../envoy/service/status/v3/PerXdsConfig';
 import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../../google/protobuf/Any';
 import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../../google/protobuf/Timestamp';
-import type { ConfigStatus as _envoy_service_status_v3_ConfigStatus } from '../../../../envoy/service/status/v3/ConfigStatus';
-import type { ClientResourceStatus as _envoy_admin_v3_ClientResourceStatus } from '../../../../envoy/admin/v3/ClientResourceStatus';
+import type { ConfigStatus as _envoy_service_status_v3_ConfigStatus, ConfigStatus__Output as _envoy_service_status_v3_ConfigStatus__Output } from '../../../../envoy/service/status/v3/ConfigStatus';
+import type { ClientResourceStatus as _envoy_admin_v3_ClientResourceStatus, ClientResourceStatus__Output as _envoy_admin_v3_ClientResourceStatus__Output } from '../../../../envoy/admin/v3/ClientResourceStatus';
 import type { UpdateFailureState as _envoy_admin_v3_UpdateFailureState, UpdateFailureState__Output as _envoy_admin_v3_UpdateFailureState__Output } from '../../../../envoy/admin/v3/UpdateFailureState';
 
 /**
@@ -42,11 +42,11 @@ export interface _envoy_service_status_v3_ClientConfig_GenericXdsConfig {
    * Per xDS resource config status. It is generated by management servers.
    * It will not be present if the CSDS server is an xDS client.
    */
-  'config_status'?: (_envoy_service_status_v3_ConfigStatus | keyof typeof _envoy_service_status_v3_ConfigStatus);
+  'config_status'?: (_envoy_service_status_v3_ConfigStatus);
   /**
    * Per xDS resource status from the view of a xDS client
    */
-  'client_status'?: (_envoy_admin_v3_ClientResourceStatus | keyof typeof _envoy_admin_v3_ClientResourceStatus);
+  'client_status'?: (_envoy_admin_v3_ClientResourceStatus);
   /**
    * Set if the last update failed, cleared after the next successful
    * update. The *error_state* field contains the rejected version of
@@ -97,11 +97,11 @@ export interface _envoy_service_status_v3_ClientConfig_GenericXdsConfig__Output
    * Per xDS resource config status. It is generated by management servers.
    * It will not be present if the CSDS server is an xDS client.
    */
-  'config_status': (keyof typeof _envoy_service_status_v3_ConfigStatus);
+  'config_status': (_envoy_service_status_v3_ConfigStatus__Output);
   /**
    * Per xDS resource status from the view of a xDS client
    */
-  'client_status': (keyof typeof _envoy_admin_v3_ClientResourceStatus);
+  'client_status': (_envoy_admin_v3_ClientResourceStatus__Output);
   /**
    * Set if the last update failed, cleared after the next successful
    * update. The *error_state* field contains the rejected version of
@@ -129,6 +129,7 @@ export interface ClientConfig {
   /**
    * This field is deprecated in favor of generic_xds_configs which is
    * much simpler and uniform in structure.
+   * @deprecated
    */
   'xds_config'?: (_envoy_service_status_v3_PerXdsConfig)[];
   /**
@@ -155,6 +156,7 @@ export interface ClientConfig__Output {
   /**
    * This field is deprecated in favor of generic_xds_configs which is
    * much simpler and uniform in structure.
+   * @deprecated
    */
   'xds_config': (_envoy_service_status_v3_PerXdsConfig__Output)[];
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/service/status/v3/ClientConfigStatus.ts b/packages/grpc-js-xds/src/generated/envoy/service/status/v3/ClientConfigStatus.ts
index 104445a3f..be7a7afd0 100644
--- a/packages/grpc-js-xds/src/generated/envoy/service/status/v3/ClientConfigStatus.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/service/status/v3/ClientConfigStatus.ts
@@ -3,24 +3,57 @@
 /**
  * Config status from a client-side view.
  */
-export enum ClientConfigStatus {
+export const ClientConfigStatus = {
   /**
    * Config status is not available/unknown.
    */
-  CLIENT_UNKNOWN = 0,
+  CLIENT_UNKNOWN: 'CLIENT_UNKNOWN',
   /**
    * Client requested the config but hasn't received any config from management
    * server yet.
    */
-  CLIENT_REQUESTED = 1,
+  CLIENT_REQUESTED: 'CLIENT_REQUESTED',
   /**
    * Client received the config and replied with ACK.
    */
-  CLIENT_ACKED = 2,
+  CLIENT_ACKED: 'CLIENT_ACKED',
   /**
    * Client received the config and replied with NACK. Notably, the attached
    * config dump is not the NACKed version, but the most recent accepted one. If
    * no config is accepted yet, the attached config dump will be empty.
    */
-  CLIENT_NACKED = 3,
-}
+  CLIENT_NACKED: 'CLIENT_NACKED',
+} as const;
+
+/**
+ * Config status from a client-side view.
+ */
+export type ClientConfigStatus =
+  /**
+   * Config status is not available/unknown.
+   */
+  | 'CLIENT_UNKNOWN'
+  | 0
+  /**
+   * Client requested the config but hasn't received any config from management
+   * server yet.
+   */
+  | 'CLIENT_REQUESTED'
+  | 1
+  /**
+   * Client received the config and replied with ACK.
+   */
+  | 'CLIENT_ACKED'
+  | 2
+  /**
+   * Client received the config and replied with NACK. Notably, the attached
+   * config dump is not the NACKed version, but the most recent accepted one. If
+   * no config is accepted yet, the attached config dump will be empty.
+   */
+  | 'CLIENT_NACKED'
+  | 3
+
+/**
+ * Config status from a client-side view.
+ */
+export type ClientConfigStatus__Output = typeof ClientConfigStatus[keyof typeof ClientConfigStatus]
diff --git a/packages/grpc-js-xds/src/generated/envoy/service/status/v3/ConfigStatus.ts b/packages/grpc-js-xds/src/generated/envoy/service/status/v3/ConfigStatus.ts
index 71db302c3..15a8359e8 100644
--- a/packages/grpc-js-xds/src/generated/envoy/service/status/v3/ConfigStatus.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/service/status/v3/ConfigStatus.ts
@@ -3,28 +3,66 @@
 /**
  * Status of a config from a management server view.
  */
-export enum ConfigStatus {
+export const ConfigStatus = {
   /**
    * Status info is not available/unknown.
    */
-  UNKNOWN = 0,
+  UNKNOWN: 'UNKNOWN',
   /**
    * Management server has sent the config to client and received ACK.
    */
-  SYNCED = 1,
+  SYNCED: 'SYNCED',
   /**
    * Config is not sent.
    */
-  NOT_SENT = 2,
+  NOT_SENT: 'NOT_SENT',
   /**
    * Management server has sent the config to client but hasn’t received
    * ACK/NACK.
    */
-  STALE = 3,
+  STALE: 'STALE',
   /**
    * Management server has sent the config to client but received NACK. The
    * attached config dump will be the latest config (the rejected one), since
    * it is the persisted version in the management server.
    */
-  ERROR = 4,
-}
+  ERROR: 'ERROR',
+} as const;
+
+/**
+ * Status of a config from a management server view.
+ */
+export type ConfigStatus =
+  /**
+   * Status info is not available/unknown.
+   */
+  | 'UNKNOWN'
+  | 0
+  /**
+   * Management server has sent the config to client and received ACK.
+   */
+  | 'SYNCED'
+  | 1
+  /**
+   * Config is not sent.
+   */
+  | 'NOT_SENT'
+  | 2
+  /**
+   * Management server has sent the config to client but hasn’t received
+   * ACK/NACK.
+   */
+  | 'STALE'
+  | 3
+  /**
+   * Management server has sent the config to client but received NACK. The
+   * attached config dump will be the latest config (the rejected one), since
+   * it is the persisted version in the management server.
+   */
+  | 'ERROR'
+  | 4
+
+/**
+ * Status of a config from a management server view.
+ */
+export type ConfigStatus__Output = typeof ConfigStatus[keyof typeof ConfigStatus]
diff --git a/packages/grpc-js-xds/src/generated/envoy/service/status/v3/PerXdsConfig.ts b/packages/grpc-js-xds/src/generated/envoy/service/status/v3/PerXdsConfig.ts
index 947f1c81a..d921f3b1c 100644
--- a/packages/grpc-js-xds/src/generated/envoy/service/status/v3/PerXdsConfig.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/service/status/v3/PerXdsConfig.ts
@@ -1,12 +1,12 @@
 // Original file: deps/envoy-api/envoy/service/status/v3/csds.proto
 
-import type { ConfigStatus as _envoy_service_status_v3_ConfigStatus } from '../../../../envoy/service/status/v3/ConfigStatus';
+import type { ConfigStatus as _envoy_service_status_v3_ConfigStatus, ConfigStatus__Output as _envoy_service_status_v3_ConfigStatus__Output } from '../../../../envoy/service/status/v3/ConfigStatus';
 import type { ListenersConfigDump as _envoy_admin_v3_ListenersConfigDump, ListenersConfigDump__Output as _envoy_admin_v3_ListenersConfigDump__Output } from '../../../../envoy/admin/v3/ListenersConfigDump';
 import type { ClustersConfigDump as _envoy_admin_v3_ClustersConfigDump, ClustersConfigDump__Output as _envoy_admin_v3_ClustersConfigDump__Output } from '../../../../envoy/admin/v3/ClustersConfigDump';
 import type { RoutesConfigDump as _envoy_admin_v3_RoutesConfigDump, RoutesConfigDump__Output as _envoy_admin_v3_RoutesConfigDump__Output } from '../../../../envoy/admin/v3/RoutesConfigDump';
 import type { ScopedRoutesConfigDump as _envoy_admin_v3_ScopedRoutesConfigDump, ScopedRoutesConfigDump__Output as _envoy_admin_v3_ScopedRoutesConfigDump__Output } from '../../../../envoy/admin/v3/ScopedRoutesConfigDump';
 import type { EndpointsConfigDump as _envoy_admin_v3_EndpointsConfigDump, EndpointsConfigDump__Output as _envoy_admin_v3_EndpointsConfigDump__Output } from '../../../../envoy/admin/v3/EndpointsConfigDump';
-import type { ClientConfigStatus as _envoy_service_status_v3_ClientConfigStatus } from '../../../../envoy/service/status/v3/ClientConfigStatus';
+import type { ClientConfigStatus as _envoy_service_status_v3_ClientConfigStatus, ClientConfigStatus__Output as _envoy_service_status_v3_ClientConfigStatus__Output } from '../../../../envoy/service/status/v3/ClientConfigStatus';
 
 /**
  * Detailed config (per xDS) with status.
@@ -17,7 +17,7 @@ export interface PerXdsConfig {
    * Config status generated by management servers. Will not be present if the
    * CSDS server is an xDS client.
    */
-  'status'?: (_envoy_service_status_v3_ConfigStatus | keyof typeof _envoy_service_status_v3_ConfigStatus);
+  'status'?: (_envoy_service_status_v3_ConfigStatus);
   'listener_config'?: (_envoy_admin_v3_ListenersConfigDump | null);
   'cluster_config'?: (_envoy_admin_v3_ClustersConfigDump | null);
   'route_config'?: (_envoy_admin_v3_RoutesConfigDump | null);
@@ -32,8 +32,9 @@ export interface PerXdsConfig {
    * This field is deprecated. Use :ref:`ClientResourceStatus
    * <envoy_v3_api_enum_admin.v3.ClientResourceStatus>` for per-resource
    * config status instead.
+   * @deprecated
    */
-  'client_status'?: (_envoy_service_status_v3_ClientConfigStatus | keyof typeof _envoy_service_status_v3_ClientConfigStatus);
+  'client_status'?: (_envoy_service_status_v3_ClientConfigStatus);
   'per_xds_config'?: "listener_config"|"cluster_config"|"route_config"|"scoped_route_config"|"endpoint_config";
 }
 
@@ -46,7 +47,7 @@ export interface PerXdsConfig__Output {
    * Config status generated by management servers. Will not be present if the
    * CSDS server is an xDS client.
    */
-  'status': (keyof typeof _envoy_service_status_v3_ConfigStatus);
+  'status': (_envoy_service_status_v3_ConfigStatus__Output);
   'listener_config'?: (_envoy_admin_v3_ListenersConfigDump__Output | null);
   'cluster_config'?: (_envoy_admin_v3_ClustersConfigDump__Output | null);
   'route_config'?: (_envoy_admin_v3_RoutesConfigDump__Output | null);
@@ -61,7 +62,8 @@ export interface PerXdsConfig__Output {
    * This field is deprecated. Use :ref:`ClientResourceStatus
    * <envoy_v3_api_enum_admin.v3.ClientResourceStatus>` for per-resource
    * config status instead.
+   * @deprecated
    */
-  'client_status': (keyof typeof _envoy_service_status_v3_ClientConfigStatus);
+  'client_status': (_envoy_service_status_v3_ClientConfigStatus__Output);
   'per_xds_config': "listener_config"|"cluster_config"|"route_config"|"scoped_route_config"|"endpoint_config";
 }
diff --git a/packages/grpc-js-xds/src/generated/envoy/type/matcher/v3/RegexMatcher.ts b/packages/grpc-js-xds/src/generated/envoy/type/matcher/v3/RegexMatcher.ts
index c83f8b473..19517678f 100644
--- a/packages/grpc-js-xds/src/generated/envoy/type/matcher/v3/RegexMatcher.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/type/matcher/v3/RegexMatcher.ts
@@ -31,6 +31,7 @@ export interface _envoy_type_matcher_v3_RegexMatcher_GoogleRE2 {
    * 
    * Although this field is deprecated, the program size will still be checked against the
    * global ``re2.max_program_size.error_level`` runtime value.
+   * @deprecated
    */
   'max_program_size'?: (_google_protobuf_UInt32Value | null);
 }
@@ -64,6 +65,7 @@ export interface _envoy_type_matcher_v3_RegexMatcher_GoogleRE2__Output {
    * 
    * Although this field is deprecated, the program size will still be checked against the
    * global ``re2.max_program_size.error_level`` runtime value.
+   * @deprecated
    */
   'max_program_size': (_google_protobuf_UInt32Value__Output | null);
 }
@@ -74,6 +76,7 @@ export interface _envoy_type_matcher_v3_RegexMatcher_GoogleRE2__Output {
 export interface RegexMatcher {
   /**
    * Google's RE2 regex engine.
+   * @deprecated
    */
   'google_re2'?: (_envoy_type_matcher_v3_RegexMatcher_GoogleRE2 | null);
   /**
@@ -90,6 +93,7 @@ export interface RegexMatcher {
 export interface RegexMatcher__Output {
   /**
    * Google's RE2 regex engine.
+   * @deprecated
    */
   'google_re2'?: (_envoy_type_matcher_v3_RegexMatcher_GoogleRE2__Output | null);
   /**
diff --git a/packages/grpc-js-xds/src/generated/envoy/type/v3/CodecClientType.ts b/packages/grpc-js-xds/src/generated/envoy/type/v3/CodecClientType.ts
index 308f14446..e05cdfb96 100644
--- a/packages/grpc-js-xds/src/generated/envoy/type/v3/CodecClientType.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/type/v3/CodecClientType.ts
@@ -1,12 +1,27 @@
 // Original file: deps/envoy-api/envoy/type/v3/http.proto
 
-export enum CodecClientType {
-  HTTP1 = 0,
-  HTTP2 = 1,
+export const CodecClientType = {
+  HTTP1: 'HTTP1',
+  HTTP2: 'HTTP2',
   /**
    * [#not-implemented-hide:] QUIC implementation is not production ready yet. Use this enum with
    * caution to prevent accidental execution of QUIC code. I.e. `!= HTTP2` is no longer sufficient
    * to distinguish HTTP1 and HTTP2 traffic.
    */
-  HTTP3 = 2,
-}
+  HTTP3: 'HTTP3',
+} as const;
+
+export type CodecClientType =
+  | 'HTTP1'
+  | 0
+  | 'HTTP2'
+  | 1
+  /**
+   * [#not-implemented-hide:] QUIC implementation is not production ready yet. Use this enum with
+   * caution to prevent accidental execution of QUIC code. I.e. `!= HTTP2` is no longer sufficient
+   * to distinguish HTTP1 and HTTP2 traffic.
+   */
+  | 'HTTP3'
+  | 2
+
+export type CodecClientType__Output = typeof CodecClientType[keyof typeof CodecClientType]
diff --git a/packages/grpc-js-xds/src/generated/envoy/type/v3/FractionalPercent.ts b/packages/grpc-js-xds/src/generated/envoy/type/v3/FractionalPercent.ts
index 564af9a0f..c45441a79 100644
--- a/packages/grpc-js-xds/src/generated/envoy/type/v3/FractionalPercent.ts
+++ b/packages/grpc-js-xds/src/generated/envoy/type/v3/FractionalPercent.ts
@@ -6,26 +6,57 @@
 /**
  * Fraction percentages support several fixed denominator values.
  */
-export enum _envoy_type_v3_FractionalPercent_DenominatorType {
+export const _envoy_type_v3_FractionalPercent_DenominatorType = {
   /**
    * 100.
    * 
    * **Example**: 1/100 = 1%.
    */
-  HUNDRED = 0,
+  HUNDRED: 'HUNDRED',
   /**
    * 10,000.
    * 
    * **Example**: 1/10000 = 0.01%.
    */
-  TEN_THOUSAND = 1,
+  TEN_THOUSAND: 'TEN_THOUSAND',
   /**
    * 1,000,000.
    * 
    * **Example**: 1/1000000 = 0.0001%.
    */
-  MILLION = 2,
-}
+  MILLION: 'MILLION',
+} as const;
+
+/**
+ * Fraction percentages support several fixed denominator values.
+ */
+export type _envoy_type_v3_FractionalPercent_DenominatorType =
+  /**
+   * 100.
+   * 
+   * **Example**: 1/100 = 1%.
+   */
+  | 'HUNDRED'
+  | 0
+  /**
+   * 10,000.
+   * 
+   * **Example**: 1/10000 = 0.01%.
+   */
+  | 'TEN_THOUSAND'
+  | 1
+  /**
+   * 1,000,000.
+   * 
+   * **Example**: 1/1000000 = 0.0001%.
+   */
+  | 'MILLION'
+  | 2
+
+/**
+ * Fraction percentages support several fixed denominator values.
+ */
+export type _envoy_type_v3_FractionalPercent_DenominatorType__Output = typeof _envoy_type_v3_FractionalPercent_DenominatorType[keyof typeof _envoy_type_v3_FractionalPercent_DenominatorType]
 
 /**
  * A fractional percentage is used in cases in which for performance reasons performing floating
@@ -44,7 +75,7 @@ export interface FractionalPercent {
    * Specifies the denominator. If the denominator specified is less than the numerator, the final
    * fractional percentage is capped at 1 (100%).
    */
-  'denominator'?: (_envoy_type_v3_FractionalPercent_DenominatorType | keyof typeof _envoy_type_v3_FractionalPercent_DenominatorType);
+  'denominator'?: (_envoy_type_v3_FractionalPercent_DenominatorType);
 }
 
 /**
@@ -64,5 +95,5 @@ export interface FractionalPercent__Output {
    * Specifies the denominator. If the denominator specified is less than the numerator, the final
    * fractional percentage is capped at 1 (100%).
    */
-  'denominator': (keyof typeof _envoy_type_v3_FractionalPercent_DenominatorType);
+  'denominator': (_envoy_type_v3_FractionalPercent_DenominatorType__Output);
 }
diff --git a/packages/grpc-js-xds/src/generated/google/protobuf/FieldDescriptorProto.ts b/packages/grpc-js-xds/src/generated/google/protobuf/FieldDescriptorProto.ts
index c511e2eff..4951919fd 100644
--- a/packages/grpc-js-xds/src/generated/google/protobuf/FieldDescriptorProto.ts
+++ b/packages/grpc-js-xds/src/generated/google/protobuf/FieldDescriptorProto.ts
@@ -4,41 +4,91 @@ import type { FieldOptions as _google_protobuf_FieldOptions, FieldOptions__Outpu
 
 // Original file: null
 
-export enum _google_protobuf_FieldDescriptorProto_Label {
-  LABEL_OPTIONAL = 1,
-  LABEL_REQUIRED = 2,
-  LABEL_REPEATED = 3,
-}
+export const _google_protobuf_FieldDescriptorProto_Label = {
+  LABEL_OPTIONAL: 'LABEL_OPTIONAL',
+  LABEL_REQUIRED: 'LABEL_REQUIRED',
+  LABEL_REPEATED: 'LABEL_REPEATED',
+} as const;
+
+export type _google_protobuf_FieldDescriptorProto_Label =
+  | 'LABEL_OPTIONAL'
+  | 1
+  | 'LABEL_REQUIRED'
+  | 2
+  | 'LABEL_REPEATED'
+  | 3
+
+export type _google_protobuf_FieldDescriptorProto_Label__Output = typeof _google_protobuf_FieldDescriptorProto_Label[keyof typeof _google_protobuf_FieldDescriptorProto_Label]
 
 // Original file: null
 
-export enum _google_protobuf_FieldDescriptorProto_Type {
-  TYPE_DOUBLE = 1,
-  TYPE_FLOAT = 2,
-  TYPE_INT64 = 3,
-  TYPE_UINT64 = 4,
-  TYPE_INT32 = 5,
-  TYPE_FIXED64 = 6,
-  TYPE_FIXED32 = 7,
-  TYPE_BOOL = 8,
-  TYPE_STRING = 9,
-  TYPE_GROUP = 10,
-  TYPE_MESSAGE = 11,
-  TYPE_BYTES = 12,
-  TYPE_UINT32 = 13,
-  TYPE_ENUM = 14,
-  TYPE_SFIXED32 = 15,
-  TYPE_SFIXED64 = 16,
-  TYPE_SINT32 = 17,
-  TYPE_SINT64 = 18,
-}
+export const _google_protobuf_FieldDescriptorProto_Type = {
+  TYPE_DOUBLE: 'TYPE_DOUBLE',
+  TYPE_FLOAT: 'TYPE_FLOAT',
+  TYPE_INT64: 'TYPE_INT64',
+  TYPE_UINT64: 'TYPE_UINT64',
+  TYPE_INT32: 'TYPE_INT32',
+  TYPE_FIXED64: 'TYPE_FIXED64',
+  TYPE_FIXED32: 'TYPE_FIXED32',
+  TYPE_BOOL: 'TYPE_BOOL',
+  TYPE_STRING: 'TYPE_STRING',
+  TYPE_GROUP: 'TYPE_GROUP',
+  TYPE_MESSAGE: 'TYPE_MESSAGE',
+  TYPE_BYTES: 'TYPE_BYTES',
+  TYPE_UINT32: 'TYPE_UINT32',
+  TYPE_ENUM: 'TYPE_ENUM',
+  TYPE_SFIXED32: 'TYPE_SFIXED32',
+  TYPE_SFIXED64: 'TYPE_SFIXED64',
+  TYPE_SINT32: 'TYPE_SINT32',
+  TYPE_SINT64: 'TYPE_SINT64',
+} as const;
+
+export type _google_protobuf_FieldDescriptorProto_Type =
+  | 'TYPE_DOUBLE'
+  | 1
+  | 'TYPE_FLOAT'
+  | 2
+  | 'TYPE_INT64'
+  | 3
+  | 'TYPE_UINT64'
+  | 4
+  | 'TYPE_INT32'
+  | 5
+  | 'TYPE_FIXED64'
+  | 6
+  | 'TYPE_FIXED32'
+  | 7
+  | 'TYPE_BOOL'
+  | 8
+  | 'TYPE_STRING'
+  | 9
+  | 'TYPE_GROUP'
+  | 10
+  | 'TYPE_MESSAGE'
+  | 11
+  | 'TYPE_BYTES'
+  | 12
+  | 'TYPE_UINT32'
+  | 13
+  | 'TYPE_ENUM'
+  | 14
+  | 'TYPE_SFIXED32'
+  | 15
+  | 'TYPE_SFIXED64'
+  | 16
+  | 'TYPE_SINT32'
+  | 17
+  | 'TYPE_SINT64'
+  | 18
+
+export type _google_protobuf_FieldDescriptorProto_Type__Output = typeof _google_protobuf_FieldDescriptorProto_Type[keyof typeof _google_protobuf_FieldDescriptorProto_Type]
 
 export interface FieldDescriptorProto {
   'name'?: (string);
   'extendee'?: (string);
   'number'?: (number);
-  'label'?: (_google_protobuf_FieldDescriptorProto_Label | keyof typeof _google_protobuf_FieldDescriptorProto_Label);
-  'type'?: (_google_protobuf_FieldDescriptorProto_Type | keyof typeof _google_protobuf_FieldDescriptorProto_Type);
+  'label'?: (_google_protobuf_FieldDescriptorProto_Label);
+  'type'?: (_google_protobuf_FieldDescriptorProto_Type);
   'typeName'?: (string);
   'defaultValue'?: (string);
   'options'?: (_google_protobuf_FieldOptions | null);
@@ -50,8 +100,8 @@ export interface FieldDescriptorProto__Output {
   'name': (string);
   'extendee': (string);
   'number': (number);
-  'label': (keyof typeof _google_protobuf_FieldDescriptorProto_Label);
-  'type': (keyof typeof _google_protobuf_FieldDescriptorProto_Type);
+  'label': (_google_protobuf_FieldDescriptorProto_Label__Output);
+  'type': (_google_protobuf_FieldDescriptorProto_Type__Output);
   'typeName': (string);
   'defaultValue': (string);
   'options': (_google_protobuf_FieldOptions__Output | null);
diff --git a/packages/grpc-js-xds/src/generated/google/protobuf/FieldOptions.ts b/packages/grpc-js-xds/src/generated/google/protobuf/FieldOptions.ts
index 3c3b446c9..b301f2958 100644
--- a/packages/grpc-js-xds/src/generated/google/protobuf/FieldOptions.ts
+++ b/packages/grpc-js-xds/src/generated/google/protobuf/FieldOptions.ts
@@ -4,36 +4,56 @@ import type { UninterpretedOption as _google_protobuf_UninterpretedOption, Unint
 
 // Original file: null
 
-export enum _google_protobuf_FieldOptions_CType {
-  STRING = 0,
-  CORD = 1,
-  STRING_PIECE = 2,
-}
+export const _google_protobuf_FieldOptions_CType = {
+  STRING: 'STRING',
+  CORD: 'CORD',
+  STRING_PIECE: 'STRING_PIECE',
+} as const;
+
+export type _google_protobuf_FieldOptions_CType =
+  | 'STRING'
+  | 0
+  | 'CORD'
+  | 1
+  | 'STRING_PIECE'
+  | 2
+
+export type _google_protobuf_FieldOptions_CType__Output = typeof _google_protobuf_FieldOptions_CType[keyof typeof _google_protobuf_FieldOptions_CType]
 
 // Original file: null
 
-export enum _google_protobuf_FieldOptions_JSType {
-  JS_NORMAL = 0,
-  JS_STRING = 1,
-  JS_NUMBER = 2,
-}
+export const _google_protobuf_FieldOptions_JSType = {
+  JS_NORMAL: 'JS_NORMAL',
+  JS_STRING: 'JS_STRING',
+  JS_NUMBER: 'JS_NUMBER',
+} as const;
+
+export type _google_protobuf_FieldOptions_JSType =
+  | 'JS_NORMAL'
+  | 0
+  | 'JS_STRING'
+  | 1
+  | 'JS_NUMBER'
+  | 2
+
+export type _google_protobuf_FieldOptions_JSType__Output = typeof _google_protobuf_FieldOptions_JSType[keyof typeof _google_protobuf_FieldOptions_JSType]
 
 export interface FieldOptions {
-  'ctype'?: (_google_protobuf_FieldOptions_CType | keyof typeof _google_protobuf_FieldOptions_CType);
+  'ctype'?: (_google_protobuf_FieldOptions_CType);
   'packed'?: (boolean);
   'deprecated'?: (boolean);
   'lazy'?: (boolean);
-  'jstype'?: (_google_protobuf_FieldOptions_JSType | keyof typeof _google_protobuf_FieldOptions_JSType);
+  'jstype'?: (_google_protobuf_FieldOptions_JSType);
   'weak'?: (boolean);
   'uninterpretedOption'?: (_google_protobuf_UninterpretedOption)[];
 }
 
 export interface FieldOptions__Output {
-  'ctype': (keyof typeof _google_protobuf_FieldOptions_CType);
+  'ctype': (_google_protobuf_FieldOptions_CType__Output);
   'packed': (boolean);
   'deprecated': (boolean);
   'lazy': (boolean);
-  'jstype': (keyof typeof _google_protobuf_FieldOptions_JSType);
+  'jstype': (_google_protobuf_FieldOptions_JSType__Output);
   'weak': (boolean);
   'uninterpretedOption': (_google_protobuf_UninterpretedOption__Output)[];
 }
diff --git a/packages/grpc-js-xds/src/generated/google/protobuf/FileOptions.ts b/packages/grpc-js-xds/src/generated/google/protobuf/FileOptions.ts
index 84500fc30..6fab1a84b 100644
--- a/packages/grpc-js-xds/src/generated/google/protobuf/FileOptions.ts
+++ b/packages/grpc-js-xds/src/generated/google/protobuf/FileOptions.ts
@@ -5,21 +5,34 @@ import type { StatusAnnotation as _udpa_annotations_StatusAnnotation, StatusAnno
 
 // Original file: null
 
-export enum _google_protobuf_FileOptions_OptimizeMode {
-  SPEED = 1,
-  CODE_SIZE = 2,
-  LITE_RUNTIME = 3,
-}
+export const _google_protobuf_FileOptions_OptimizeMode = {
+  SPEED: 'SPEED',
+  CODE_SIZE: 'CODE_SIZE',
+  LITE_RUNTIME: 'LITE_RUNTIME',
+} as const;
+
+export type _google_protobuf_FileOptions_OptimizeMode =
+  | 'SPEED'
+  | 1
+  | 'CODE_SIZE'
+  | 2
+  | 'LITE_RUNTIME'
+  | 3
+
+export type _google_protobuf_FileOptions_OptimizeMode__Output = typeof _google_protobuf_FileOptions_OptimizeMode[keyof typeof _google_protobuf_FileOptions_OptimizeMode]
 
 export interface FileOptions {
   'javaPackage'?: (string);
   'javaOuterClassname'?: (string);
-  'optimizeFor'?: (_google_protobuf_FileOptions_OptimizeMode | keyof typeof _google_protobuf_FileOptions_OptimizeMode);
+  'optimizeFor'?: (_google_protobuf_FileOptions_OptimizeMode);
   'javaMultipleFiles'?: (boolean);
   'goPackage'?: (string);
   'ccGenericServices'?: (boolean);
   'javaGenericServices'?: (boolean);
   'pyGenericServices'?: (boolean);
+  /**
+   * @deprecated
+   */
   'javaGenerateEqualsAndHash'?: (boolean);
   'deprecated'?: (boolean);
   'javaStringCheckUtf8'?: (boolean);
@@ -33,12 +46,15 @@ export interface FileOptions {
 export interface FileOptions__Output {
   'javaPackage': (string);
   'javaOuterClassname': (string);
-  'optimizeFor': (keyof typeof _google_protobuf_FileOptions_OptimizeMode);
+  'optimizeFor': (_google_protobuf_FileOptions_OptimizeMode__Output);
   'javaMultipleFiles': (boolean);
   'goPackage': (string);
   'ccGenericServices': (boolean);
   'javaGenericServices': (boolean);
   'pyGenericServices': (boolean);
+  /**
+   * @deprecated
+   */
   'javaGenerateEqualsAndHash': (boolean);
   'deprecated': (boolean);
   'javaStringCheckUtf8': (boolean);
diff --git a/packages/grpc-js-xds/src/generated/google/protobuf/NullValue.ts b/packages/grpc-js-xds/src/generated/google/protobuf/NullValue.ts
index 377aab885..c66dacc7b 100644
--- a/packages/grpc-js-xds/src/generated/google/protobuf/NullValue.ts
+++ b/packages/grpc-js-xds/src/generated/google/protobuf/NullValue.ts
@@ -1,5 +1,11 @@
 // Original file: null
 
-export enum NullValue {
-  NULL_VALUE = 0,
-}
+export const NullValue = {
+  NULL_VALUE: 'NULL_VALUE',
+} as const;
+
+export type NullValue =
+  | 'NULL_VALUE'
+  | 0
+
+export type NullValue__Output = typeof NullValue[keyof typeof NullValue]
diff --git a/packages/grpc-js-xds/src/generated/google/protobuf/Value.ts b/packages/grpc-js-xds/src/generated/google/protobuf/Value.ts
index b1a942a56..67cc03fff 100644
--- a/packages/grpc-js-xds/src/generated/google/protobuf/Value.ts
+++ b/packages/grpc-js-xds/src/generated/google/protobuf/Value.ts
@@ -1,11 +1,11 @@
 // Original file: null
 
-import type { NullValue as _google_protobuf_NullValue } from '../../google/protobuf/NullValue';
+import type { NullValue as _google_protobuf_NullValue, NullValue__Output as _google_protobuf_NullValue__Output } from '../../google/protobuf/NullValue';
 import type { Struct as _google_protobuf_Struct, Struct__Output as _google_protobuf_Struct__Output } from '../../google/protobuf/Struct';
 import type { ListValue as _google_protobuf_ListValue, ListValue__Output as _google_protobuf_ListValue__Output } from '../../google/protobuf/ListValue';
 
 export interface Value {
-  'nullValue'?: (_google_protobuf_NullValue | keyof typeof _google_protobuf_NullValue);
+  'nullValue'?: (_google_protobuf_NullValue);
   'numberValue'?: (number | string);
   'stringValue'?: (string);
   'boolValue'?: (boolean);
@@ -15,7 +15,7 @@ export interface Value {
 }
 
 export interface Value__Output {
-  'nullValue'?: (keyof typeof _google_protobuf_NullValue);
+  'nullValue'?: (_google_protobuf_NullValue__Output);
   'numberValue'?: (number);
   'stringValue'?: (string);
   'boolValue'?: (boolean);
diff --git a/packages/grpc-js-xds/src/generated/udpa/annotations/PackageVersionStatus.ts b/packages/grpc-js-xds/src/generated/udpa/annotations/PackageVersionStatus.ts
index d0e181aa5..4d15df739 100644
--- a/packages/grpc-js-xds/src/generated/udpa/annotations/PackageVersionStatus.ts
+++ b/packages/grpc-js-xds/src/generated/udpa/annotations/PackageVersionStatus.ts
@@ -1,21 +1,46 @@
 // Original file: deps/xds/udpa/annotations/status.proto
 
-export enum PackageVersionStatus {
+export const PackageVersionStatus = {
   /**
    * Unknown package version status.
    */
-  UNKNOWN = 0,
+  UNKNOWN: 'UNKNOWN',
   /**
    * This version of the package is frozen.
    */
-  FROZEN = 1,
+  FROZEN: 'FROZEN',
   /**
    * This version of the package is the active development version.
    */
-  ACTIVE = 2,
+  ACTIVE: 'ACTIVE',
   /**
    * This version of the package is the candidate for the next major version. It
    * is typically machine generated from the active development version.
    */
-  NEXT_MAJOR_VERSION_CANDIDATE = 3,
-}
+  NEXT_MAJOR_VERSION_CANDIDATE: 'NEXT_MAJOR_VERSION_CANDIDATE',
+} as const;
+
+export type PackageVersionStatus =
+  /**
+   * Unknown package version status.
+   */
+  | 'UNKNOWN'
+  | 0
+  /**
+   * This version of the package is frozen.
+   */
+  | 'FROZEN'
+  | 1
+  /**
+   * This version of the package is the active development version.
+   */
+  | 'ACTIVE'
+  | 2
+  /**
+   * This version of the package is the candidate for the next major version. It
+   * is typically machine generated from the active development version.
+   */
+  | 'NEXT_MAJOR_VERSION_CANDIDATE'
+  | 3
+
+export type PackageVersionStatus__Output = typeof PackageVersionStatus[keyof typeof PackageVersionStatus]
diff --git a/packages/grpc-js-xds/src/generated/udpa/annotations/StatusAnnotation.ts b/packages/grpc-js-xds/src/generated/udpa/annotations/StatusAnnotation.ts
index f01b45063..f129c3c94 100644
--- a/packages/grpc-js-xds/src/generated/udpa/annotations/StatusAnnotation.ts
+++ b/packages/grpc-js-xds/src/generated/udpa/annotations/StatusAnnotation.ts
@@ -1,6 +1,6 @@
 // Original file: deps/xds/udpa/annotations/status.proto
 
-import type { PackageVersionStatus as _udpa_annotations_PackageVersionStatus } from '../../udpa/annotations/PackageVersionStatus';
+import type { PackageVersionStatus as _udpa_annotations_PackageVersionStatus, PackageVersionStatus__Output as _udpa_annotations_PackageVersionStatus__Output } from '../../udpa/annotations/PackageVersionStatus';
 
 export interface StatusAnnotation {
   /**
@@ -10,7 +10,7 @@ export interface StatusAnnotation {
   /**
    * The entity belongs to a package with the given version status.
    */
-  'package_version_status'?: (_udpa_annotations_PackageVersionStatus | keyof typeof _udpa_annotations_PackageVersionStatus);
+  'package_version_status'?: (_udpa_annotations_PackageVersionStatus);
 }
 
 export interface StatusAnnotation__Output {
@@ -21,5 +21,5 @@ export interface StatusAnnotation__Output {
   /**
    * The entity belongs to a package with the given version status.
    */
-  'package_version_status': (keyof typeof _udpa_annotations_PackageVersionStatus);
+  'package_version_status': (_udpa_annotations_PackageVersionStatus__Output);
 }
diff --git a/packages/grpc-js-xds/src/generated/validate/FieldRules.ts b/packages/grpc-js-xds/src/generated/validate/FieldRules.ts
index 067125775..ce6f313e7 100644
--- a/packages/grpc-js-xds/src/generated/validate/FieldRules.ts
+++ b/packages/grpc-js-xds/src/generated/validate/FieldRules.ts
@@ -22,7 +22,6 @@ import type { MapRules as _validate_MapRules, MapRules__Output as _validate_MapR
 import type { AnyRules as _validate_AnyRules, AnyRules__Output as _validate_AnyRules__Output } from '../validate/AnyRules';
 import type { DurationRules as _validate_DurationRules, DurationRules__Output as _validate_DurationRules__Output } from '../validate/DurationRules';
 import type { TimestampRules as _validate_TimestampRules, TimestampRules__Output as _validate_TimestampRules__Output } from '../validate/TimestampRules';
-import type { Long } from '@grpc/proto-loader';
 
 /**
  * FieldRules encapsulates the rules for each type of field. Depending on the
diff --git a/packages/grpc-js-xds/src/generated/validate/KnownRegex.ts b/packages/grpc-js-xds/src/generated/validate/KnownRegex.ts
index 5880b5baf..8f1e20b4c 100644
--- a/packages/grpc-js-xds/src/generated/validate/KnownRegex.ts
+++ b/packages/grpc-js-xds/src/generated/validate/KnownRegex.ts
@@ -3,14 +3,36 @@
 /**
  * WellKnownRegex contain some well-known patterns.
  */
-export enum KnownRegex {
-  UNKNOWN = 0,
+export const KnownRegex = {
+  UNKNOWN: 'UNKNOWN',
   /**
    * HTTP header name as defined by RFC 7230.
    */
-  HTTP_HEADER_NAME = 1,
+  HTTP_HEADER_NAME: 'HTTP_HEADER_NAME',
   /**
    * HTTP header value as defined by RFC 7230.
    */
-  HTTP_HEADER_VALUE = 2,
-}
+  HTTP_HEADER_VALUE: 'HTTP_HEADER_VALUE',
+} as const;
+
+/**
+ * WellKnownRegex contain some well-known patterns.
+ */
+export type KnownRegex =
+  | 'UNKNOWN'
+  | 0
+  /**
+   * HTTP header name as defined by RFC 7230.
+   */
+  | 'HTTP_HEADER_NAME'
+  | 1
+  /**
+   * HTTP header value as defined by RFC 7230.
+   */
+  | 'HTTP_HEADER_VALUE'
+  | 2
+
+/**
+ * WellKnownRegex contain some well-known patterns.
+ */
+export type KnownRegex__Output = typeof KnownRegex[keyof typeof KnownRegex]
diff --git a/packages/grpc-js-xds/src/generated/validate/StringRules.ts b/packages/grpc-js-xds/src/generated/validate/StringRules.ts
index b6bb1e460..8bca6dffa 100644
--- a/packages/grpc-js-xds/src/generated/validate/StringRules.ts
+++ b/packages/grpc-js-xds/src/generated/validate/StringRules.ts
@@ -1,6 +1,6 @@
 // Original file: deps/protoc-gen-validate/validate/validate.proto
 
-import type { KnownRegex as _validate_KnownRegex } from '../validate/KnownRegex';
+import type { KnownRegex as _validate_KnownRegex, KnownRegex__Output as _validate_KnownRegex__Output } from '../validate/KnownRegex';
 import type { Long } from '@grpc/proto-loader';
 
 /**
@@ -129,7 +129,7 @@ export interface StringRules {
   /**
    * WellKnownRegex specifies a common well known pattern defined as a regex.
    */
-  'well_known_regex'?: (_validate_KnownRegex | keyof typeof _validate_KnownRegex);
+  'well_known_regex'?: (_validate_KnownRegex);
   /**
    * This applies to regexes HTTP_HEADER_NAME and HTTP_HEADER_VALUE to enable
    * strict header validation.
@@ -271,7 +271,7 @@ export interface StringRules__Output {
   /**
    * WellKnownRegex specifies a common well known pattern defined as a regex.
    */
-  'well_known_regex'?: (keyof typeof _validate_KnownRegex);
+  'well_known_regex'?: (_validate_KnownRegex__Output);
   /**
    * This applies to regexes HTTP_HEADER_NAME and HTTP_HEADER_VALUE to enable
    * strict header validation.
diff --git a/packages/grpc-js-xds/src/generated/xds/annotations/v3/PackageVersionStatus.ts b/packages/grpc-js-xds/src/generated/xds/annotations/v3/PackageVersionStatus.ts
index e76e2848f..e85074eae 100644
--- a/packages/grpc-js-xds/src/generated/xds/annotations/v3/PackageVersionStatus.ts
+++ b/packages/grpc-js-xds/src/generated/xds/annotations/v3/PackageVersionStatus.ts
@@ -1,21 +1,46 @@
 // Original file: deps/xds/xds/annotations/v3/status.proto
 
-export enum PackageVersionStatus {
+export const PackageVersionStatus = {
   /**
    * Unknown package version status.
    */
-  UNKNOWN = 0,
+  UNKNOWN: 'UNKNOWN',
   /**
    * This version of the package is frozen.
    */
-  FROZEN = 1,
+  FROZEN: 'FROZEN',
   /**
    * This version of the package is the active development version.
    */
-  ACTIVE = 2,
+  ACTIVE: 'ACTIVE',
   /**
    * This version of the package is the candidate for the next major version. It
    * is typically machine generated from the active development version.
    */
-  NEXT_MAJOR_VERSION_CANDIDATE = 3,
-}
+  NEXT_MAJOR_VERSION_CANDIDATE: 'NEXT_MAJOR_VERSION_CANDIDATE',
+} as const;
+
+export type PackageVersionStatus =
+  /**
+   * Unknown package version status.
+   */
+  | 'UNKNOWN'
+  | 0
+  /**
+   * This version of the package is frozen.
+   */
+  | 'FROZEN'
+  | 1
+  /**
+   * This version of the package is the active development version.
+   */
+  | 'ACTIVE'
+  | 2
+  /**
+   * This version of the package is the candidate for the next major version. It
+   * is typically machine generated from the active development version.
+   */
+  | 'NEXT_MAJOR_VERSION_CANDIDATE'
+  | 3
+
+export type PackageVersionStatus__Output = typeof PackageVersionStatus[keyof typeof PackageVersionStatus]
diff --git a/packages/grpc-js-xds/src/generated/xds/annotations/v3/StatusAnnotation.ts b/packages/grpc-js-xds/src/generated/xds/annotations/v3/StatusAnnotation.ts
index 58efbd8f7..678d6a6bf 100644
--- a/packages/grpc-js-xds/src/generated/xds/annotations/v3/StatusAnnotation.ts
+++ b/packages/grpc-js-xds/src/generated/xds/annotations/v3/StatusAnnotation.ts
@@ -1,6 +1,6 @@
 // Original file: deps/xds/xds/annotations/v3/status.proto
 
-import type { PackageVersionStatus as _xds_annotations_v3_PackageVersionStatus } from '../../../xds/annotations/v3/PackageVersionStatus';
+import type { PackageVersionStatus as _xds_annotations_v3_PackageVersionStatus, PackageVersionStatus__Output as _xds_annotations_v3_PackageVersionStatus__Output } from '../../../xds/annotations/v3/PackageVersionStatus';
 
 export interface StatusAnnotation {
   /**
@@ -10,7 +10,7 @@ export interface StatusAnnotation {
   /**
    * The entity belongs to a package with the given version status.
    */
-  'package_version_status'?: (_xds_annotations_v3_PackageVersionStatus | keyof typeof _xds_annotations_v3_PackageVersionStatus);
+  'package_version_status'?: (_xds_annotations_v3_PackageVersionStatus);
 }
 
 export interface StatusAnnotation__Output {
@@ -21,5 +21,5 @@ export interface StatusAnnotation__Output {
   /**
    * The entity belongs to a package with the given version status.
    */
-  'package_version_status': (keyof typeof _xds_annotations_v3_PackageVersionStatus);
+  'package_version_status': (_xds_annotations_v3_PackageVersionStatus__Output);
 }
diff --git a/packages/grpc-js-xds/src/generated/xds/core/v3/ResourceLocator.ts b/packages/grpc-js-xds/src/generated/xds/core/v3/ResourceLocator.ts
index bb1f822b8..28f981dd5 100644
--- a/packages/grpc-js-xds/src/generated/xds/core/v3/ResourceLocator.ts
+++ b/packages/grpc-js-xds/src/generated/xds/core/v3/ResourceLocator.ts
@@ -97,11 +97,21 @@ export interface _xds_core_v3_ResourceLocator_Directive__Output {
 
 // Original file: deps/xds/xds/core/v3/resource_locator.proto
 
-export enum _xds_core_v3_ResourceLocator_Scheme {
-  XDSTP = 0,
-  HTTP = 1,
-  FILE = 2,
-}
+export const _xds_core_v3_ResourceLocator_Scheme = {
+  XDSTP: 'XDSTP',
+  HTTP: 'HTTP',
+  FILE: 'FILE',
+} as const;
+
+export type _xds_core_v3_ResourceLocator_Scheme =
+  | 'XDSTP'
+  | 0
+  | 'HTTP'
+  | 1
+  | 'FILE'
+  | 2
+
+export type _xds_core_v3_ResourceLocator_Scheme__Output = typeof _xds_core_v3_ResourceLocator_Scheme[keyof typeof _xds_core_v3_ResourceLocator_Scheme]
 
 /**
  * xDS resource locators identify a xDS resource name and instruct the
@@ -125,7 +135,7 @@ export interface ResourceLocator {
   /**
    * URI scheme.
    */
-  'scheme'?: (_xds_core_v3_ResourceLocator_Scheme | keyof typeof _xds_core_v3_ResourceLocator_Scheme);
+  'scheme'?: (_xds_core_v3_ResourceLocator_Scheme);
   /**
    * Opaque identifier for the resource. Any '/' will not be escaped during URI
    * encoding and will form part of the URI path. This may end
@@ -183,7 +193,7 @@ export interface ResourceLocator__Output {
   /**
    * URI scheme.
    */
-  'scheme': (keyof typeof _xds_core_v3_ResourceLocator_Scheme);
+  'scheme': (_xds_core_v3_ResourceLocator_Scheme__Output);
   /**
    * Opaque identifier for the resource. Any '/' will not be escaped during URI
    * encoding and will form part of the URI path. This may end
diff --git a/packages/grpc-js-xds/test/backend.ts b/packages/grpc-js-xds/test/backend.ts
index 4f924d434..60957e523 100644
--- a/packages/grpc-js-xds/test/backend.ts
+++ b/packages/grpc-js-xds/test/backend.ts
@@ -15,7 +15,7 @@
  *
  */
 
-import { loadPackageDefinition, sendUnaryData, Server, ServerCredentials, ServerUnaryCall, UntypedServiceImplementation } from "@grpc/grpc-js";
+import { loadPackageDefinition, sendUnaryData, Server, ServerCredentials, ServerOptions, ServerUnaryCall, UntypedServiceImplementation } from "@grpc/grpc-js";
 import { loadSync } from "@grpc/proto-loader";
 import { ProtoGrpcType } from "./generated/echo";
 import { EchoRequest__Output } from "./generated/grpc/testing/EchoRequest";
@@ -49,7 +49,7 @@ export class Backend {
   private server: Server | null = null;
   private receivedCallCount = 0;
   private callListeners: (() => void)[] = [];
-  constructor(private port: number, private useXdsServer: boolean) {
+  constructor(private port: number, private useXdsServer: boolean, private serverOptions?: ServerOptions) {
   }
   Echo(call: ServerUnaryCall<EchoRequest__Output, EchoResponse>, callback: sendUnaryData<EchoResponse>) {
     // call.request.params is currently ignored
@@ -83,7 +83,7 @@ export class Backend {
       throw new Error("Backend already running");
     }
     if (this.useXdsServer) {
-      this.server = new XdsServer({[BOOTSTRAP_CONFIG_KEY]: controlPlaneServer.getBootstrapInfoString()});
+      this.server = new XdsServer({...this.serverOptions, [BOOTSTRAP_CONFIG_KEY]: controlPlaneServer.getBootstrapInfoString()});
     } else {
       this.server = new Server();
     }
@@ -145,7 +145,7 @@ export class Backend {
   }
 }
 
-export async function createBackends(count: number, useXdsServer?: boolean): Promise<Backend[]> {
+export async function createBackends(count: number, useXdsServer?: boolean, serverOptions?: ServerOptions): Promise<Backend[]> {
   const ports = await findFreePorts(count);
-  return ports.map(port => new Backend(port, useXdsServer ?? true));
+  return ports.map(port => new Backend(port, useXdsServer ?? true, serverOptions));
 }
diff --git a/packages/grpc-js-xds/test/test-core.ts b/packages/grpc-js-xds/test/test-core.ts
index 6aab45169..37337032f 100644
--- a/packages/grpc-js-xds/test/test-core.ts
+++ b/packages/grpc-js-xds/test/test-core.ts
@@ -100,4 +100,39 @@ describe('core xDS functionality', () => {
       }, reason => done(reason));
     }, reason => done(reason));
   });
+  it('should handle connections aging out', function(done) {
+    this.timeout(5000);
+    createBackends(1, true, {'grpc.max_connection_age_ms': 1000}).then(([backend]) => {
+      const serverRoute = new FakeServerRoute(backend.getPort(), 'serverRoute');
+      xdsServer.setRdsResource(serverRoute.getRouteConfiguration());
+      xdsServer.setLdsResource(serverRoute.getListener());
+      xdsServer.addResponseListener((typeUrl, responseState) => {
+        if (responseState.state === 'NACKED') {
+          client.stopCalls();
+          assert.fail(`Client NACKED ${typeUrl} resource with message ${responseState.errorMessage}`);
+        }
+      });
+      const cluster = new FakeEdsCluster('cluster1', 'endpoint1', [{backends: [backend], locality:{region: 'region1'}}]);
+      const routeGroup = new FakeRouteGroup('listener1', 'route1', [{cluster: cluster}]);
+      routeGroup.startAllBackends(xdsServer).then(() => {
+        xdsServer.setEdsResource(cluster.getEndpointConfig());
+        xdsServer.setCdsResource(cluster.getClusterConfig());
+        xdsServer.setRdsResource(routeGroup.getRouteConfiguration());
+        xdsServer.setLdsResource(routeGroup.getListener());
+        const serverRoute = new FakeServerRoute(backend.getPort(), 'serverRoute');
+        xdsServer.setRdsResource(serverRoute.getRouteConfiguration());
+        xdsServer.setLdsResource(serverRoute.getListener());
+        client = XdsTestClient.createFromServer('listener1', xdsServer);
+        client.sendOneCall(error => {
+          assert.ifError(error);
+          // Make another call after the max_connection_age_ms expires
+          setTimeout(() => {
+            client.sendOneCall(error => {
+              done(error);
+            })
+          }, 1100);
+        });
+      }, reason => done(reason));
+    }, reason => done(reason));
+  })
 });
diff --git a/packages/grpc-js/.eslintrc b/packages/grpc-js/.eslintrc
index 2f6bfd62d..9a72b31de 100644
--- a/packages/grpc-js/.eslintrc
+++ b/packages/grpc-js/.eslintrc
@@ -50,6 +50,7 @@
     "@typescript-eslint/explicit-module-boundary-types": "off",
     "@typescript-eslint/ban-types": "off",
     "@typescript-eslint/camelcase": "off",
+    "@typescript-eslint/no-explicit-any": "off",
     "node/no-missing-import": "off",
     "node/no-empty-function": "off",
     "node/no-unsupported-features/es-syntax": "off",
diff --git a/packages/grpc-js/README.md b/packages/grpc-js/README.md
index eb04ece2f..f3b682f3c 100644
--- a/packages/grpc-js/README.md
+++ b/packages/grpc-js/README.md
@@ -60,6 +60,9 @@ Many channel arguments supported in `grpc` are not supported in `@grpc/grpc-js`.
   - `grpc.enable_channelz`
   - `grpc.dns_min_time_between_resolutions_ms`
   - `grpc.enable_retries`
+  - `grpc.max_connection_age_ms`
+  - `grpc.max_connection_age_grace_ms`
+  - `grpc.max_connection_idle_ms`
   - `grpc.per_rpc_retry_buffer_size`
   - `grpc.retry_buffer_size`
   - `grpc.service_config_disable_resolution`
diff --git a/packages/grpc-js/gulpfile.ts b/packages/grpc-js/gulpfile.ts
index d85900364..e4e9071ff 100644
--- a/packages/grpc-js/gulpfile.ts
+++ b/packages/grpc-js/gulpfile.ts
@@ -35,14 +35,17 @@ const pkgPath = path.resolve(jsCoreDir, 'package.json');
 const supportedVersionRange = require(pkgPath).engines.node;
 const versionNotSupported = () => {
   console.log(`Skipping grpc-js task for Node ${process.version}`);
-  return () => { return Promise.resolve(); };
+  return () => {
+    return Promise.resolve();
+  };
 };
 const identity = (value: any): any => value;
-const checkTask = semver.satisfies(process.version, supportedVersionRange) ?
-    identity : versionNotSupported;
+const checkTask = semver.satisfies(process.version, supportedVersionRange)
+  ? identity
+  : versionNotSupported;
 
 const execNpmVerb = (verb: string, ...args: string[]) =>
-  execa('npm', [verb, ...args], {cwd: jsCoreDir, stdio: 'inherit'});
+  execa('npm', [verb, ...args], { cwd: jsCoreDir, stdio: 'inherit' });
 const execNpmCommand = execNpmVerb.bind(null, 'run');
 
 const install = checkTask(() => execNpmVerb('install', '--unsafe-perm'));
@@ -64,22 +67,20 @@ const cleanAll = gulp.parallel(clean);
  */
 const compile = checkTask(() => execNpmCommand('compile'));
 
-const copyTestFixtures = checkTask(() => ncpP(`${jsCoreDir}/test/fixtures`, `${outDir}/test/fixtures`));
+const copyTestFixtures = checkTask(() =>
+  ncpP(`${jsCoreDir}/test/fixtures`, `${outDir}/test/fixtures`)
+);
 
 const runTests = checkTask(() => {
   process.env.GRPC_EXPERIMENTAL_ENABLE_OUTLIER_DETECTION = 'true';
-  return gulp.src(`${outDir}/test/**/*.js`)
-    .pipe(mocha({reporter: 'mocha-jenkins-reporter',
-                 require: ['ts-node/register']}));
+  return gulp.src(`${outDir}/test/**/*.js`).pipe(
+    mocha({
+      reporter: 'mocha-jenkins-reporter',
+      require: ['ts-node/register'],
+    })
+  );
 });
 
 const test = gulp.series(install, copyTestFixtures, runTests);
 
-export {
-  install,
-  lint,
-  clean,
-  cleanAll,
-  compile,
-  test
-}
+export { install, lint, clean, cleanAll, compile, test };
diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json
index 8d8f4fd90..5087a692f 100644
--- a/packages/grpc-js/package.json
+++ b/packages/grpc-js/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@grpc/grpc-js",
-  "version": "1.9.14",
+  "version": "1.10.8",
   "description": "gRPC Library for Node - pure JS implementation",
   "homepage": "https://grpc.io/",
   "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",
   "main": "build/src/index.js",
   "engines": {
-    "node": "^8.13.0 || >=10.10.0"
+    "node": ">=12.10.0"
   },
   "keywords": [],
   "author": {
@@ -15,17 +15,19 @@
   "types": "build/src/index.d.ts",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@types/gulp": "^4.0.6",
-    "@types/gulp-mocha": "0.0.32",
-    "@types/lodash": "^4.14.186",
-    "@types/mocha": "^5.2.6",
-    "@types/ncp": "^2.0.1",
-    "@types/pify": "^3.0.2",
-    "@types/semver": "^7.3.9",
-    "@typescript-eslint/eslint-plugin": "^5.59.11",
-    "@typescript-eslint/parser": "^5.59.11",
-    "@typescript-eslint/typescript-estree": "^5.59.11",
-    "clang-format": "^1.0.55",
+    "@grpc/proto-loader": "file:../proto-loader",
+    "@types/gulp": "^4.0.17",
+    "@types/gulp-mocha": "0.0.37",
+    "@types/lodash": "^4.14.202",
+    "@types/mocha": "^10.0.6",
+    "@types/ncp": "^2.0.8",
+    "@types/node": ">=20.11.20",
+    "@types/pify": "^5.0.4",
+    "@types/semver": "^7.5.8",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
+    "@typescript-eslint/parser": "^7.1.0",
+    "@typescript-eslint/typescript-estree": "^7.1.0",
+    "clang-format": "^1.8.0",
     "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-node": "^11.1.0",
@@ -33,16 +35,16 @@
     "execa": "^2.0.3",
     "gulp": "^4.0.2",
     "gulp-mocha": "^6.0.0",
-    "lodash": "^4.17.4",
+    "lodash": "^4.17.21",
     "madge": "^5.0.1",
     "mocha-jenkins-reporter": "^0.4.1",
     "ncp": "^2.0.0",
     "pify": "^4.0.1",
     "prettier": "^2.8.8",
     "rimraf": "^3.0.2",
-    "semver": "^7.3.5",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.1.3"
+    "semver": "^7.6.0",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
   },
   "contributors": [
     {
@@ -65,8 +67,8 @@
     "generate-test-types": "proto-loader-gen-types --keepCase --longs String --enums String --defaults --oneofs --includeComments --include-dirs test/fixtures/ -O test/generated/ --grpcLib ../../src/index test_service.proto"
   },
   "dependencies": {
-    "@grpc/proto-loader": "^0.7.8",
-    "@types/node": ">=12.12.47"
+    "@grpc/proto-loader": "^0.7.13",
+    "@js-sdsl/ordered-map": "^4.4.2"
   },
   "files": [
     "src/**/*.ts",
diff --git a/packages/grpc-js/src/backoff-timeout.ts b/packages/grpc-js/src/backoff-timeout.ts
index 78318d1e8..10d347e79 100644
--- a/packages/grpc-js/src/backoff-timeout.ts
+++ b/packages/grpc-js/src/backoff-timeout.ts
@@ -106,7 +106,9 @@ export class BackoffTimeout {
 
   private runTimer(delay: number) {
     this.endTime = this.startTime;
-    this.endTime.setMilliseconds(this.endTime.getMilliseconds() + this.nextDelay);
+    this.endTime.setMilliseconds(
+      this.endTime.getMilliseconds() + this.nextDelay
+    );
     clearTimeout(this.timerId);
     this.timerId = setTimeout(() => {
       this.callback();
diff --git a/packages/grpc-js/src/call-interface.ts b/packages/grpc-js/src/call-interface.ts
index c0c63b957..c93c504f6 100644
--- a/packages/grpc-js/src/call-interface.ts
+++ b/packages/grpc-js/src/call-interface.ts
@@ -171,3 +171,7 @@ export interface Call {
   getCallNumber(): number;
   setCredentials(credentials: CallCredentials): void;
 }
+
+export interface DeadlineInfoProvider {
+  getDeadlineInfo(): string[];
+}
diff --git a/packages/grpc-js/src/channel-options.ts b/packages/grpc-js/src/channel-options.ts
index aa1e6c83e..6804852e2 100644
--- a/packages/grpc-js/src/channel-options.ts
+++ b/packages/grpc-js/src/channel-options.ts
@@ -54,6 +54,7 @@ export interface ChannelOptions {
   'grpc.retry_buffer_size'?: number;
   'grpc.max_connection_age_ms'?: number;
   'grpc.max_connection_age_grace_ms'?: number;
+  'grpc.max_connection_idle_ms'?: number;
   'grpc-node.max_session_memory'?: number;
   'grpc.service_config_disable_resolution'?: number;
   'grpc.client_idle_timeout_ms'?: number;
diff --git a/packages/grpc-js/src/channel.ts b/packages/grpc-js/src/channel.ts
index 7ce5a15f7..514920c8f 100644
--- a/packages/grpc-js/src/channel.ts
+++ b/packages/grpc-js/src/channel.ts
@@ -20,7 +20,7 @@ import { ChannelOptions } from './channel-options';
 import { ServerSurfaceCall } from './server-call';
 
 import { ConnectivityState } from './connectivity-state';
-import { ChannelRef } from './channelz';
+import type { ChannelRef } from './channelz';
 import { Call } from './call-interface';
 import { InternalChannel } from './internal-channel';
 import { Deadline } from './deadline';
diff --git a/packages/grpc-js/src/channelz.ts b/packages/grpc-js/src/channelz.ts
index 1e2627a97..c207e567c 100644
--- a/packages/grpc-js/src/channelz.ts
+++ b/packages/grpc-js/src/channelz.ts
@@ -16,6 +16,7 @@
  */
 
 import { isIPv4, isIPv6 } from 'net';
+import { OrderedMap, type OrderedMapIterator } from '@js-sdsl/ordered-map';
 import { ConnectivityState } from './connectivity-state';
 import { Status } from './constants';
 import { Timestamp } from './generated/google/protobuf/Timestamp';
@@ -65,27 +66,26 @@ export type TraceSeverity =
   | 'CT_WARNING'
   | 'CT_ERROR';
 
-export interface ChannelRef {
-  kind: 'channel';
+interface Ref {
+  kind: EntityTypes;
   id: number;
   name: string;
 }
 
-export interface SubchannelRef {
-  kind: 'subchannel';
-  id: number;
-  name: string;
+export interface ChannelRef extends Ref {
+  kind: EntityTypes.channel;
 }
 
-export interface ServerRef {
-  kind: 'server';
-  id: number;
+export interface SubchannelRef extends Ref {
+  kind: EntityTypes.subchannel;
 }
 
-export interface SocketRef {
-  kind: 'socket';
-  id: number;
-  name: string;
+export interface ServerRef extends Ref {
+  kind: EntityTypes.server;
+}
+
+export interface SocketRef extends Ref {
+  kind: EntityTypes.socket;
 }
 
 function channelRefToMessage(ref: ChannelRef): ChannelRefMessage {
@@ -131,6 +131,26 @@ interface TraceEvent {
  */
 const TARGET_RETAINED_TRACES = 32;
 
+/**
+ * Default number of sockets/servers/channels/subchannels to return
+ */
+const DEFAULT_MAX_RESULTS = 100;
+
+export class ChannelzTraceStub {
+  readonly events: TraceEvent[] = [];
+  readonly creationTimestamp: Date = new Date();
+  readonly eventsLogged = 0;
+
+  addTrace(): void {}
+  getTraceMessage(): ChannelTrace {
+    return {
+      creation_timestamp: dateToProtoTimestamp(this.creationTimestamp),
+      num_events_logged: this.eventsLogged,
+      events: [],
+    };
+  }
+}
+
 export class ChannelzTrace {
   events: TraceEvent[] = [];
   creationTimestamp: Date;
@@ -181,106 +201,64 @@ export class ChannelzTrace {
   }
 }
 
+type RefOrderedMap = OrderedMap<
+  number,
+  { ref: { id: number; kind: EntityTypes; name: string }; count: number }
+>;
+
 export class ChannelzChildrenTracker {
-  private channelChildren: Map<number, { ref: ChannelRef; count: number }> =
-    new Map<number, { ref: ChannelRef; count: number }>();
-  private subchannelChildren: Map<
-    number,
-    { ref: SubchannelRef; count: number }
-  > = new Map<number, { ref: SubchannelRef; count: number }>();
-  private socketChildren: Map<number, { ref: SocketRef; count: number }> =
-    new Map<number, { ref: SocketRef; count: number }>();
+  private channelChildren: RefOrderedMap = new OrderedMap();
+  private subchannelChildren: RefOrderedMap = new OrderedMap();
+  private socketChildren: RefOrderedMap = new OrderedMap();
+  private trackerMap = {
+    [EntityTypes.channel]: this.channelChildren,
+    [EntityTypes.subchannel]: this.subchannelChildren,
+    [EntityTypes.socket]: this.socketChildren,
+  } as const;
 
   refChild(child: ChannelRef | SubchannelRef | SocketRef) {
-    switch (child.kind) {
-      case 'channel': {
-        const trackedChild = this.channelChildren.get(child.id) ?? {
-          ref: child,
-          count: 0,
-        };
-        trackedChild.count += 1;
-        this.channelChildren.set(child.id, trackedChild);
-        break;
-      }
-      case 'subchannel': {
-        const trackedChild = this.subchannelChildren.get(child.id) ?? {
-          ref: child,
-          count: 0,
-        };
-        trackedChild.count += 1;
-        this.subchannelChildren.set(child.id, trackedChild);
-        break;
-      }
-      case 'socket': {
-        const trackedChild = this.socketChildren.get(child.id) ?? {
+    const tracker = this.trackerMap[child.kind];
+    const trackedChild = tracker.find(child.id);
+
+    if (trackedChild.equals(tracker.end())) {
+      tracker.setElement(
+        child.id,
+        {
           ref: child,
-          count: 0,
-        };
-        trackedChild.count += 1;
-        this.socketChildren.set(child.id, trackedChild);
-        break;
-      }
+          count: 1,
+        },
+        trackedChild
+      );
+    } else {
+      trackedChild.pointer[1].count += 1;
     }
   }
 
   unrefChild(child: ChannelRef | SubchannelRef | SocketRef) {
-    switch (child.kind) {
-      case 'channel': {
-        const trackedChild = this.channelChildren.get(child.id);
-        if (trackedChild !== undefined) {
-          trackedChild.count -= 1;
-          if (trackedChild.count === 0) {
-            this.channelChildren.delete(child.id);
-          } else {
-            this.channelChildren.set(child.id, trackedChild);
-          }
-        }
-        break;
-      }
-      case 'subchannel': {
-        const trackedChild = this.subchannelChildren.get(child.id);
-        if (trackedChild !== undefined) {
-          trackedChild.count -= 1;
-          if (trackedChild.count === 0) {
-            this.subchannelChildren.delete(child.id);
-          } else {
-            this.subchannelChildren.set(child.id, trackedChild);
-          }
-        }
-        break;
-      }
-      case 'socket': {
-        const trackedChild = this.socketChildren.get(child.id);
-        if (trackedChild !== undefined) {
-          trackedChild.count -= 1;
-          if (trackedChild.count === 0) {
-            this.socketChildren.delete(child.id);
-          } else {
-            this.socketChildren.set(child.id, trackedChild);
-          }
-        }
-        break;
+    const tracker = this.trackerMap[child.kind];
+    const trackedChild = tracker.getElementByKey(child.id);
+    if (trackedChild !== undefined) {
+      trackedChild.count -= 1;
+      if (trackedChild.count === 0) {
+        tracker.eraseElementByKey(child.id);
       }
     }
   }
 
   getChildLists(): ChannelzChildren {
-    const channels: ChannelRef[] = [];
-    for (const { ref } of this.channelChildren.values()) {
-      channels.push(ref);
-    }
-    const subchannels: SubchannelRef[] = [];
-    for (const { ref } of this.subchannelChildren.values()) {
-      subchannels.push(ref);
-    }
-    const sockets: SocketRef[] = [];
-    for (const { ref } of this.socketChildren.values()) {
-      sockets.push(ref);
-    }
-    return { channels, subchannels, sockets };
+    return {
+      channels: this.channelChildren as ChannelzChildren['channels'],
+      subchannels: this.subchannelChildren as ChannelzChildren['subchannels'],
+      sockets: this.socketChildren as ChannelzChildren['sockets'],
+    };
   }
 }
 
+export class ChannelzChildrenTrackerStub extends ChannelzChildrenTracker {
+  override refChild(): void {}
+  override unrefChild(): void {}
+}
+
 export class ChannelzCallTracker {
   callsStarted = 0;
   callsSucceeded = 0;
@@ -299,17 +277,23 @@ export class ChannelzCallTracker {
   }
 }
 
+export class ChannelzCallTrackerStub extends ChannelzCallTracker {
+  override addCallStarted() {}
+  override addCallSucceeded() {}
+  override addCallFailed() {}
+}
+
 export interface ChannelzChildren {
-  channels: ChannelRef[];
-  subchannels: SubchannelRef[];
-  sockets: SocketRef[];
+  channels: OrderedMap<number, { ref: ChannelRef; count: number }>;
+  subchannels: OrderedMap<number, { ref: SubchannelRef; count: number }>;
+  sockets: OrderedMap<number, { ref: SocketRef; count: number }>;
 }
 
 export interface ChannelInfo {
   target: string;
   state: ConnectivityState;
-  trace: ChannelzTrace;
-  callTracker: ChannelzCallTracker;
+  trace: ChannelzTrace | ChannelzTraceStub;
+  callTracker: ChannelzCallTracker | ChannelzCallTrackerStub;
   children: ChannelzChildren;
 }
 
@@ -368,85 +352,85 @@ interface SocketEntry {
   getInfo(): SocketInfo;
 }
 
-let nextId = 1;
-
-function getNextId(): number {
-  return nextId++;
-}
-
-const channels: (ChannelEntry | undefined)[] = [];
-const subchannels: (SubchannelEntry | undefined)[] = [];
-const servers: (ServerEntry | undefined)[] = [];
-const sockets: (SocketEntry | undefined)[] = [];
-
-export function registerChannelzChannel(
-  name: string,
-  getInfo: () => ChannelInfo,
-  channelzEnabled: boolean
-): ChannelRef {
-  const id = getNextId();
-  const ref: ChannelRef = { id, name, kind: 'channel' };
-  if (channelzEnabled) {
-    channels[id] = { ref, getInfo };
+export const enum EntityTypes {
+  channel = 'channel',
+  subchannel = 'subchannel',
+  server = 'server',
+  socket = 'socket',
+}
+
+type EntryOrderedMap = OrderedMap<number, { ref: Ref; getInfo: () => any }>;
+
+const entityMaps = {
+  [EntityTypes.channel]: new OrderedMap<number, ChannelEntry>(),
+  [EntityTypes.subchannel]: new OrderedMap<number, SubchannelEntry>(),
+  [EntityTypes.server]: new OrderedMap<number, ServerEntry>(),
+  [EntityTypes.socket]: new OrderedMap<number, SocketEntry>(),
+} as const;
+
+export type RefByType<T extends EntityTypes> = T extends EntityTypes.channel
+  ? ChannelRef
+  : T extends EntityTypes.server
+  ? ServerRef
+  : T extends EntityTypes.socket
+  ? SocketRef
+  : T extends EntityTypes.subchannel
+  ? SubchannelRef
+  : never;
+
+export type EntryByType<T extends EntityTypes> = T extends EntityTypes.channel
+  ? ChannelEntry
+  : T extends EntityTypes.server
+  ? ServerEntry
+  : T extends EntityTypes.socket
+  ? SocketEntry
+  : T extends EntityTypes.subchannel
+  ? SubchannelEntry
+  : never;
+
+export type InfoByType<T extends EntityTypes> = T extends EntityTypes.channel
+  ? ChannelInfo
+  : T extends EntityTypes.subchannel
+  ? SubchannelInfo
+  : T extends EntityTypes.server
+  ? ServerInfo
+  : T extends EntityTypes.socket
+  ? SocketInfo
+  : never;
+
+const generateRegisterFn = <R extends EntityTypes>(kind: R) => {
+  let nextId = 1;
+  function getNextId(): number {
+    return nextId++;
   }
-  return ref;
-}
-
-export function registerChannelzSubchannel(
-  name: string,
-  getInfo: () => SubchannelInfo,
-  channelzEnabled: boolean
-): SubchannelRef {
-  const id = getNextId();
-  const ref: SubchannelRef = { id, name, kind: 'subchannel' };
-  if (channelzEnabled) {
-    subchannels[id] = { ref, getInfo };
-  }
-  return ref;
-}
 
-export function registerChannelzServer(
-  getInfo: () => ServerInfo,
-  channelzEnabled: boolean
-): ServerRef {
-  const id = getNextId();
-  const ref: ServerRef = { id, kind: 'server' };
-  if (channelzEnabled) {
-    servers[id] = { ref, getInfo };
-  }
-  return ref;
-}
-
-export function registerChannelzSocket(
-  name: string,
-  getInfo: () => SocketInfo,
-  channelzEnabled: boolean
-): SocketRef {
-  const id = getNextId();
-  const ref: SocketRef = { id, name, kind: 'socket' };
-  if (channelzEnabled) {
-    sockets[id] = { ref, getInfo };
-  }
-  return ref;
-}
+  const entityMap: EntryOrderedMap = entityMaps[kind];
+
+  return (
+    name: string,
+    getInfo: () => InfoByType<R>,
+    channelzEnabled: boolean
+  ): RefByType<R> => {
+    const id = getNextId();
+    const ref = { id, name, kind } as RefByType<R>;
+    if (channelzEnabled) {
+      entityMap.setElement(id, { ref, getInfo });
+    }
+    return ref;
+  };
+};
+
+export const registerChannelzChannel = generateRegisterFn(EntityTypes.channel);
+export const registerChannelzSubchannel = generateRegisterFn(
+  EntityTypes.subchannel
+);
+export const registerChannelzServer = generateRegisterFn(EntityTypes.server);
+export const registerChannelzSocket = generateRegisterFn(EntityTypes.socket);
 
 export function unregisterChannelzRef(
   ref: ChannelRef | SubchannelRef | ServerRef | SocketRef
 ) {
-  switch (ref.kind) {
-    case 'channel':
-      delete channels[ref.id];
-      return;
-    case 'subchannel':
-      delete subchannels[ref.id];
-      return;
-    case 'server':
-      delete servers[ref.id];
-      return;
-    case 'socket':
-      delete sockets[ref.id];
-      return;
-  }
+  entityMaps[ref.kind].eraseElementByKey(ref.id);
 }
 
 /**
@@ -556,6 +540,17 @@ function dateToProtoTimestamp(date?: Date | null): Timestamp | null {
 
 function getChannelMessage(channelEntry: ChannelEntry): ChannelMessage {
   const resolvedInfo = channelEntry.getInfo();
+  const channelRef: ChannelRefMessage[] = [];
+  const subchannelRef: SubchannelRefMessage[] = [];
+
+  resolvedInfo.children.channels.forEach(el => {
+    channelRef.push(channelRefToMessage(el[1].ref));
+  });
+
+  resolvedInfo.children.subchannels.forEach(el => {
+    subchannelRef.push(subchannelRefToMessage(el[1].ref));
+  });
+
   return {
     ref: channelRefToMessage(channelEntry.ref),
     data: {
@@ -569,12 +564,8 @@ function getChannelMessage(channelEntry: ChannelEntry): ChannelMessage {
       ),
       trace: resolvedInfo.trace.getTraceMessage(),
     },
-    channel_ref: resolvedInfo.children.channels.map(ref =>
-      channelRefToMessage(ref)
-    ),
-    subchannel_ref: resolvedInfo.children.subchannels.map(ref =>
-      subchannelRefToMessage(ref)
-    ),
+    channel_ref: channelRef,
+    subchannel_ref: subchannelRef,
   };
 }
 
@@ -582,8 +573,9 @@ function GetChannel(
   call: ServerUnaryCall<GetChannelRequest__Output, GetChannelResponse>,
   callback: sendUnaryData<GetChannelResponse>
 ): void {
-  const channelId = Number.parseInt(call.request.channel_id);
-  const channelEntry = channels[channelId];
+  const channelId = parseInt(call.request.channel_id, 10);
+  const channelEntry =
+    entityMaps[EntityTypes.channel].getElementByKey(channelId);
   if (channelEntry === undefined) {
     callback({
       code: Status.NOT_FOUND,
@@ -598,27 +590,35 @@ function GetTopChannels(
   call: ServerUnaryCall<GetTopChannelsRequest__Output, GetTopChannelsResponse>,
   callback: sendUnaryData<GetTopChannelsResponse>
 ): void {
-  const maxResults = Number.parseInt(call.request.max_results);
+  const maxResults =
+    parseInt(call.request.max_results, 10) || DEFAULT_MAX_RESULTS;
   const resultList: ChannelMessage[] = [];
-  let i = Number.parseInt(call.request.start_channel_id);
-  for (; i < channels.length; i++) {
-    const channelEntry = channels[i];
-    if (channelEntry === undefined) {
-      continue;
-    }
-    resultList.push(getChannelMessage(channelEntry));
-    if (resultList.length >= maxResults) {
-      break;
-    }
+  const startId = parseInt(call.request.start_channel_id, 10);
+  const channelEntries = entityMaps[EntityTypes.channel];
+
+  let i: OrderedMapIterator<number, ChannelEntry>;
+  for (
+    i = channelEntries.lowerBound(startId);
+    !i.equals(channelEntries.end()) && resultList.length < maxResults;
+    i = i.next()
+  ) {
+    resultList.push(getChannelMessage(i.pointer[1]));
   }
+
   callback(null, {
     channel: resultList,
-    end: i >= servers.length,
+    end: i.equals(channelEntries.end()),
   });
 }
 
 function getServerMessage(serverEntry: ServerEntry): ServerMessage {
   const resolvedInfo = serverEntry.getInfo();
+  const listenSocket: SocketRefMessage[] = [];
+
+  resolvedInfo.listenerChildren.sockets.forEach(el => {
+    listenSocket.push(socketRefToMessage(el[1].ref));
+  });
+
   return {
     ref: serverRefToMessage(serverEntry.ref),
     data: {
@@ -630,9 +630,7 @@ function getServerMessage(serverEntry: ServerEntry): ServerMessage {
       ),
       trace: resolvedInfo.trace.getTraceMessage(),
     },
-    listen_socket: resolvedInfo.listenerChildren.sockets.map(ref =>
-      socketRefToMessage(ref)
-    ),
+    listen_socket: listenSocket,
   };
 }
 
@@ -640,8 +638,9 @@ function GetServer(
   call: ServerUnaryCall<GetServerRequest__Output, GetServerResponse>,
   callback: sendUnaryData<GetServerResponse>
 ): void {
-  const serverId = Number.parseInt(call.request.server_id);
-  const serverEntry = servers[serverId];
+  const serverId = parseInt(call.request.server_id, 10);
+  const serverEntries = entityMaps[EntityTypes.server];
+  const serverEntry = serverEntries.getElementByKey(serverId);
   if (serverEntry === undefined) {
     callback({
       code: Status.NOT_FOUND,
@@ -656,22 +655,24 @@ function GetServers(
   call: ServerUnaryCall<GetServersRequest__Output, GetServersResponse>,
   callback: sendUnaryData<GetServersResponse>
 ): void {
-  const maxResults = Number.parseInt(call.request.max_results);
+  const maxResults =
+    parseInt(call.request.max_results, 10) || DEFAULT_MAX_RESULTS;
+  const startId = parseInt(call.request.start_server_id, 10);
+  const serverEntries = entityMaps[EntityTypes.server];
   const resultList: ServerMessage[] = [];
-  let i = Number.parseInt(call.request.start_server_id);
-  for (; i < servers.length; i++) {
-    const serverEntry = servers[i];
-    if (serverEntry === undefined) {
-      continue;
-    }
-    resultList.push(getServerMessage(serverEntry));
-    if (resultList.length >= maxResults) {
-      break;
-    }
+
+  let i: OrderedMapIterator<number, ServerEntry>;
+  for (
+    i = serverEntries.lowerBound(startId);
+    !i.equals(serverEntries.end()) && resultList.length < maxResults;
+    i = i.next()
+  ) {
+    resultList.push(getServerMessage(i.pointer[1]));
   }
+
   callback(null, {
     server: resultList,
-    end: i >= servers.length,
+    end: i.equals(serverEntries.end()),
   });
 }
 
@@ -679,8 +680,9 @@ function GetSubchannel(
   call: ServerUnaryCall<GetSubchannelRequest__Output, GetSubchannelResponse>,
   callback: sendUnaryData<GetSubchannelResponse>
 ): void {
-  const subchannelId = Number.parseInt(call.request.subchannel_id);
-  const subchannelEntry = subchannels[subchannelId];
+  const subchannelId = parseInt(call.request.subchannel_id, 10);
+  const subchannelEntry =
+    entityMaps[EntityTypes.subchannel].getElementByKey(subchannelId);
   if (subchannelEntry === undefined) {
     callback({
       code: Status.NOT_FOUND,
@@ -689,6 +691,12 @@ function GetSubchannel(
     return;
   }
   const resolvedInfo = subchannelEntry.getInfo();
+  const listenSocket: SocketRefMessage[] = [];
+
+  resolvedInfo.children.sockets.forEach(el => {
+    listenSocket.push(socketRefToMessage(el[1].ref));
+  });
+
   const subchannelMessage: SubchannelMessage = {
     ref: subchannelRefToMessage(subchannelEntry.ref),
     data: {
@@ -702,9 +710,7 @@ function GetSubchannel(
       ),
       trace: resolvedInfo.trace.getTraceMessage(),
     },
-    socket_ref: resolvedInfo.children.sockets.map(ref =>
-      socketRefToMessage(ref)
-    ),
+    socket_ref: listenSocket,
   };
   callback(null, { subchannel: subchannelMessage });
 }
@@ -735,8 +741,8 @@ function GetSocket(
   call: ServerUnaryCall<GetSocketRequest__Output, GetSocketResponse>,
   callback: sendUnaryData<GetSocketResponse>
 ): void {
-  const socketId = Number.parseInt(call.request.socket_id);
-  const socketEntry = sockets[socketId];
+  const socketId = parseInt(call.request.socket_id, 10);
+  const socketEntry = entityMaps[EntityTypes.socket].getElementByKey(socketId);
   if (socketEntry === undefined) {
     callback({
       code: Status.NOT_FOUND,
@@ -809,8 +815,9 @@ function GetServerSockets(
   >,
   callback: sendUnaryData<GetServerSocketsResponse>
 ): void {
-  const serverId = Number.parseInt(call.request.server_id);
-  const serverEntry = servers[serverId];
+  const serverId = parseInt(call.request.server_id, 10);
+  const serverEntry = entityMaps[EntityTypes.server].getElementByKey(serverId);
+
   if (serverEntry === undefined) {
     callback({
       code: Status.NOT_FOUND,
@@ -818,28 +825,29 @@ function GetServerSockets(
     });
     return;
   }
-  const startId = Number.parseInt(call.request.start_socket_id);
-  const maxResults = Number.parseInt(call.request.max_results);
+
+  const startId = parseInt(call.request.start_socket_id, 10);
+  const maxResults =
+    parseInt(call.request.max_results, 10) || DEFAULT_MAX_RESULTS;
   const resolvedInfo = serverEntry.getInfo();
   // If we wanted to include listener sockets in the result, this line would
   // instead say
   // const allSockets = resolvedInfo.listenerChildren.sockets.concat(resolvedInfo.sessionChildren.sockets).sort((ref1, ref2) => ref1.id - ref2.id);
-  const allSockets = resolvedInfo.sessionChildren.sockets.sort(
-    (ref1, ref2) => ref1.id - ref2.id
-  );
+  const allSockets = resolvedInfo.sessionChildren.sockets;
   const resultList: SocketRefMessage[] = [];
-  let i = 0;
-  for (; i < allSockets.length; i++) {
-    if (allSockets[i].id >= startId) {
-      resultList.push(socketRefToMessage(allSockets[i]));
-      if (resultList.length >= maxResults) {
-        break;
-      }
-    }
+
+  let i: OrderedMapIterator<number, { ref: SocketRef }>;
+  for (
+    i = allSockets.lowerBound(startId);
+    !i.equals(allSockets.end()) && resultList.length < maxResults;
+    i = i.next()
+  ) {
+    resultList.push(socketRefToMessage(i.pointer[1].ref));
   }
+
   callback(null, {
     socket_ref: resultList,
-    end: i >= allSockets.length,
+    end: i.equals(allSockets.end()),
   });
 }
 
diff --git a/packages/grpc-js/src/client.ts b/packages/grpc-js/src/client.ts
index e122f6cf4..995d5b328 100644
--- a/packages/grpc-js/src/client.ts
+++ b/packages/grpc-js/src/client.ts
@@ -110,7 +110,7 @@ export type ClientOptions = Partial<ChannelOptions> & {
 };
 
 function getErrorStackString(error: Error): string {
-  return error.stack!.split('\n').slice(1).join('\n');
+  return error.stack?.split('\n').slice(1).join('\n') || 'no stack trace available';
 }
 
 /**
diff --git a/packages/grpc-js/src/deadline.ts b/packages/grpc-js/src/deadline.ts
index 8f8fe67b7..de05e381e 100644
--- a/packages/grpc-js/src/deadline.ts
+++ b/packages/grpc-js/src/deadline.ts
@@ -93,3 +93,14 @@ export function deadlineToString(deadline: Deadline): string {
     }
   }
 }
+
+/**
+ * Calculate the difference between two dates as a number of seconds and format
+ * it as a string.
+ * @param startDate
+ * @param endDate
+ * @returns
+ */
+export function formatDateDifference(startDate: Date, endDate: Date): string {
+  return ((endDate.getTime() - startDate.getTime()) / 1000).toFixed(3) + 's';
+}
diff --git a/packages/grpc-js/src/generated/channelz.ts b/packages/grpc-js/src/generated/channelz.ts
index 367cf27f6..a81ffae5b 100644
--- a/packages/grpc-js/src/generated/channelz.ts
+++ b/packages/grpc-js/src/generated/channelz.ts
@@ -1,7 +1,7 @@
 import type * as grpc from '../index';
 import type { MessageTypeDefinition } from '@grpc/proto-loader';
 
-import type { ChannelzClient as _grpc_channelz_v1_ChannelzClient, ChannelzDefinition as _grpc_channelz_v1_ChannelzDefinition } from './grpc/channelz/v1/Channelz';
+import type { ChannelzClient as _grpc_channelz_v1_ChannelzClient, ChannelzDefinition as _grpc_channelz_v1_ChannelzDefinition } from './grpc/channelz/v1/Channelz.ts';
 
 type SubtypeConstructor<Constructor extends new (...args: any) => any, Subtype> = {
   new(...args: ConstructorParameters<Constructor>): Subtype;
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/Address.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/Address.ts
index 259cfeabe..5215e42ef 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/Address.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/Address.ts
@@ -1,6 +1,6 @@
 // Original file: proto/channelz.proto
 
-import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../google/protobuf/Any';
+import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../google/protobuf/Any.ts';
 
 /**
  * An address type not included above.
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/Channel.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/Channel.ts
index 93b4a261d..5be617e11 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/Channel.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/Channel.ts
@@ -1,9 +1,9 @@
 // Original file: proto/channelz.proto
 
-import type { ChannelRef as _grpc_channelz_v1_ChannelRef, ChannelRef__Output as _grpc_channelz_v1_ChannelRef__Output } from '../../../grpc/channelz/v1/ChannelRef';
-import type { ChannelData as _grpc_channelz_v1_ChannelData, ChannelData__Output as _grpc_channelz_v1_ChannelData__Output } from '../../../grpc/channelz/v1/ChannelData';
-import type { SubchannelRef as _grpc_channelz_v1_SubchannelRef, SubchannelRef__Output as _grpc_channelz_v1_SubchannelRef__Output } from '../../../grpc/channelz/v1/SubchannelRef';
-import type { SocketRef as _grpc_channelz_v1_SocketRef, SocketRef__Output as _grpc_channelz_v1_SocketRef__Output } from '../../../grpc/channelz/v1/SocketRef';
+import type { ChannelRef as _grpc_channelz_v1_ChannelRef, ChannelRef__Output as _grpc_channelz_v1_ChannelRef__Output } from '../../../grpc/channelz/v1/ChannelRef.ts';
+import type { ChannelData as _grpc_channelz_v1_ChannelData, ChannelData__Output as _grpc_channelz_v1_ChannelData__Output } from '../../../grpc/channelz/v1/ChannelData.ts';
+import type { SubchannelRef as _grpc_channelz_v1_SubchannelRef, SubchannelRef__Output as _grpc_channelz_v1_SubchannelRef__Output } from '../../../grpc/channelz/v1/SubchannelRef.ts';
+import type { SocketRef as _grpc_channelz_v1_SocketRef, SocketRef__Output as _grpc_channelz_v1_SocketRef__Output } from '../../../grpc/channelz/v1/SocketRef.ts';
 
 /**
  * Channel is a logical grouping of channels, subchannels, and sockets.
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/ChannelData.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/ChannelData.ts
index 6d6824af4..d1de968a1 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/ChannelData.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/ChannelData.ts
@@ -1,8 +1,8 @@
 // Original file: proto/channelz.proto
 
-import type { ChannelConnectivityState as _grpc_channelz_v1_ChannelConnectivityState, ChannelConnectivityState__Output as _grpc_channelz_v1_ChannelConnectivityState__Output } from '../../../grpc/channelz/v1/ChannelConnectivityState';
-import type { ChannelTrace as _grpc_channelz_v1_ChannelTrace, ChannelTrace__Output as _grpc_channelz_v1_ChannelTrace__Output } from '../../../grpc/channelz/v1/ChannelTrace';
-import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp';
+import type { ChannelConnectivityState as _grpc_channelz_v1_ChannelConnectivityState, ChannelConnectivityState__Output as _grpc_channelz_v1_ChannelConnectivityState__Output } from '../../../grpc/channelz/v1/ChannelConnectivityState.ts';
+import type { ChannelTrace as _grpc_channelz_v1_ChannelTrace, ChannelTrace__Output as _grpc_channelz_v1_ChannelTrace__Output } from '../../../grpc/channelz/v1/ChannelTrace.ts';
+import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp.ts';
 import type { Long } from '@grpc/proto-loader';
 
 /**
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/ChannelTrace.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/ChannelTrace.ts
index 7dbc8d924..60c8e682a 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/ChannelTrace.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/ChannelTrace.ts
@@ -1,7 +1,7 @@
 // Original file: proto/channelz.proto
 
-import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp';
-import type { ChannelTraceEvent as _grpc_channelz_v1_ChannelTraceEvent, ChannelTraceEvent__Output as _grpc_channelz_v1_ChannelTraceEvent__Output } from '../../../grpc/channelz/v1/ChannelTraceEvent';
+import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp.ts';
+import type { ChannelTraceEvent as _grpc_channelz_v1_ChannelTraceEvent, ChannelTraceEvent__Output as _grpc_channelz_v1_ChannelTraceEvent__Output } from '../../../grpc/channelz/v1/ChannelTraceEvent.ts';
 import type { Long } from '@grpc/proto-loader';
 
 /**
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/ChannelTraceEvent.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/ChannelTraceEvent.ts
index 403e4f123..33c6230ef 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/ChannelTraceEvent.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/ChannelTraceEvent.ts
@@ -1,8 +1,8 @@
 // Original file: proto/channelz.proto
 
-import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp';
-import type { ChannelRef as _grpc_channelz_v1_ChannelRef, ChannelRef__Output as _grpc_channelz_v1_ChannelRef__Output } from '../../../grpc/channelz/v1/ChannelRef';
-import type { SubchannelRef as _grpc_channelz_v1_SubchannelRef, SubchannelRef__Output as _grpc_channelz_v1_SubchannelRef__Output } from '../../../grpc/channelz/v1/SubchannelRef';
+import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp.ts';
+import type { ChannelRef as _grpc_channelz_v1_ChannelRef, ChannelRef__Output as _grpc_channelz_v1_ChannelRef__Output } from '../../../grpc/channelz/v1/ChannelRef.ts';
+import type { SubchannelRef as _grpc_channelz_v1_SubchannelRef, SubchannelRef__Output as _grpc_channelz_v1_SubchannelRef__Output } from '../../../grpc/channelz/v1/SubchannelRef.ts';
 
 // Original file: proto/channelz.proto
 
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/Channelz.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/Channelz.ts
index 4c8c18aa7..deafde315 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/Channelz.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/Channelz.ts
@@ -2,20 +2,20 @@
 
 import type * as grpc from '../../../../index'
 import type { MethodDefinition } from '@grpc/proto-loader'
-import type { GetChannelRequest as _grpc_channelz_v1_GetChannelRequest, GetChannelRequest__Output as _grpc_channelz_v1_GetChannelRequest__Output } from '../../../grpc/channelz/v1/GetChannelRequest';
-import type { GetChannelResponse as _grpc_channelz_v1_GetChannelResponse, GetChannelResponse__Output as _grpc_channelz_v1_GetChannelResponse__Output } from '../../../grpc/channelz/v1/GetChannelResponse';
-import type { GetServerRequest as _grpc_channelz_v1_GetServerRequest, GetServerRequest__Output as _grpc_channelz_v1_GetServerRequest__Output } from '../../../grpc/channelz/v1/GetServerRequest';
-import type { GetServerResponse as _grpc_channelz_v1_GetServerResponse, GetServerResponse__Output as _grpc_channelz_v1_GetServerResponse__Output } from '../../../grpc/channelz/v1/GetServerResponse';
-import type { GetServerSocketsRequest as _grpc_channelz_v1_GetServerSocketsRequest, GetServerSocketsRequest__Output as _grpc_channelz_v1_GetServerSocketsRequest__Output } from '../../../grpc/channelz/v1/GetServerSocketsRequest';
-import type { GetServerSocketsResponse as _grpc_channelz_v1_GetServerSocketsResponse, GetServerSocketsResponse__Output as _grpc_channelz_v1_GetServerSocketsResponse__Output } from '../../../grpc/channelz/v1/GetServerSocketsResponse';
-import type { GetServersRequest as _grpc_channelz_v1_GetServersRequest, GetServersRequest__Output as _grpc_channelz_v1_GetServersRequest__Output } from '../../../grpc/channelz/v1/GetServersRequest';
-import type { GetServersResponse as _grpc_channelz_v1_GetServersResponse, GetServersResponse__Output as _grpc_channelz_v1_GetServersResponse__Output } from '../../../grpc/channelz/v1/GetServersResponse';
-import type { GetSocketRequest as _grpc_channelz_v1_GetSocketRequest, GetSocketRequest__Output as _grpc_channelz_v1_GetSocketRequest__Output } from '../../../grpc/channelz/v1/GetSocketRequest';
-import type { GetSocketResponse as _grpc_channelz_v1_GetSocketResponse, GetSocketResponse__Output as _grpc_channelz_v1_GetSocketResponse__Output } from '../../../grpc/channelz/v1/GetSocketResponse';
-import type { GetSubchannelRequest as _grpc_channelz_v1_GetSubchannelRequest, GetSubchannelRequest__Output as _grpc_channelz_v1_GetSubchannelRequest__Output } from '../../../grpc/channelz/v1/GetSubchannelRequest';
-import type { GetSubchannelResponse as _grpc_channelz_v1_GetSubchannelResponse, GetSubchannelResponse__Output as _grpc_channelz_v1_GetSubchannelResponse__Output } from '../../../grpc/channelz/v1/GetSubchannelResponse';
-import type { GetTopChannelsRequest as _grpc_channelz_v1_GetTopChannelsRequest, GetTopChannelsRequest__Output as _grpc_channelz_v1_GetTopChannelsRequest__Output } from '../../../grpc/channelz/v1/GetTopChannelsRequest';
-import type { GetTopChannelsResponse as _grpc_channelz_v1_GetTopChannelsResponse, GetTopChannelsResponse__Output as _grpc_channelz_v1_GetTopChannelsResponse__Output } from '../../../grpc/channelz/v1/GetTopChannelsResponse';
+import type { GetChannelRequest as _grpc_channelz_v1_GetChannelRequest, GetChannelRequest__Output as _grpc_channelz_v1_GetChannelRequest__Output } from '../../../grpc/channelz/v1/GetChannelRequest.ts';
+import type { GetChannelResponse as _grpc_channelz_v1_GetChannelResponse, GetChannelResponse__Output as _grpc_channelz_v1_GetChannelResponse__Output } from '../../../grpc/channelz/v1/GetChannelResponse.ts';
+import type { GetServerRequest as _grpc_channelz_v1_GetServerRequest, GetServerRequest__Output as _grpc_channelz_v1_GetServerRequest__Output } from '../../../grpc/channelz/v1/GetServerRequest.ts';
+import type { GetServerResponse as _grpc_channelz_v1_GetServerResponse, GetServerResponse__Output as _grpc_channelz_v1_GetServerResponse__Output } from '../../../grpc/channelz/v1/GetServerResponse.ts';
+import type { GetServerSocketsRequest as _grpc_channelz_v1_GetServerSocketsRequest, GetServerSocketsRequest__Output as _grpc_channelz_v1_GetServerSocketsRequest__Output } from '../../../grpc/channelz/v1/GetServerSocketsRequest.ts';
+import type { GetServerSocketsResponse as _grpc_channelz_v1_GetServerSocketsResponse, GetServerSocketsResponse__Output as _grpc_channelz_v1_GetServerSocketsResponse__Output } from '../../../grpc/channelz/v1/GetServerSocketsResponse.ts';
+import type { GetServersRequest as _grpc_channelz_v1_GetServersRequest, GetServersRequest__Output as _grpc_channelz_v1_GetServersRequest__Output } from '../../../grpc/channelz/v1/GetServersRequest.ts';
+import type { GetServersResponse as _grpc_channelz_v1_GetServersResponse, GetServersResponse__Output as _grpc_channelz_v1_GetServersResponse__Output } from '../../../grpc/channelz/v1/GetServersResponse.ts';
+import type { GetSocketRequest as _grpc_channelz_v1_GetSocketRequest, GetSocketRequest__Output as _grpc_channelz_v1_GetSocketRequest__Output } from '../../../grpc/channelz/v1/GetSocketRequest.ts';
+import type { GetSocketResponse as _grpc_channelz_v1_GetSocketResponse, GetSocketResponse__Output as _grpc_channelz_v1_GetSocketResponse__Output } from '../../../grpc/channelz/v1/GetSocketResponse.ts';
+import type { GetSubchannelRequest as _grpc_channelz_v1_GetSubchannelRequest, GetSubchannelRequest__Output as _grpc_channelz_v1_GetSubchannelRequest__Output } from '../../../grpc/channelz/v1/GetSubchannelRequest.ts';
+import type { GetSubchannelResponse as _grpc_channelz_v1_GetSubchannelResponse, GetSubchannelResponse__Output as _grpc_channelz_v1_GetSubchannelResponse__Output } from '../../../grpc/channelz/v1/GetSubchannelResponse.ts';
+import type { GetTopChannelsRequest as _grpc_channelz_v1_GetTopChannelsRequest, GetTopChannelsRequest__Output as _grpc_channelz_v1_GetTopChannelsRequest__Output } from '../../../grpc/channelz/v1/GetTopChannelsRequest.ts';
+import type { GetTopChannelsResponse as _grpc_channelz_v1_GetTopChannelsResponse, GetTopChannelsResponse__Output as _grpc_channelz_v1_GetTopChannelsResponse__Output } from '../../../grpc/channelz/v1/GetTopChannelsResponse.ts';
 
 /**
  * Channelz is a service exposed by gRPC servers that provides detailed debug
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/GetChannelResponse.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/GetChannelResponse.ts
index 2e967a458..48fb040ec 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/GetChannelResponse.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/GetChannelResponse.ts
@@ -1,6 +1,6 @@
 // Original file: proto/channelz.proto
 
-import type { Channel as _grpc_channelz_v1_Channel, Channel__Output as _grpc_channelz_v1_Channel__Output } from '../../../grpc/channelz/v1/Channel';
+import type { Channel as _grpc_channelz_v1_Channel, Channel__Output as _grpc_channelz_v1_Channel__Output } from '../../../grpc/channelz/v1/Channel.ts';
 
 export interface GetChannelResponse {
   /**
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/GetServerResponse.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/GetServerResponse.ts
index fe0078209..ee853985c 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/GetServerResponse.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/GetServerResponse.ts
@@ -1,6 +1,6 @@
 // Original file: proto/channelz.proto
 
-import type { Server as _grpc_channelz_v1_Server, Server__Output as _grpc_channelz_v1_Server__Output } from '../../../grpc/channelz/v1/Server';
+import type { Server as _grpc_channelz_v1_Server, Server__Output as _grpc_channelz_v1_Server__Output } from '../../../grpc/channelz/v1/Server.ts';
 
 export interface GetServerResponse {
   /**
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/GetServerSocketsResponse.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/GetServerSocketsResponse.ts
index 112f277e3..577b2ca13 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/GetServerSocketsResponse.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/GetServerSocketsResponse.ts
@@ -1,6 +1,6 @@
 // Original file: proto/channelz.proto
 
-import type { SocketRef as _grpc_channelz_v1_SocketRef, SocketRef__Output as _grpc_channelz_v1_SocketRef__Output } from '../../../grpc/channelz/v1/SocketRef';
+import type { SocketRef as _grpc_channelz_v1_SocketRef, SocketRef__Output as _grpc_channelz_v1_SocketRef__Output } from '../../../grpc/channelz/v1/SocketRef.ts';
 
 export interface GetServerSocketsResponse {
   /**
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/GetServersResponse.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/GetServersResponse.ts
index b07893b8c..d232b6654 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/GetServersResponse.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/GetServersResponse.ts
@@ -1,6 +1,6 @@
 // Original file: proto/channelz.proto
 
-import type { Server as _grpc_channelz_v1_Server, Server__Output as _grpc_channelz_v1_Server__Output } from '../../../grpc/channelz/v1/Server';
+import type { Server as _grpc_channelz_v1_Server, Server__Output as _grpc_channelz_v1_Server__Output } from '../../../grpc/channelz/v1/Server.ts';
 
 export interface GetServersResponse {
   /**
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/GetSocketResponse.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/GetSocketResponse.ts
index b6304b7f0..2e62b04e0 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/GetSocketResponse.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/GetSocketResponse.ts
@@ -1,6 +1,6 @@
 // Original file: proto/channelz.proto
 
-import type { Socket as _grpc_channelz_v1_Socket, Socket__Output as _grpc_channelz_v1_Socket__Output } from '../../../grpc/channelz/v1/Socket';
+import type { Socket as _grpc_channelz_v1_Socket, Socket__Output as _grpc_channelz_v1_Socket__Output } from '../../../grpc/channelz/v1/Socket.ts';
 
 export interface GetSocketResponse {
   /**
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/GetSubchannelResponse.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/GetSubchannelResponse.ts
index 57d2bf2dc..4896a1196 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/GetSubchannelResponse.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/GetSubchannelResponse.ts
@@ -1,6 +1,6 @@
 // Original file: proto/channelz.proto
 
-import type { Subchannel as _grpc_channelz_v1_Subchannel, Subchannel__Output as _grpc_channelz_v1_Subchannel__Output } from '../../../grpc/channelz/v1/Subchannel';
+import type { Subchannel as _grpc_channelz_v1_Subchannel, Subchannel__Output as _grpc_channelz_v1_Subchannel__Output } from '../../../grpc/channelz/v1/Subchannel.ts';
 
 export interface GetSubchannelResponse {
   /**
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/GetTopChannelsResponse.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/GetTopChannelsResponse.ts
index d96e63673..8a3c8dbf2 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/GetTopChannelsResponse.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/GetTopChannelsResponse.ts
@@ -1,6 +1,6 @@
 // Original file: proto/channelz.proto
 
-import type { Channel as _grpc_channelz_v1_Channel, Channel__Output as _grpc_channelz_v1_Channel__Output } from '../../../grpc/channelz/v1/Channel';
+import type { Channel as _grpc_channelz_v1_Channel, Channel__Output as _grpc_channelz_v1_Channel__Output } from '../../../grpc/channelz/v1/Channel.ts';
 
 export interface GetTopChannelsResponse {
   /**
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/Security.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/Security.ts
index e555d698e..a084dbe0f 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/Security.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/Security.ts
@@ -1,6 +1,6 @@
 // Original file: proto/channelz.proto
 
-import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../google/protobuf/Any';
+import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../google/protobuf/Any.ts';
 
 export interface _grpc_channelz_v1_Security_OtherSecurity {
   /**
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/Server.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/Server.ts
index 958343358..a96d79b4a 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/Server.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/Server.ts
@@ -1,8 +1,8 @@
 // Original file: proto/channelz.proto
 
-import type { ServerRef as _grpc_channelz_v1_ServerRef, ServerRef__Output as _grpc_channelz_v1_ServerRef__Output } from '../../../grpc/channelz/v1/ServerRef';
-import type { ServerData as _grpc_channelz_v1_ServerData, ServerData__Output as _grpc_channelz_v1_ServerData__Output } from '../../../grpc/channelz/v1/ServerData';
-import type { SocketRef as _grpc_channelz_v1_SocketRef, SocketRef__Output as _grpc_channelz_v1_SocketRef__Output } from '../../../grpc/channelz/v1/SocketRef';
+import type { ServerRef as _grpc_channelz_v1_ServerRef, ServerRef__Output as _grpc_channelz_v1_ServerRef__Output } from '../../../grpc/channelz/v1/ServerRef.ts';
+import type { ServerData as _grpc_channelz_v1_ServerData, ServerData__Output as _grpc_channelz_v1_ServerData__Output } from '../../../grpc/channelz/v1/ServerData.ts';
+import type { SocketRef as _grpc_channelz_v1_SocketRef, SocketRef__Output as _grpc_channelz_v1_SocketRef__Output } from '../../../grpc/channelz/v1/SocketRef.ts';
 
 /**
  * Server represents a single server.  There may be multiple servers in a single
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/ServerData.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/ServerData.ts
index ce48e36f5..588f6ae8e 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/ServerData.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/ServerData.ts
@@ -1,7 +1,7 @@
 // Original file: proto/channelz.proto
 
-import type { ChannelTrace as _grpc_channelz_v1_ChannelTrace, ChannelTrace__Output as _grpc_channelz_v1_ChannelTrace__Output } from '../../../grpc/channelz/v1/ChannelTrace';
-import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp';
+import type { ChannelTrace as _grpc_channelz_v1_ChannelTrace, ChannelTrace__Output as _grpc_channelz_v1_ChannelTrace__Output } from '../../../grpc/channelz/v1/ChannelTrace.ts';
+import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp.ts';
 import type { Long } from '@grpc/proto-loader';
 
 /**
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/Socket.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/Socket.ts
index 5829afe98..b2eec20af 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/Socket.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/Socket.ts
@@ -1,9 +1,9 @@
 // Original file: proto/channelz.proto
 
-import type { SocketRef as _grpc_channelz_v1_SocketRef, SocketRef__Output as _grpc_channelz_v1_SocketRef__Output } from '../../../grpc/channelz/v1/SocketRef';
-import type { SocketData as _grpc_channelz_v1_SocketData, SocketData__Output as _grpc_channelz_v1_SocketData__Output } from '../../../grpc/channelz/v1/SocketData';
-import type { Address as _grpc_channelz_v1_Address, Address__Output as _grpc_channelz_v1_Address__Output } from '../../../grpc/channelz/v1/Address';
-import type { Security as _grpc_channelz_v1_Security, Security__Output as _grpc_channelz_v1_Security__Output } from '../../../grpc/channelz/v1/Security';
+import type { SocketRef as _grpc_channelz_v1_SocketRef, SocketRef__Output as _grpc_channelz_v1_SocketRef__Output } from '../../../grpc/channelz/v1/SocketRef.ts';
+import type { SocketData as _grpc_channelz_v1_SocketData, SocketData__Output as _grpc_channelz_v1_SocketData__Output } from '../../../grpc/channelz/v1/SocketData.ts';
+import type { Address as _grpc_channelz_v1_Address, Address__Output as _grpc_channelz_v1_Address__Output } from '../../../grpc/channelz/v1/Address.ts';
+import type { Security as _grpc_channelz_v1_Security, Security__Output as _grpc_channelz_v1_Security__Output } from '../../../grpc/channelz/v1/Security.ts';
 
 /**
  * Information about an actual connection.  Pronounced "sock-ay".
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/SocketData.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/SocketData.ts
index c62d4d10c..807d8a2a9 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/SocketData.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/SocketData.ts
@@ -1,8 +1,8 @@
 // Original file: proto/channelz.proto
 
-import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp';
-import type { Int64Value as _google_protobuf_Int64Value, Int64Value__Output as _google_protobuf_Int64Value__Output } from '../../../google/protobuf/Int64Value';
-import type { SocketOption as _grpc_channelz_v1_SocketOption, SocketOption__Output as _grpc_channelz_v1_SocketOption__Output } from '../../../grpc/channelz/v1/SocketOption';
+import type { Timestamp as _google_protobuf_Timestamp, Timestamp__Output as _google_protobuf_Timestamp__Output } from '../../../google/protobuf/Timestamp.ts';
+import type { Int64Value as _google_protobuf_Int64Value, Int64Value__Output as _google_protobuf_Int64Value__Output } from '../../../google/protobuf/Int64Value.ts';
+import type { SocketOption as _grpc_channelz_v1_SocketOption, SocketOption__Output as _grpc_channelz_v1_SocketOption__Output } from '../../../grpc/channelz/v1/SocketOption.ts';
 import type { Long } from '@grpc/proto-loader';
 
 /**
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/SocketOption.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/SocketOption.ts
index 115b36aae..a2a545a4c 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/SocketOption.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/SocketOption.ts
@@ -1,6 +1,6 @@
 // Original file: proto/channelz.proto
 
-import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../google/protobuf/Any';
+import type { Any as _google_protobuf_Any, Any__Output as _google_protobuf_Any__Output } from '../../../google/protobuf/Any.ts';
 
 /**
  * SocketOption represents socket options for a socket.  Specifically, these
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/SocketOptionLinger.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/SocketOptionLinger.ts
index d83fa3238..ca0d801fe 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/SocketOptionLinger.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/SocketOptionLinger.ts
@@ -1,6 +1,6 @@
 // Original file: proto/channelz.proto
 
-import type { Duration as _google_protobuf_Duration, Duration__Output as _google_protobuf_Duration__Output } from '../../../google/protobuf/Duration';
+import type { Duration as _google_protobuf_Duration, Duration__Output as _google_protobuf_Duration__Output } from '../../../google/protobuf/Duration.ts';
 
 /**
  * For use with SocketOption's additional field.  This is primarily used for
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/SocketOptionTimeout.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/SocketOptionTimeout.ts
index 185839b2c..b49a68374 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/SocketOptionTimeout.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/SocketOptionTimeout.ts
@@ -1,6 +1,6 @@
 // Original file: proto/channelz.proto
 
-import type { Duration as _google_protobuf_Duration, Duration__Output as _google_protobuf_Duration__Output } from '../../../google/protobuf/Duration';
+import type { Duration as _google_protobuf_Duration, Duration__Output as _google_protobuf_Duration__Output } from '../../../google/protobuf/Duration.ts';
 
 /**
  * For use with SocketOption's additional field.  This is primarily used for
diff --git a/packages/grpc-js/src/generated/grpc/channelz/v1/Subchannel.ts b/packages/grpc-js/src/generated/grpc/channelz/v1/Subchannel.ts
index 7122fac83..937d39749 100644
--- a/packages/grpc-js/src/generated/grpc/channelz/v1/Subchannel.ts
+++ b/packages/grpc-js/src/generated/grpc/channelz/v1/Subchannel.ts
@@ -1,9 +1,9 @@
 // Original file: proto/channelz.proto
 
-import type { SubchannelRef as _grpc_channelz_v1_SubchannelRef, SubchannelRef__Output as _grpc_channelz_v1_SubchannelRef__Output } from '../../../grpc/channelz/v1/SubchannelRef';
-import type { ChannelData as _grpc_channelz_v1_ChannelData, ChannelData__Output as _grpc_channelz_v1_ChannelData__Output } from '../../../grpc/channelz/v1/ChannelData';
-import type { ChannelRef as _grpc_channelz_v1_ChannelRef, ChannelRef__Output as _grpc_channelz_v1_ChannelRef__Output } from '../../../grpc/channelz/v1/ChannelRef';
-import type { SocketRef as _grpc_channelz_v1_SocketRef, SocketRef__Output as _grpc_channelz_v1_SocketRef__Output } from '../../../grpc/channelz/v1/SocketRef';
+import type { SubchannelRef as _grpc_channelz_v1_SubchannelRef, SubchannelRef__Output as _grpc_channelz_v1_SubchannelRef__Output } from '../../../grpc/channelz/v1/SubchannelRef.ts';
+import type { ChannelData as _grpc_channelz_v1_ChannelData, ChannelData__Output as _grpc_channelz_v1_ChannelData__Output } from '../../../grpc/channelz/v1/ChannelData.ts';
+import type { ChannelRef as _grpc_channelz_v1_ChannelRef, ChannelRef__Output as _grpc_channelz_v1_ChannelRef__Output } from '../../../grpc/channelz/v1/ChannelRef.ts';
+import type { SocketRef as _grpc_channelz_v1_SocketRef, SocketRef__Output as _grpc_channelz_v1_SocketRef__Output } from '../../../grpc/channelz/v1/SocketRef.ts';
 
 /**
  * Subchannel is a logical grouping of channels, subchannels, and sockets.
diff --git a/packages/grpc-js/src/http_proxy.ts b/packages/grpc-js/src/http_proxy.ts
index 3e905c488..6fabf5025 100644
--- a/packages/grpc-js/src/http_proxy.ts
+++ b/packages/grpc-js/src/http_proxy.ts
@@ -80,7 +80,7 @@ function getProxyInfo(): ProxyInfo {
   if (proxyUrl.username) {
     if (proxyUrl.password) {
       log(LogVerbosity.INFO, 'userinfo found in proxy URI');
-      userCred = `${proxyUrl.username}:${proxyUrl.password}`;
+      userCred = decodeURIComponent(`${proxyUrl.username}:${proxyUrl.password}`);
     } else {
       userCred = proxyUrl.username;
     }
@@ -233,6 +233,12 @@ export function getProxiedConnection(
             ' through proxy ' +
             proxyAddressString
         );
+        // The HTTP client may have already read a few bytes of the proxied
+        // connection. If that's the case, put them back into the socket.
+        // See https://github.com/grpc/grpc-node/issues/2744.
+        if (head.length > 0) {
+          socket.unshift(head);
+        }
         if ('secureContext' in connectionOptions) {
           /* The proxy is connecting to a TLS server, so upgrade this socket
            * connection to a TLS connection.
diff --git a/packages/grpc-js/src/index.ts b/packages/grpc-js/src/index.ts
index 9d99d7c74..e9f2f6966 100644
--- a/packages/grpc-js/src/index.ts
+++ b/packages/grpc-js/src/index.ts
@@ -184,7 +184,7 @@ export {
   ServiceDefinition,
   UntypedHandleCall,
   UntypedServiceImplementation,
-  VerifyOptions
+  VerifyOptions,
 };
 
 /**** Server ****/
@@ -264,7 +264,12 @@ export { getChannelzServiceDefinition, getChannelzHandlers } from './channelz';
 
 export { addAdminServicesToServer } from './admin';
 
-export { ServiceConfig, LoadBalancingConfig, MethodConfig, RetryPolicy } from './service-config';
+export {
+  ServiceConfig,
+  LoadBalancingConfig,
+  MethodConfig,
+  RetryPolicy,
+} from './service-config';
 
 export {
   ServerListener,
@@ -275,7 +280,7 @@ export {
   ResponderBuilder,
   ServerInterceptingCallInterface,
   ServerInterceptingCall,
-  ServerInterceptor
+  ServerInterceptor,
 } from './server-interceptors';
 
 import * as experimental from './experimental';
diff --git a/packages/grpc-js/src/internal-channel.ts b/packages/grpc-js/src/internal-channel.ts
index be140522b..469ace557 100644
--- a/packages/grpc-js/src/internal-channel.ts
+++ b/packages/grpc-js/src/internal-channel.ts
@@ -583,7 +583,8 @@ export class InternalChannel {
         return;
       }
       const now = new Date();
-      const timeSinceLastActivity = now.valueOf() - this.lastActivityTimestamp.valueOf();
+      const timeSinceLastActivity =
+        now.valueOf() - this.lastActivityTimestamp.valueOf();
       if (timeSinceLastActivity >= this.idleTimeoutMs) {
         this.trace(
           'Idle timer triggered after ' +
@@ -603,7 +604,10 @@ export class InternalChannel {
   }
 
   private maybeStartIdleTimer() {
-    if (this.connectivityState !== ConnectivityState.SHUTDOWN && !this.idleTimer) {
+    if (
+      this.connectivityState !== ConnectivityState.SHUTDOWN &&
+      !this.idleTimer
+    ) {
       this.startIdleTimeout(this.idleTimeoutMs);
     }
   }
@@ -680,7 +684,7 @@ export class InternalChannel {
     host: string,
     credentials: CallCredentials,
     deadline: Deadline
-  ): Call {
+  ): LoadBalancingCall | RetryingCall {
     // Create a RetryingCall if retries are enabled
     if (this.options['grpc.enable_retries'] === 0) {
       return this.createLoadBalancingCall(
diff --git a/packages/grpc-js/src/load-balancer-child-handler.ts b/packages/grpc-js/src/load-balancer-child-handler.ts
index a29d6c92b..352ea7b81 100644
--- a/packages/grpc-js/src/load-balancer-child-handler.ts
+++ b/packages/grpc-js/src/load-balancer-child-handler.ts
@@ -25,7 +25,7 @@ import { Endpoint, SubchannelAddress } from './subchannel-address';
 import { ChannelOptions } from './channel-options';
 import { ConnectivityState } from './connectivity-state';
 import { Picker } from './picker';
-import { ChannelRef, SubchannelRef } from './channelz';
+import type { ChannelRef, SubchannelRef } from './channelz';
 import { SubchannelInterface } from './subchannel-interface';
 
 const TYPE_NAME = 'child_load_balancer_helper';
diff --git a/packages/grpc-js/src/load-balancer-pick-first.ts b/packages/grpc-js/src/load-balancer-pick-first.ts
index c9224de6b..f6c43b33d 100644
--- a/packages/grpc-js/src/load-balancer-pick-first.ts
+++ b/packages/grpc-js/src/load-balancer-pick-first.ts
@@ -198,7 +198,12 @@ export class PickFirstLoadBalancer implements LoadBalancer {
     keepaliveTime,
     errorMessage
   ) => {
-    this.onSubchannelStateUpdate(subchannel, previousState, newState, errorMessage);
+    this.onSubchannelStateUpdate(
+      subchannel,
+      previousState,
+      newState,
+      errorMessage
+    );
   };
 
   private pickedSubchannelHealthListener: HealthListener = () =>
@@ -275,7 +280,9 @@ export class PickFirstLoadBalancer implements LoadBalancer {
       if (this.stickyTransientFailureMode) {
         this.updateState(
           ConnectivityState.TRANSIENT_FAILURE,
-          new UnavailablePicker({details: `No connection established. Last error: ${this.lastError}`})
+          new UnavailablePicker({
+            details: `No connection established. Last error: ${this.lastError}`,
+          })
         );
       } else {
         this.updateState(ConnectivityState.CONNECTING, new QueuePicker(this));
@@ -408,7 +415,8 @@ export class PickFirstLoadBalancer implements LoadBalancer {
     }
     this.connectionDelayTimeout = setTimeout(() => {
       this.startNextSubchannelConnecting(subchannelIndex + 1);
-    }, CONNECTION_DELAY_INTERVAL_MS).unref?.();
+    }, CONNECTION_DELAY_INTERVAL_MS);
+    this.connectionDelayTimeout.unref?.();
   }
 
   private pickSubchannel(subchannel: SubchannelInterface) {
@@ -441,7 +449,12 @@ export class PickFirstLoadBalancer implements LoadBalancer {
 
   private resetSubchannelList() {
     for (const child of this.children) {
-      if (!(this.currentPick && child.subchannel.realSubchannelEquals(this.currentPick))) {
+      if (
+        !(
+          this.currentPick &&
+          child.subchannel.realSubchannelEquals(this.currentPick)
+        )
+      ) {
         /* The connectivity state listener is the same whether the subchannel
          * is in the list of children or it is the currentPick, so if it is in
          * both, removing it here would cause problems. In particular, that
@@ -523,7 +536,10 @@ export class PickFirstLoadBalancer implements LoadBalancer {
   }
 
   exitIdle() {
-    if (this.currentState === ConnectivityState.IDLE && this.latestAddressList) {
+    if (
+      this.currentState === ConnectivityState.IDLE &&
+      this.latestAddressList
+    ) {
       this.connectToAddressList(this.latestAddressList);
     }
   }
@@ -605,6 +621,10 @@ export class LeafLoadBalancer {
     return this.endpoint;
   }
 
+  exitIdle() {
+    this.pickFirstBalancer.exitIdle();
+  }
+
   destroy() {
     this.pickFirstBalancer.destroy();
   }
diff --git a/packages/grpc-js/src/load-balancer-round-robin.ts b/packages/grpc-js/src/load-balancer-round-robin.ts
index 5ed26c9a5..7e70c554f 100644
--- a/packages/grpc-js/src/load-balancer-round-robin.ts
+++ b/packages/grpc-js/src/load-balancer-round-robin.ts
@@ -156,11 +156,22 @@ export class RoundRobinLoadBalancer implements LoadBalancer {
     ) {
       this.updateState(
         ConnectivityState.TRANSIENT_FAILURE,
-        new UnavailablePicker({details: `No connection established. Last error: ${this.lastError}`})
+        new UnavailablePicker({
+          details: `No connection established. Last error: ${this.lastError}`,
+        })
       );
     } else {
       this.updateState(ConnectivityState.IDLE, new QueuePicker(this));
     }
+    /* round_robin should keep all children connected, this is how we do that.
+     * We can't do this more efficiently in the individual child's updateState
+     * callback because that doesn't have a reference to which child the state
+     * change is associated with. */
+    for (const child of this.children) {
+      if (child.getConnectivityState() === ConnectivityState.IDLE) {
+        child.exitIdle();
+      }
+    }
   }
 
   private updateState(newState: ConnectivityState, picker: Picker) {
diff --git a/packages/grpc-js/src/load-balancer.ts b/packages/grpc-js/src/load-balancer.ts
index f8071317a..fb353a59a 100644
--- a/packages/grpc-js/src/load-balancer.ts
+++ b/packages/grpc-js/src/load-balancer.ts
@@ -19,7 +19,7 @@ import { ChannelOptions } from './channel-options';
 import { Endpoint, SubchannelAddress } from './subchannel-address';
 import { ConnectivityState } from './connectivity-state';
 import { Picker } from './picker';
-import { ChannelRef, SubchannelRef } from './channelz';
+import type { ChannelRef, SubchannelRef } from './channelz';
 import { SubchannelInterface } from './subchannel-interface';
 import { LoadBalancingConfig } from './service-config';
 import { log } from './logging';
diff --git a/packages/grpc-js/src/load-balancing-call.ts b/packages/grpc-js/src/load-balancing-call.ts
index 87ef02497..764769753 100644
--- a/packages/grpc-js/src/load-balancing-call.ts
+++ b/packages/grpc-js/src/load-balancing-call.ts
@@ -18,6 +18,7 @@
 import { CallCredentials } from './call-credentials';
 import {
   Call,
+  DeadlineInfoProvider,
   InterceptingListener,
   MessageContext,
   StatusObject,
@@ -25,7 +26,7 @@ import {
 import { SubchannelCall } from './subchannel-call';
 import { ConnectivityState } from './connectivity-state';
 import { LogVerbosity, Status } from './constants';
-import { Deadline, getDeadlineTimeoutString } from './deadline';
+import { Deadline, formatDateDifference, getDeadlineTimeoutString } from './deadline';
 import { InternalChannel } from './internal-channel';
 import { Metadata } from './metadata';
 import { PickResultType } from './picker';
@@ -48,7 +49,7 @@ export interface LoadBalancingCallInterceptingListener
   onReceiveStatus(status: StatusObjectWithProgress): void;
 }
 
-export class LoadBalancingCall implements Call {
+export class LoadBalancingCall implements Call, DeadlineInfoProvider {
   private child: SubchannelCall | null = null;
   private readPending = false;
   private pendingMessage: { context: MessageContext; message: Buffer } | null =
@@ -59,6 +60,8 @@ export class LoadBalancingCall implements Call {
   private metadata: Metadata | null = null;
   private listener: InterceptingListener | null = null;
   private onCallEnded: ((statusCode: Status) => void) | null = null;
+  private startTime: Date;
+  private childStartTime: Date | null = null;
   constructor(
     private readonly channel: InternalChannel,
     private readonly callConfig: CallConfig,
@@ -80,6 +83,26 @@ export class LoadBalancingCall implements Call {
     /* Currently, call credentials are only allowed on HTTPS connections, so we
      * can assume that the scheme is "https" */
     this.serviceUrl = `https://${hostname}/${serviceName}`;
+    this.startTime = new Date();
+  }
+  getDeadlineInfo(): string[] {
+    const deadlineInfo: string[] = [];
+    if (this.childStartTime) {
+      if (this.childStartTime > this.startTime) {
+        if (this.metadata?.getOptions().waitForReady) {
+          deadlineInfo.push('wait_for_ready');
+        }
+        deadlineInfo.push(`LB pick: ${formatDateDifference(this.startTime, this.childStartTime)}`);
+      }
+      deadlineInfo.push(...this.child!.getDeadlineInfo());
+      return deadlineInfo;
+    } else {
+      if (this.metadata?.getOptions().waitForReady) {
+        deadlineInfo.push('wait_for_ready');
+      }
+      deadlineInfo.push('Waiting for LB pick');
+    }
+    return deadlineInfo;
   }
 
   private trace(text: string): void {
@@ -98,7 +121,8 @@ export class LoadBalancingCall implements Call {
           status.code +
           ' details="' +
           status.details +
-          '"'
+          '" start time=' +
+          this.startTime.toISOString()
       );
       const finalStatus = { ...status, progress };
       this.listener?.onReceiveStatus(finalStatus);
@@ -145,7 +169,9 @@ export class LoadBalancingCall implements Call {
                * metadata generation finished, we shouldn't do anything with
                * it. */
               if (this.ended) {
-                this.trace('Credentials metadata generation finished after call ended');
+                this.trace(
+                  'Credentials metadata generation finished after call ended'
+                );
                 return;
               }
               finalMetadata.merge(credsMetadata);
@@ -207,6 +233,7 @@ export class LoadBalancingCall implements Call {
                       }
                     },
                   });
+                this.childStartTime = new Date();
               } catch (error) {
                 this.trace(
                   'Failed to start call on picked subchannel ' +
diff --git a/packages/grpc-js/src/logging.ts b/packages/grpc-js/src/logging.ts
index e1b396fff..2279d3b65 100644
--- a/packages/grpc-js/src/logging.ts
+++ b/packages/grpc-js/src/logging.ts
@@ -112,7 +112,18 @@ export function trace(
   text: string
 ): void {
   if (isTracerEnabled(tracer)) {
-    log(severity, new Date().toISOString() + ' | v' + clientVersion + ' ' + pid + ' | ' + tracer + ' | ' + text);
+    log(
+      severity,
+      new Date().toISOString() +
+        ' | v' +
+        clientVersion +
+        ' ' +
+        pid +
+        ' | ' +
+        tracer +
+        ' | ' +
+        text
+    );
   }
 }
 
diff --git a/packages/grpc-js/src/resolver-dns.ts b/packages/grpc-js/src/resolver-dns.ts
index 978f1442a..6463c2656 100644
--- a/packages/grpc-js/src/resolver-dns.ts
+++ b/packages/grpc-js/src/resolver-dns.ts
@@ -309,7 +309,8 @@ class DnsResolver implements Resolver {
       if (this.continueResolving) {
         this.startResolutionWithBackoff();
       }
-    }, this.minTimeBetweenResolutionsMs).unref?.();
+    }, this.minTimeBetweenResolutionsMs);
+    this.nextResolutionTimer.unref?.();
     this.isNextResolutionTimerRunning = true;
   }
 
@@ -335,9 +336,14 @@ class DnsResolver implements Resolver {
     if (this.pendingLookupPromise === null) {
       if (this.isNextResolutionTimerRunning || this.backoff.isRunning()) {
         if (this.isNextResolutionTimerRunning) {
-          trace('resolution update delayed by "min time between resolutions" rate limit');
+          trace(
+            'resolution update delayed by "min time between resolutions" rate limit'
+          );
         } else {
-          trace('resolution update delayed by backoff timer until ' + this.backoff.getEndTime().toISOString());
+          trace(
+            'resolution update delayed by backoff timer until ' +
+              this.backoff.getEndTime().toISOString()
+          );
         }
         this.continueResolving = true;
       } else {
diff --git a/packages/grpc-js/src/resolver-uds.ts b/packages/grpc-js/src/resolver-uds.ts
index 3a42b18c4..4d84de9d5 100644
--- a/packages/grpc-js/src/resolver-uds.ts
+++ b/packages/grpc-js/src/resolver-uds.ts
@@ -50,7 +50,7 @@ class UdsResolver implements Resolver {
   }
 
   destroy() {
-    // This resolver owns no resources, so we do nothing here.
+    this.hasReturnedResult = false;
   }
 
   static getDefaultAuthority(target: GrpcUri): string {
diff --git a/packages/grpc-js/src/resolving-call.ts b/packages/grpc-js/src/resolving-call.ts
index 723533dba..2c81e7883 100644
--- a/packages/grpc-js/src/resolving-call.ts
+++ b/packages/grpc-js/src/resolving-call.ts
@@ -19,6 +19,7 @@ import { CallCredentials } from './call-credentials';
 import {
   Call,
   CallStreamOptions,
+  DeadlineInfoProvider,
   InterceptingListener,
   MessageContext,
   StatusObject,
@@ -27,6 +28,7 @@ import { LogVerbosity, Propagate, Status } from './constants';
 import {
   Deadline,
   deadlineToString,
+  formatDateDifference,
   getRelativeTimeout,
   minDeadline,
 } from './deadline';
@@ -39,7 +41,7 @@ import { restrictControlPlaneStatusCode } from './control-plane-status';
 const TRACER_NAME = 'resolving_call';
 
 export class ResolvingCall implements Call {
-  private child: Call | null = null;
+  private child: (Call & DeadlineInfoProvider) | null = null;
   private readPending = false;
   private pendingMessage: { context: MessageContext; message: Buffer } | null =
     null;
@@ -56,6 +58,10 @@ export class ResolvingCall implements Call {
   private deadlineTimer: NodeJS.Timeout = setTimeout(() => {}, 0);
   private filterStack: FilterStack | null = null;
 
+  private deadlineStartTime: Date | null = null;
+  private configReceivedTime: Date | null = null;
+  private childStartTime: Date | null = null;
+
   constructor(
     private readonly channel: InternalChannel,
     private readonly method: string,
@@ -97,12 +103,37 @@ export class ResolvingCall implements Call {
 
   private runDeadlineTimer() {
     clearTimeout(this.deadlineTimer);
+    this.deadlineStartTime = new Date();
     this.trace('Deadline: ' + deadlineToString(this.deadline));
     const timeout = getRelativeTimeout(this.deadline);
     if (timeout !== Infinity) {
       this.trace('Deadline will be reached in ' + timeout + 'ms');
       const handleDeadline = () => {
-        this.cancelWithStatus(Status.DEADLINE_EXCEEDED, 'Deadline exceeded');
+        if (!this.deadlineStartTime) {
+          this.cancelWithStatus(Status.DEADLINE_EXCEEDED, 'Deadline exceeded');
+          return;
+        }
+        const deadlineInfo: string[] = [];
+        const deadlineEndTime = new Date();
+        deadlineInfo.push(`Deadline exceeded after ${formatDateDifference(this.deadlineStartTime, deadlineEndTime)}`);
+        if (this.configReceivedTime) {
+          if (this.configReceivedTime > this.deadlineStartTime) {
+            deadlineInfo.push(`name resolution: ${formatDateDifference(this.deadlineStartTime, this.configReceivedTime)}`);
+          }
+          if (this.childStartTime) {
+            if (this.childStartTime > this.configReceivedTime) {
+              deadlineInfo.push(`metadata filters: ${formatDateDifference(this.configReceivedTime, this.childStartTime)}`);
+            }
+          } else {
+            deadlineInfo.push('waiting for metadata filters');
+          }
+        } else {
+          deadlineInfo.push('waiting for name resolution');
+        }
+        if (this.child) {
+          deadlineInfo.push(...this.child.getDeadlineInfo());
+        }
+        this.cancelWithStatus(Status.DEADLINE_EXCEEDED, deadlineInfo.join(','));
       };
       if (timeout <= 0) {
         process.nextTick(handleDeadline);
@@ -176,6 +207,7 @@ export class ResolvingCall implements Call {
       return;
     }
     // configResult.type === 'SUCCESS'
+    this.configReceivedTime = new Date();
     const config = configResult.config;
     if (config.status !== Status.OK) {
       const { code, details } = restrictControlPlaneStatusCode(
@@ -215,6 +247,7 @@ export class ResolvingCall implements Call {
           this.deadline
         );
         this.trace('Created child [' + this.child.getCallNumber() + ']');
+        this.childStartTime = new Date();
         this.child.start(filteredMetadata, {
           onReceiveMetadata: metadata => {
             this.trace('Received metadata');
diff --git a/packages/grpc-js/src/resolving-load-balancer.ts b/packages/grpc-js/src/resolving-load-balancer.ts
index a8de2019a..72aef0dfd 100644
--- a/packages/grpc-js/src/resolving-load-balancer.ts
+++ b/packages/grpc-js/src/resolving-load-balancer.ts
@@ -212,6 +212,7 @@ export class ResolvingLoadBalancer implements LoadBalancer {
         methodConfig: [],
       };
     }
+
     this.updateState(ConnectivityState.IDLE, new QueuePicker(this));
     this.childLoadBalancer = new ChildLoadBalancerHandler(
       {
@@ -223,8 +224,11 @@ export class ResolvingLoadBalancer implements LoadBalancer {
            * In that case, the backoff timer callback will call
            * updateResolution */
           if (this.backoffTimeout.isRunning()) {
-            trace('requestReresolution delayed by backoff timer until ' + this.backoffTimeout.getEndTime().toISOString());
-          this.continueResolving = true;
+            trace(
+              'requestReresolution delayed by backoff timer until ' +
+                this.backoffTimeout.getEndTime().toISOString()
+            );
+            this.continueResolving = true;
           } else {
             this.updateResolution();
           }
diff --git a/packages/grpc-js/src/retrying-call.ts b/packages/grpc-js/src/retrying-call.ts
index e6e1cbb44..1c5ffaa4f 100644
--- a/packages/grpc-js/src/retrying-call.ts
+++ b/packages/grpc-js/src/retrying-call.ts
@@ -17,12 +17,13 @@
 
 import { CallCredentials } from './call-credentials';
 import { LogVerbosity, Status } from './constants';
-import { Deadline } from './deadline';
+import { Deadline, formatDateDifference } from './deadline';
 import { Metadata } from './metadata';
 import { CallConfig } from './resolver';
 import * as logging from './logging';
 import {
   Call,
+  DeadlineInfoProvider,
   InterceptingListener,
   MessageContext,
   StatusObject,
@@ -121,6 +122,7 @@ interface UnderlyingCall {
   state: UnderlyingCallState;
   call: LoadBalancingCall;
   nextMessageToSend: number;
+  startTime: Date;
 }
 
 /**
@@ -170,7 +172,7 @@ interface WriteBufferEntry {
 
 const PREVIONS_RPC_ATTEMPTS_METADATA_KEY = 'grpc-previous-rpc-attempts';
 
-export class RetryingCall implements Call {
+export class RetryingCall implements Call, DeadlineInfoProvider {
   private state: RetryingCallState;
   private listener: InterceptingListener | null = null;
   private initialMetadata: Metadata | null = null;
@@ -198,6 +200,7 @@ export class RetryingCall implements Call {
   private committedCallIndex: number | null = null;
   private initialRetryBackoffSec = 0;
   private nextRetryBackoffSec = 0;
+  private startTime: Date;
   constructor(
     private readonly channel: InternalChannel,
     private readonly callConfig: CallConfig,
@@ -223,6 +226,22 @@ export class RetryingCall implements Call {
     } else {
       this.state = 'TRANSPARENT_ONLY';
     }
+    this.startTime = new Date();
+  }
+  getDeadlineInfo(): string[] {
+    if (this.underlyingCalls.length === 0) {
+      return [];
+    }
+    const deadlineInfo: string[] = [];
+    const latestCall = this.underlyingCalls[this.underlyingCalls.length - 1];
+    if (this.underlyingCalls.length > 1) {
+      deadlineInfo.push(`previous attempts: ${this.underlyingCalls.length - 1}`);
+    }
+    if (latestCall.startTime > this.startTime) {
+      deadlineInfo.push(`time to current attempt start: ${formatDateDifference(this.startTime, latestCall.startTime)}`);
+    }
+    deadlineInfo.push(...latestCall.call.getDeadlineInfo());
+    return deadlineInfo;
   }
   getCallNumber(): number {
     return this.callNumber;
@@ -242,7 +261,8 @@ export class RetryingCall implements Call {
         statusObject.code +
         ' details="' +
         statusObject.details +
-        '"'
+        '" start time=' +
+        this.startTime.toISOString()
     );
     this.bufferTracker.freeAll(this.callNumber);
     this.writeBufferOffset = this.writeBufferOffset + this.writeBuffer.length;
@@ -628,6 +648,7 @@ export class RetryingCall implements Call {
       state: 'ACTIVE',
       call: child,
       nextMessageToSend: 0,
+      startTime: new Date()
     });
     const previousAttempts = this.attempts - 1;
     const initialMetadata = this.initialMetadata!.clone();
diff --git a/packages/grpc-js/src/server-call.ts b/packages/grpc-js/src/server-call.ts
index edc38e983..ccc80a1aa 100644
--- a/packages/grpc-js/src/server-call.ts
+++ b/packages/grpc-js/src/server-call.ts
@@ -18,15 +18,13 @@
 import { EventEmitter } from 'events';
 import { Duplex, Readable, Writable } from 'stream';
 
-import {
-  Status,
-} from './constants';
-import { Deserialize, Serialize } from './make-client';
+import { Status } from './constants';
+import type { Deserialize, Serialize } from './make-client';
 import { Metadata } from './metadata';
-import { ObjectReadable, ObjectWritable } from './object-stream';
-import { StatusObject, PartialStatusObject } from './call-interface';
-import { Deadline } from './deadline';
-import { ServerInterceptingCallInterface } from './server-interceptors';
+import type { ObjectReadable, ObjectWritable } from './object-stream';
+import type { StatusObject, PartialStatusObject } from './call-interface';
+import type { Deadline } from './deadline';
+import type { ServerInterceptingCallInterface } from './server-interceptors';
 
 export type ServerStatusResponse = Partial<StatusObject>;
 
@@ -56,11 +54,14 @@ export type ServerDuplexStream<RequestType, ResponseType> = ServerSurfaceCall &
   ObjectReadable<RequestType> &
   ObjectWritable<ResponseType> & { end: (metadata?: Metadata) => void };
 
-export function serverErrorToStatus(error: ServerErrorResponse | ServerStatusResponse, overrideTrailers?: Metadata | undefined): PartialStatusObject {
+export function serverErrorToStatus(
+  error: ServerErrorResponse | ServerStatusResponse,
+  overrideTrailers?: Metadata | undefined
+): PartialStatusObject {
   const status: PartialStatusObject = {
     code: Status.UNKNOWN,
     details: 'message' in error ? error.message : 'Unknown Error',
-    metadata: overrideTrailers ?? error.metadata ?? null
+    metadata: overrideTrailers ?? error.metadata ?? null,
   };
 
   if (
@@ -154,7 +155,7 @@ export class ServerWritableStreamImpl<RequestType, ResponseType>
   private trailingMetadata: Metadata;
   private pendingStatus: PartialStatusObject = {
     code: Status.OK,
-    details: 'OK'
+    details: 'OK',
   };
 
   constructor(
@@ -199,11 +200,11 @@ export class ServerWritableStreamImpl<RequestType, ResponseType>
   }
 
   _final(callback: Function): void {
+    callback(null);
     this.call.sendStatus({
       ...this.pendingStatus,
       metadata: this.pendingStatus.metadata ?? this.trailingMetadata,
     });
-    callback(null);
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -224,7 +225,7 @@ export class ServerDuplexStreamImpl<RequestType, ResponseType>
   private trailingMetadata: Metadata;
   private pendingStatus: PartialStatusObject = {
     code: Status.OK,
-    details: 'OK'
+    details: 'OK',
   };
 
   constructor(
@@ -272,11 +273,11 @@ export class ServerDuplexStreamImpl<RequestType, ResponseType>
   }
 
   _final(callback: Function): void {
+    callback(null);
     this.call.sendStatus({
       ...this.pendingStatus,
       metadata: this.pendingStatus.metadata ?? this.trailingMetadata,
     });
-    callback(null);
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -329,7 +330,7 @@ export interface UnaryHandler<RequestType, ResponseType> {
   func: handleUnaryCall<RequestType, ResponseType>;
   serialize: Serialize<ResponseType>;
   deserialize: Deserialize<RequestType>;
-  type: HandlerType;
+  type: 'unary';
   path: string;
 }
 
@@ -337,7 +338,7 @@ export interface ClientStreamingHandler<RequestType, ResponseType> {
   func: handleClientStreamingCall<RequestType, ResponseType>;
   serialize: Serialize<ResponseType>;
   deserialize: Deserialize<RequestType>;
-  type: HandlerType;
+  type: 'clientStream';
   path: string;
 }
 
@@ -345,7 +346,7 @@ export interface ServerStreamingHandler<RequestType, ResponseType> {
   func: handleServerStreamingCall<RequestType, ResponseType>;
   serialize: Serialize<ResponseType>;
   deserialize: Deserialize<RequestType>;
-  type: HandlerType;
+  type: 'serverStream';
   path: string;
 }
 
@@ -353,7 +354,7 @@ export interface BidiStreamingHandler<RequestType, ResponseType> {
   func: handleBidiStreamingCall<RequestType, ResponseType>;
   serialize: Serialize<ResponseType>;
   deserialize: Deserialize<RequestType>;
-  type: HandlerType;
+  type: 'bidi';
   path: string;
 }
 
diff --git a/packages/grpc-js/src/server-interceptors.ts b/packages/grpc-js/src/server-interceptors.ts
index 726b86333..8afc59b17 100644
--- a/packages/grpc-js/src/server-interceptors.ts
+++ b/packages/grpc-js/src/server-interceptors.ts
@@ -15,19 +15,24 @@
  *
  */
 
-import { PartialStatusObject} from "./call-interface";
-import { ServerMethodDefinition } from "./make-client";
-import { Metadata } from "./metadata";
-import { ChannelOptions } from "./channel-options";
-import { Handler, ServerErrorResponse } from "./server-call";
-import { Deadline } from "./deadline";
-import { DEFAULT_MAX_RECEIVE_MESSAGE_LENGTH, DEFAULT_MAX_SEND_MESSAGE_LENGTH, LogVerbosity, Status } from "./constants";
+import { PartialStatusObject } from './call-interface';
+import { ServerMethodDefinition } from './make-client';
+import { Metadata } from './metadata';
+import { ChannelOptions } from './channel-options';
+import { Handler, ServerErrorResponse } from './server-call';
+import { Deadline } from './deadline';
+import {
+  DEFAULT_MAX_RECEIVE_MESSAGE_LENGTH,
+  DEFAULT_MAX_SEND_MESSAGE_LENGTH,
+  LogVerbosity,
+  Status,
+} from './constants';
 import * as http2 from 'http2';
-import { getErrorMessage } from "./error";
+import { getErrorMessage } from './error';
 import * as zlib from 'zlib';
-import { promisify } from "util";
-import { StreamDecoder } from "./stream-decoder";
-import { CallEventTracker } from "./transport";
+import { promisify } from 'util';
+import { StreamDecoder } from './stream-decoder';
+import { CallEventTracker } from './transport';
 import * as logging from './logging';
 
 const unzip = promisify(zlib.unzip);
@@ -96,7 +101,7 @@ export class ServerListenerBuilder {
       onReceiveMetadata: this.metadata,
       onReceiveMessage: this.message,
       onReceiveHalfClose: this.halfClose,
-      onCancel: this.cancel
+      onCancel: this.cancel,
     };
   }
 }
@@ -109,22 +114,30 @@ export interface InterceptingServerListener {
   onCancel(): void;
 }
 
-export function isInterceptingServerListener(listener: ServerListener | InterceptingServerListener): listener is InterceptingServerListener {
-  return listener.onReceiveMetadata !== undefined && listener.onReceiveMetadata.length === 1;
+export function isInterceptingServerListener(
+  listener: ServerListener | InterceptingServerListener
+): listener is InterceptingServerListener {
+  return (
+    listener.onReceiveMetadata !== undefined &&
+    listener.onReceiveMetadata.length === 1
+  );
 }
 
 class InterceptingServerListenerImpl implements InterceptingServerListener {
   /**
    * Once the call is cancelled, ignore all other events.
    */
-  private cancelled: boolean = false;
-  private processingMetadata: boolean = false;
-  private hasPendingMessage: boolean = false;
+  private cancelled = false;
+  private processingMetadata = false;
+  private hasPendingMessage = false;
   private pendingMessage: any = null;
-  private processingMessage: boolean = false;
-  private hasPendingHalfClose: boolean = false;
+  private processingMessage = false;
+  private hasPendingHalfClose = false;
 
-  constructor(private listener: FullServerListener, private nextListener: InterceptingServerListener) {}
+  constructor(
+    private listener: FullServerListener,
+    private nextListener: InterceptingServerListener
+  ) {}
 
   private processPendingMessage() {
     if (this.hasPendingMessage) {
@@ -195,7 +208,6 @@ class InterceptingServerListenerImpl implements InterceptingServerListener {
     this.listener.onCancel();
     this.nextListener.onCancel();
   }
-
 }
 
 export interface StartResponder {
@@ -212,7 +224,10 @@ export interface MessageResponder {
 }
 
 export interface StatusResponder {
-  (status: PartialStatusObject, next: (status: PartialStatusObject) => void): void;
+  (
+    status: PartialStatusObject,
+    next: (status: PartialStatusObject) => void
+  ): void;
 }
 
 export interface FullResponder {
@@ -255,7 +270,7 @@ export class ResponderBuilder {
       start: this.start,
       sendMetadata: this.metadata,
       sendMessage: this.message,
-      sendStatus: this.status
+      sendStatus: this.status,
     };
   }
 }
@@ -270,11 +285,11 @@ const defaultServerListener: FullServerListener = {
   onReceiveHalfClose: next => {
     next();
   },
-  onCancel: () => {}
+  onCancel: () => {},
 };
 
 const defaultResponder: FullResponder = {
-  start: (next) => {
+  start: next => {
     next();
   },
   sendMetadata: (metadata, next) => {
@@ -285,7 +300,7 @@ const defaultResponder: FullResponder = {
   },
   sendStatus: (status, next) => {
     next(status);
-  }
+  },
 };
 
 export interface ServerInterceptingCallInterface {
@@ -325,18 +340,29 @@ export interface ServerInterceptingCallInterface {
 
 export class ServerInterceptingCall implements ServerInterceptingCallInterface {
   private responder: FullResponder;
-  private processingMetadata: boolean = false;
-  private processingMessage: boolean = false;
+  private processingMetadata = false;
+  private processingMessage = false;
   private pendingMessage: any = null;
   private pendingMessageCallback: (() => void) | null = null;
   private pendingStatus: PartialStatusObject | null = null;
-  constructor(private nextCall: ServerInterceptingCallInterface, responder?: Responder) {
-    this.responder = {...defaultResponder, ...responder};
+  constructor(
+    private nextCall: ServerInterceptingCallInterface,
+    responder?: Responder
+  ) {
+    this.responder = {
+      start: responder?.start ?? defaultResponder.start,
+      sendMetadata: responder?.sendMetadata ?? defaultResponder.sendMetadata,
+      sendMessage: responder?.sendMessage ?? defaultResponder.sendMessage,
+      sendStatus: responder?.sendStatus ?? defaultResponder.sendStatus,
+    };
   }
 
   private processPendingMessage() {
     if (this.pendingMessageCallback) {
-      this.nextCall.sendMessage(this.pendingMessage, this.pendingMessageCallback);
+      this.nextCall.sendMessage(
+        this.pendingMessage,
+        this.pendingMessageCallback
+      );
       this.pendingMessage = null;
       this.pendingMessageCallback = null;
     }
@@ -351,8 +377,23 @@ export class ServerInterceptingCall implements ServerInterceptingCallInterface {
 
   start(listener: InterceptingServerListener): void {
     this.responder.start(interceptedListener => {
-      const fullInterceptedListener: FullServerListener = {...defaultServerListener, ...interceptedListener};
-      const finalInterceptingListener = new InterceptingServerListenerImpl(fullInterceptedListener, listener);
+      const fullInterceptedListener: FullServerListener = {
+        onReceiveMetadata:
+          interceptedListener?.onReceiveMetadata ??
+          defaultServerListener.onReceiveMetadata,
+        onReceiveMessage:
+          interceptedListener?.onReceiveMessage ??
+          defaultServerListener.onReceiveMessage,
+        onReceiveHalfClose:
+          interceptedListener?.onReceiveHalfClose ??
+          defaultServerListener.onReceiveHalfClose,
+        onCancel:
+          interceptedListener?.onCancel ?? defaultServerListener.onCancel,
+      };
+      const finalInterceptingListener = new InterceptingServerListenerImpl(
+        fullInterceptedListener,
+        listener
+      );
       this.nextCall.start(finalInterceptingListener);
     });
   }
@@ -401,7 +442,10 @@ export class ServerInterceptingCall implements ServerInterceptingCallInterface {
 }
 
 export interface ServerInterceptor {
-  (methodDescriptor: ServerMethodDefinition<any, any>, call: ServerInterceptingCallInterface): ServerInterceptingCall;
+  (
+    methodDescriptor: ServerMethodDefinition<any, any>,
+    call: ServerInterceptingCallInterface
+  ): ServerInterceptingCall;
 }
 
 interface DeadlineUnitIndexSignature {
@@ -445,7 +489,9 @@ interface ReadQueueEntry {
   parsedMessage: any;
 }
 
-export class BaseServerInterceptingCall implements ServerInterceptingCallInterface {
+export class BaseServerInterceptingCall
+  implements ServerInterceptingCallInterface
+{
   private listener: InterceptingServerListener | null = null;
   private metadata: Metadata;
   private deadlineTimer: NodeJS.Timeout | null = null;
@@ -456,7 +502,7 @@ export class BaseServerInterceptingCall implements ServerInterceptingCallInterfa
   private metadataSent = false;
   private wantTrailers = false;
   private cancelNotified = false;
-  private incomingEncoding: string = 'identity';
+  private incomingEncoding = 'identity';
   private decoder = new StreamDecoder();
   private readQueue: ReadQueueEntry[] = [];
   private isReadPending = false;
@@ -493,7 +539,7 @@ export class BaseServerInterceptingCall implements ServerInterceptingCallInterfa
         this.callEventTracker.onCallEnd({
           code: Status.CANCELLED,
           details: 'Stream closed before sending status',
-          metadata: null
+          metadata: null,
         });
       }
 
@@ -557,7 +603,7 @@ export class BaseServerInterceptingCall implements ServerInterceptingCallInterfa
       const status: PartialStatusObject = {
         code: Status.INTERNAL,
         details: `Invalid ${GRPC_TIMEOUT_HEADER} value "${timeoutHeader}"`,
-        metadata: null
+        metadata: null,
       };
       // Wait for the constructor to complete before sending the error.
       process.nextTick(() => {
@@ -574,11 +620,10 @@ export class BaseServerInterceptingCall implements ServerInterceptingCallInterfa
       const status: PartialStatusObject = {
         code: Status.DEADLINE_EXCEEDED,
         details: 'Deadline exceeded',
-        metadata: null
+        metadata: null,
       };
       this.sendStatus(status);
     }, timeout);
-
   }
 
   private checkCancelled(): boolean {
@@ -659,14 +704,19 @@ export class BaseServerInterceptingCall implements ServerInterceptingCallInterfa
     }
 
     const compressed = queueEntry.compressedMessage!.readUInt8(0) === 1;
-    const compressedMessageEncoding = compressed ? this.incomingEncoding : 'identity';
-    const decompressedMessage = await this.decompressMessage(queueEntry.compressedMessage!, compressedMessageEncoding);
+    const compressedMessageEncoding = compressed
+      ? this.incomingEncoding
+      : 'identity';
+    const decompressedMessage = await this.decompressMessage(
+      queueEntry.compressedMessage!,
+      compressedMessageEncoding
+    );
     try {
       queueEntry.parsedMessage = this.handler.deserialize(decompressedMessage);
     } catch (err) {
       this.sendStatus({
         code: Status.INTERNAL,
-        details: `Error deserializing request: ${(err as Error).message}`
+        details: `Error deserializing request: ${(err as Error).message}`,
       });
       return;
     }
@@ -675,7 +725,12 @@ export class BaseServerInterceptingCall implements ServerInterceptingCallInterfa
   }
 
   private maybePushNextMessage() {
-    if (this.listener && this.isReadPending && this.readQueue.length > 0 && this.readQueue[0].type !== 'COMPRESSED') {
+    if (
+      this.listener &&
+      this.isReadPending &&
+      this.readQueue.length > 0 &&
+      this.readQueue[0].type !== 'COMPRESSED'
+    ) {
       this.isReadPending = false;
       const nextQueueEntry = this.readQueue.shift()!;
       if (nextQueueEntry.type === 'READABLE') {
@@ -691,23 +746,33 @@ export class BaseServerInterceptingCall implements ServerInterceptingCallInterfa
     if (this.checkCancelled()) {
       return;
     }
-    trace('Request to ' + this.handler.path + ' received data frame of size ' + data.length);
+    trace(
+      'Request to ' +
+        this.handler.path +
+        ' received data frame of size ' +
+        data.length
+    );
     const rawMessages = this.decoder.write(data);
 
     for (const messageBytes of rawMessages) {
       this.stream.pause();
-      if (this.maxReceiveMessageSize !== -1 && messageBytes.length - 5 > this.maxReceiveMessageSize) {
+      if (
+        this.maxReceiveMessageSize !== -1 &&
+        messageBytes.length - 5 > this.maxReceiveMessageSize
+      ) {
         this.sendStatus({
           code: Status.RESOURCE_EXHAUSTED,
-          details: `Received message larger than max (${messageBytes.length - 5} vs. ${this.maxReceiveMessageSize})`,
-          metadata: null
+          details: `Received message larger than max (${
+            messageBytes.length - 5
+          } vs. ${this.maxReceiveMessageSize})`,
+          metadata: null,
         });
         return;
       }
       const queueEntry: ReadQueueEntry = {
         type: 'COMPRESSED',
         compressedMessage: messageBytes,
-        parsedMessage: null
+        parsedMessage: null,
       };
       this.readQueue.push(queueEntry);
       this.decompressAndMaybePush(queueEntry);
@@ -718,7 +783,7 @@ export class BaseServerInterceptingCall implements ServerInterceptingCallInterfa
     this.readQueue.push({
       type: 'HALF_CLOSE',
       compressedMessage: null,
-      parsedMessage: null
+      parsedMessage: null,
     });
     this.receivedHalfClose = true;
     this.maybePushNextMessage();
@@ -760,7 +825,7 @@ export class BaseServerInterceptingCall implements ServerInterceptingCallInterfa
       this.sendStatus({
         code: Status.INTERNAL,
         details: `Error serializing response: ${getErrorMessage(e)}`,
-        metadata: null
+        metadata: null,
       });
       return;
     }
@@ -772,18 +837,23 @@ export class BaseServerInterceptingCall implements ServerInterceptingCallInterfa
       this.sendStatus({
         code: Status.RESOURCE_EXHAUSTED,
         details: `Sent message larger than max (${response.length} vs. ${this.maxSendMessageSize})`,
-        metadata: null
+        metadata: null,
       });
       return;
     }
     this.maybeSendMetadata();
-    trace('Request to ' + this.handler.path + ' sent data frame of size ' + response.length);
+    trace(
+      'Request to ' +
+        this.handler.path +
+        ' sent data frame of size ' +
+        response.length
+    );
     this.stream.write(response, error => {
       if (error) {
         this.sendStatus({
           code: Status.INTERNAL,
           details: `Error writing message: ${getErrorMessage(error)}`,
-          metadata: null
+          metadata: null,
         });
         return;
       }
@@ -795,7 +865,6 @@ export class BaseServerInterceptingCall implements ServerInterceptingCallInterfa
     if (this.checkCancelled()) {
       return;
     }
-    this.notifyOnCancel();
 
     trace(
       'Request to method ' +
@@ -806,7 +875,7 @@ export class BaseServerInterceptingCall implements ServerInterceptingCallInterfa
         status.details
     );
 
-    if (this.stream.headersSent) {
+    if (this.metadataSent) {
       if (!this.wantTrailers) {
         this.wantTrailers = true;
         this.stream.once('wantTrailers', () => {
@@ -822,8 +891,11 @@ export class BaseServerInterceptingCall implements ServerInterceptingCallInterfa
           };
 
           this.stream.sendTrailers(trailersToSend);
+          this.notifyOnCancel();
         });
         this.stream.end();
+      } else {
+        this.notifyOnCancel();
       }
     } else {
       if (this.callEventTracker && !this.streamEnded) {
@@ -839,6 +911,7 @@ export class BaseServerInterceptingCall implements ServerInterceptingCallInterfa
         ...status.metadata?.toHttp2Headers(),
       };
       this.stream.respond(trailersToSend, { endStream: true });
+      this.notifyOnCancel();
     }
   }
   startRead(): void {
@@ -883,16 +956,24 @@ export function getServerInterceptingCall(
   handler: Handler<any, any>,
   options: ChannelOptions
 ) {
-
   const methodDefinition: ServerMethodDefinition<any, any> = {
     path: handler.path,
     requestStream: handler.type === 'clientStream' || handler.type === 'bidi',
     responseStream: handler.type === 'serverStream' || handler.type === 'bidi',
     requestDeserialize: handler.deserialize,
-    responseSerialize: handler.serialize
-  }
-  const baseCall = new BaseServerInterceptingCall(stream, headers, callEventTracker, handler, options);
-  return interceptors.reduce((call: ServerInterceptingCallInterface, interceptor: ServerInterceptor) => {
-    return interceptor(methodDefinition, call);
-  }, baseCall);
+    responseSerialize: handler.serialize,
+  };
+  const baseCall = new BaseServerInterceptingCall(
+    stream,
+    headers,
+    callEventTracker,
+    handler,
+    options
+  );
+  return interceptors.reduce(
+    (call: ServerInterceptingCallInterface, interceptor: ServerInterceptor) => {
+      return interceptor(methodDefinition, call);
+    },
+    baseCall
+  );
 }
diff --git a/packages/grpc-js/src/server.ts b/packages/grpc-js/src/server.ts
index 94f9c1a35..1e4611117 100644
--- a/packages/grpc-js/src/server.ts
+++ b/packages/grpc-js/src/server.ts
@@ -55,11 +55,20 @@ import {
   subchannelAddressToString,
   stringToSubchannelAddress,
 } from './subchannel-address';
-import { GrpcUri, combineHostPort, parseUri, splitHostPort, uriToString } from './uri-parser';
+import {
+  GrpcUri,
+  combineHostPort,
+  parseUri,
+  splitHostPort,
+  uriToString,
+} from './uri-parser';
 import {
   ChannelzCallTracker,
+  ChannelzCallTrackerStub,
   ChannelzChildrenTracker,
+  ChannelzChildrenTrackerStub,
   ChannelzTrace,
+  ChannelzTraceStub,
   registerChannelzServer,
   registerChannelzSocket,
   ServerInfo,
@@ -70,7 +79,11 @@ import {
   unregisterChannelzRef,
 } from './channelz';
 import { CipherNameAndProtocol, TLSSocket } from 'tls';
-import { ServerInterceptingCallInterface, ServerInterceptor, getServerInterceptingCall } from './server-interceptors';
+import {
+  ServerInterceptingCallInterface,
+  ServerInterceptor,
+  getServerInterceptingCall,
+} from './server-interceptors';
 import { PartialStatusObject } from './call-interface';
 import { CallEventTracker } from './transport';
 import { Socket } from 'net';
@@ -79,10 +92,12 @@ import { Duplex } from 'stream';
 const UNLIMITED_CONNECTION_AGE_MS = ~(1 << 31);
 const KEEPALIVE_MAX_TIME_MS = ~(1 << 31);
 const KEEPALIVE_TIMEOUT_MS = 20000;
+const MAX_CONNECTION_IDLE_MS = ~(1 << 31);
 
 const { HTTP2_HEADER_PATH } = http2.constants;
 
 const TRACER_NAME = 'server';
+const kMaxAge = Buffer.from('max_age');
 
 type AnyHttp2Server = http2.Http2Server | http2.Http2SecureServer;
 
@@ -105,9 +120,15 @@ function noop(): void {}
  * @returns
  */
 function deprecate(message: string) {
-  return function <This, Args extends any[], Return>(target: (this: This, ...args: Args) => Return, context: ClassMethodDecoratorContext<This, (this: This, ...args: Args) => Return>) {
+  return function <This, Args extends any[], Return>(
+    target: (this: This, ...args: Args) => Return,
+    context: ClassMethodDecoratorContext<
+      This,
+      (this: This, ...args: Args) => Return
+    >
+  ) {
     return util.deprecate(target, message);
-  }
+  };
 }
 
 function getUnimplementedStatusResponse(
@@ -163,9 +184,10 @@ function getDefaultHandler(handlerType: HandlerType, methodName: string) {
 
 interface ChannelzSessionInfo {
   ref: SocketRef;
-  streamTracker: ChannelzCallTracker;
+  streamTracker: ChannelzCallTracker | ChannelzCallTrackerStub;
   messagesSent: number;
   messagesReceived: number;
+  keepAlivesSent: number;
   lastMessageSentTimestamp: Date | null;
   lastMessageReceivedTimestamp: Date | null;
 }
@@ -211,7 +233,7 @@ interface BoundPort {
    * that expands to multiple addresses will result in multiple listening
    * servers.
    */
-  listeningServers: Set<AnyHttp2Server>
+  listeningServers: Set<AnyHttp2Server>;
 }
 
 /**
@@ -222,8 +244,15 @@ interface Http2ServerInfo {
   sessions: Set<http2.ServerHttp2Session>;
 }
 
+interface SessionIdleTimeoutTracker {
+  activeStreams: number;
+  lastIdle: number;
+  timeout: NodeJS.Timeout;
+  onClose: (session: http2.ServerHttp2Session) => void | null;
+}
+
 export interface ServerOptions extends ChannelOptions {
-  interceptors?: ServerInterceptor[]
+  interceptors?: ServerInterceptor[];
 }
 
 export interface ConnectionInjector {
@@ -233,8 +262,12 @@ export interface ConnectionInjector {
 }
 
 export class Server {
-  private boundPorts: Map<string, BoundPort>= new Map();
+  private boundPorts: Map<string, BoundPort> = new Map();
   private http2Servers: Map<AnyHttp2Server, Http2ServerInfo> = new Map();
+  private sessionIdleTimeouts = new Map<
+    http2.ServerHttp2Session,
+    SessionIdleTimeoutTracker
+  >();
 
   private handlers: Map<string, UntypedHandler> = new Map<
     string,
@@ -253,10 +286,14 @@ export class Server {
   // Channelz Info
   private readonly channelzEnabled: boolean = true;
   private channelzRef: ServerRef;
-  private channelzTrace = new ChannelzTrace();
-  private callTracker = new ChannelzCallTracker();
-  private listenerChildrenTracker = new ChannelzChildrenTracker();
-  private sessionChildrenTracker = new ChannelzChildrenTracker();
+  private channelzTrace: ChannelzTrace | ChannelzTraceStub;
+  private callTracker: ChannelzCallTracker | ChannelzCallTrackerStub;
+  private listenerChildrenTracker:
+    | ChannelzChildrenTracker
+    | ChannelzChildrenTrackerStub;
+  private sessionChildrenTracker:
+    | ChannelzChildrenTracker
+    | ChannelzChildrenTrackerStub;
 
   private readonly maxConnectionAgeMs: number;
   private readonly maxConnectionAgeGraceMs: number;
@@ -264,6 +301,8 @@ export class Server {
   private readonly keepaliveTimeMs: number;
   private readonly keepaliveTimeoutMs: number;
 
+  private readonly sessionIdleTimeout: number;
+
   private readonly interceptors: ServerInterceptor[];
 
   /**
@@ -276,14 +315,24 @@ export class Server {
     this.options = options ?? {};
     if (this.options['grpc.enable_channelz'] === 0) {
       this.channelzEnabled = false;
+      this.channelzTrace = new ChannelzTraceStub();
+      this.callTracker = new ChannelzCallTrackerStub();
+      this.listenerChildrenTracker = new ChannelzChildrenTrackerStub();
+      this.sessionChildrenTracker = new ChannelzChildrenTrackerStub();
+    } else {
+      this.channelzTrace = new ChannelzTrace();
+      this.callTracker = new ChannelzCallTracker();
+      this.listenerChildrenTracker = new ChannelzChildrenTracker();
+      this.sessionChildrenTracker = new ChannelzChildrenTracker();
     }
+
     this.channelzRef = registerChannelzServer(
+      'server',
       () => this.getChannelzInfo(),
       this.channelzEnabled
     );
-    if (this.channelzEnabled) {
-      this.channelzTrace.addTrace('CT_INFO', 'Server created');
-    }
+
+    this.channelzTrace.addTrace('CT_INFO', 'Server created');
     this.maxConnectionAgeMs =
       this.options['grpc.max_connection_age_ms'] ?? UNLIMITED_CONNECTION_AGE_MS;
     this.maxConnectionAgeGraceMs =
@@ -293,6 +342,9 @@ export class Server {
       this.options['grpc.keepalive_time_ms'] ?? KEEPALIVE_MAX_TIME_MS;
     this.keepaliveTimeoutMs =
       this.options['grpc.keepalive_timeout_ms'] ?? KEEPALIVE_TIMEOUT_MS;
+    this.sessionIdleTimeout =
+      this.options['grpc.max_connection_idle_ms'] ?? MAX_CONNECTION_IDLE_MS;
+
     this.commonServerOptions = {
       maxSendHeaderBlockLength: Number.MAX_SAFE_INTEGER,
     };
@@ -324,67 +376,63 @@ export class Server {
     };
   }
 
-  private getChannelzSessionInfoGetter(
+  private getChannelzSessionInfo(
     session: http2.ServerHttp2Session
-  ): () => SocketInfo {
-    return () => {
-      const sessionInfo = this.sessions.get(session)!;
-      const sessionSocket = session.socket;
-      const remoteAddress = sessionSocket.remoteAddress
-        ? stringToSubchannelAddress(
-            sessionSocket.remoteAddress,
-            sessionSocket.remotePort
-          )
-        : null;
-      const localAddress = sessionSocket.localAddress
-        ? stringToSubchannelAddress(
-            sessionSocket.localAddress!,
-            sessionSocket.localPort
-          )
-        : null;
-      let tlsInfo: TlsInfo | null;
-      if (session.encrypted) {
-        const tlsSocket: TLSSocket = sessionSocket as TLSSocket;
-        const cipherInfo: CipherNameAndProtocol & { standardName?: string } =
-          tlsSocket.getCipher();
-        const certificate = tlsSocket.getCertificate();
-        const peerCertificate = tlsSocket.getPeerCertificate();
-        tlsInfo = {
-          cipherSuiteStandardName: cipherInfo.standardName ?? null,
-          cipherSuiteOtherName: cipherInfo.standardName
-            ? null
-            : cipherInfo.name,
-          localCertificate:
-            certificate && 'raw' in certificate ? certificate.raw : null,
-          remoteCertificate:
-            peerCertificate && 'raw' in peerCertificate
-              ? peerCertificate.raw
-              : null,
-        };
-      } else {
-        tlsInfo = null;
-      }
-      const socketInfo: SocketInfo = {
-        remoteAddress: remoteAddress,
-        localAddress: localAddress,
-        security: tlsInfo,
-        remoteName: null,
-        streamsStarted: sessionInfo.streamTracker.callsStarted,
-        streamsSucceeded: sessionInfo.streamTracker.callsSucceeded,
-        streamsFailed: sessionInfo.streamTracker.callsFailed,
-        messagesSent: sessionInfo.messagesSent,
-        messagesReceived: sessionInfo.messagesReceived,
-        keepAlivesSent: 0,
-        lastLocalStreamCreatedTimestamp: null,
-        lastRemoteStreamCreatedTimestamp:
-          sessionInfo.streamTracker.lastCallStartedTimestamp,
-        lastMessageSentTimestamp: sessionInfo.lastMessageSentTimestamp,
-        lastMessageReceivedTimestamp: sessionInfo.lastMessageReceivedTimestamp,
-        localFlowControlWindow: session.state.localWindowSize ?? null,
-        remoteFlowControlWindow: session.state.remoteWindowSize ?? null,
+  ): SocketInfo {
+    const sessionInfo = this.sessions.get(session)!;
+    const sessionSocket = session.socket;
+    const remoteAddress = sessionSocket.remoteAddress
+      ? stringToSubchannelAddress(
+          sessionSocket.remoteAddress,
+          sessionSocket.remotePort
+        )
+      : null;
+    const localAddress = sessionSocket.localAddress
+      ? stringToSubchannelAddress(
+          sessionSocket.localAddress!,
+          sessionSocket.localPort
+        )
+      : null;
+    let tlsInfo: TlsInfo | null;
+    if (session.encrypted) {
+      const tlsSocket: TLSSocket = sessionSocket as TLSSocket;
+      const cipherInfo: CipherNameAndProtocol & { standardName?: string } =
+        tlsSocket.getCipher();
+      const certificate = tlsSocket.getCertificate();
+      const peerCertificate = tlsSocket.getPeerCertificate();
+      tlsInfo = {
+        cipherSuiteStandardName: cipherInfo.standardName ?? null,
+        cipherSuiteOtherName: cipherInfo.standardName ? null : cipherInfo.name,
+        localCertificate:
+          certificate && 'raw' in certificate ? certificate.raw : null,
+        remoteCertificate:
+          peerCertificate && 'raw' in peerCertificate
+            ? peerCertificate.raw
+            : null,
       };
-      return socketInfo;
+    } else {
+      tlsInfo = null;
+    }
+    const socketInfo: SocketInfo = {
+      remoteAddress: remoteAddress,
+      localAddress: localAddress,
+      security: tlsInfo,
+      remoteName: null,
+      streamsStarted: sessionInfo.streamTracker.callsStarted,
+      streamsSucceeded: sessionInfo.streamTracker.callsSucceeded,
+      streamsFailed: sessionInfo.streamTracker.callsFailed,
+      messagesSent: sessionInfo.messagesSent,
+      messagesReceived: sessionInfo.messagesReceived,
+      keepAlivesSent: sessionInfo.keepAlivesSent,
+      lastLocalStreamCreatedTimestamp: null,
+      lastRemoteStreamCreatedTimestamp:
+        sessionInfo.streamTracker.lastCallStartedTimestamp,
+      lastMessageSentTimestamp: sessionInfo.lastMessageSentTimestamp,
+      lastMessageReceivedTimestamp: sessionInfo.lastMessageReceivedTimestamp,
+      localFlowControlWindow: session.state.localWindowSize ?? null,
+      remoteFlowControlWindow: session.state.remoteWindowSize ?? null,
     };
+    return socketInfo;
   }
 
   private trace(text: string): void {
@@ -550,10 +598,11 @@ export class Server {
     return http2Server;
   }
 
-  private bindOneAddress(address: SubchannelAddress, boundPortObject: BoundPort): Promise<SingleAddressBindResult> {
-    this.trace(
-      'Attempting to bind ' + subchannelAddressToString(address)
-    );
+  private bindOneAddress(
+    address: SubchannelAddress,
+    boundPortObject: BoundPort
+  ): Promise<SingleAddressBindResult> {
+    this.trace('Attempting to bind ' + subchannelAddressToString(address));
     const http2Server = this.createHttp2Server(boundPortObject.credentials);
     return new Promise<SingleAddressBindResult>((resolve, reject) => {
       const onError = (err: Error) => {
@@ -565,7 +614,7 @@ export class Server {
         );
         resolve({
           port: 'port' in address ? address.port : 1,
-          error: err.message
+          error: err.message,
         });
       };
 
@@ -585,13 +634,14 @@ export class Server {
           };
         }
 
-        const channelzRef = this.registerListenerToChannelz(boundSubchannelAddress);
-        if (this.channelzEnabled) {
-          this.listenerChildrenTracker.refChild(channelzRef);
-        }
+        const channelzRef = this.registerListenerToChannelz(
+          boundSubchannelAddress
+        );
+        this.listenerChildrenTracker.refChild(channelzRef);
+
         this.http2Servers.set(http2Server, {
           channelzRef: channelzRef,
-          sessions: new Set()
+          sessions: new Set(),
         });
         boundPortObject.listeningServers.add(http2Server);
         this.trace(
@@ -599,62 +649,86 @@ export class Server {
             subchannelAddressToString(boundSubchannelAddress)
         );
         resolve({
-          port: 'port' in boundSubchannelAddress
-          ? boundSubchannelAddress.port
-          : 1
+          port:
+            'port' in boundSubchannelAddress ? boundSubchannelAddress.port : 1,
         });
         http2Server.removeListener('error', onError);
       });
     });
   }
 
-  private async bindManyPorts(addressList: SubchannelAddress[], boundPortObject: BoundPort): Promise<BindResult> {
+  private async bindManyPorts(
+    addressList: SubchannelAddress[],
+    boundPortObject: BoundPort
+  ): Promise<BindResult> {
     if (addressList.length === 0) {
       return {
         count: 0,
         port: 0,
-        errors: []
+        errors: [],
       };
     }
     if (isTcpSubchannelAddress(addressList[0]) && addressList[0].port === 0) {
       /* If binding to port 0, first try to bind the first address, then bind
        * the rest of the address list to the specific port that it binds. */
-      const firstAddressResult = await this.bindOneAddress(addressList[0], boundPortObject);
+      const firstAddressResult = await this.bindOneAddress(
+        addressList[0],
+        boundPortObject
+      );
       if (firstAddressResult.error) {
         /* If the first address fails to bind, try the same operation starting
          * from the second item in the list. */
-        const restAddressResult = await this.bindManyPorts(addressList.slice(1), boundPortObject);
+        const restAddressResult = await this.bindManyPorts(
+          addressList.slice(1),
+          boundPortObject
+        );
         return {
           ...restAddressResult,
-          errors: [firstAddressResult.error, ...restAddressResult.errors]
+          errors: [firstAddressResult.error, ...restAddressResult.errors],
         };
       } else {
-        const restAddresses = addressList.slice(1).map(address => isTcpSubchannelAddress(address) ? {host: address.host, port: firstAddressResult.port} : address)
-        const restAddressResult = await Promise.all(restAddresses.map(address => this.bindOneAddress(address, boundPortObject)));
+        const restAddresses = addressList
+          .slice(1)
+          .map(address =>
+            isTcpSubchannelAddress(address)
+              ? { host: address.host, port: firstAddressResult.port }
+              : address
+          );
+        const restAddressResult = await Promise.all(
+          restAddresses.map(address =>
+            this.bindOneAddress(address, boundPortObject)
+          )
+        );
         const allResults = [firstAddressResult, ...restAddressResult];
         return {
           count: allResults.filter(result => result.error === undefined).length,
           port: firstAddressResult.port,
-          errors: allResults.filter(result => result.error).map(result => result.error!)
+          errors: allResults
+            .filter(result => result.error)
+            .map(result => result.error!),
         };
       }
     } else {
-      const allResults = await Promise.all(addressList.map(address => this.bindOneAddress(address, boundPortObject)));
+      const allResults = await Promise.all(
+        addressList.map(address =>
+          this.bindOneAddress(address, boundPortObject)
+        )
+      );
       return {
         count: allResults.filter(result => result.error === undefined).length,
         port: allResults[0].port,
-        errors: allResults.filter(result => result.error).map(result => result.error!)
+        errors: allResults
+          .filter(result => result.error)
+          .map(result => result.error!),
       };
     }
   }
 
-  private async bindAddressList(addressList: SubchannelAddress[], boundPortObject: BoundPort): Promise<number> {
-    let bindResult: BindResult;
-    try {
-      bindResult = await this.bindManyPorts(addressList, boundPortObject);
-    } catch (error) {
-      throw error;
-    }
+  private async bindAddressList(
+    addressList: SubchannelAddress[],
+    boundPortObject: BoundPort
+  ): Promise<number> {
+    const bindResult = await this.bindManyPorts(addressList, boundPortObject);
     if (bindResult.count > 0) {
       if (bindResult.count < addressList.length) {
         logging.log(
@@ -666,7 +740,9 @@ export class Server {
     } else {
       const errorString = `No address added out of total ${addressList.length} resolved`;
       logging.log(LogVerbosity.ERROR, errorString);
-      throw new Error(`${errorString} errors: [${bindResult.errors.join(',')}]`);
+      throw new Error(
+        `${errorString} errors: [${bindResult.errors.join(',')}]`
+      );
     }
   }
 
@@ -684,9 +760,7 @@ export class Server {
             ...endpointList.map(endpoint => endpoint.addresses)
           );
           if (addressList.length === 0) {
-            reject(
-              new Error(`No addresses resolved for port ${port}`)
-            );
+            reject(new Error(`No addresses resolved for port ${port}`));
             return;
           }
           resolve(addressList);
@@ -700,7 +774,10 @@ export class Server {
     });
   }
 
-  private async bindPort(port: GrpcUri, boundPortObject: BoundPort): Promise<number> {
+  private async bindPort(
+    port: GrpcUri,
+    boundPortObject: BoundPort
+  ): Promise<number> {
     const addressList = await this.resolvePort(port);
     if (boundPortObject.cancelled) {
       this.completeUnbind(boundPortObject);
@@ -715,7 +792,6 @@ export class Server {
   }
 
   private normalizePort(port: string): GrpcUri {
-
     const initialPortUri = parseUri(port);
     if (initialPortUri === null) {
       throw new Error(`Could not parse port "${port}"`);
@@ -760,14 +836,20 @@ export class Server {
     let boundPortObject = this.boundPorts.get(uriToString(portUri));
     if (boundPortObject) {
       if (!creds._equals(boundPortObject.credentials)) {
-        deferredCallback(new Error(`${port} already bound with incompatible credentials`), 0);
+        deferredCallback(
+          new Error(`${port} already bound with incompatible credentials`),
+          0
+        );
         return;
       }
       /* If that operation has previously been cancelled by an unbind call,
        * uncancel it. */
       boundPortObject.cancelled = false;
       if (boundPortObject.completionPromise) {
-        boundPortObject.completionPromise.then(portNum => callback(null, portNum), error => callback(error as Error, 0));
+        boundPortObject.completionPromise.then(
+          portNum => callback(null, portNum),
+          error => callback(error as Error, 0)
+        );
       } else {
         deferredCallback(null, boundPortObject.portNumber);
       }
@@ -780,7 +862,7 @@ export class Server {
       cancelled: false,
       portNumber: 0,
       credentials: creds,
-      listeningServers: new Set()
+      listeningServers: new Set(),
     };
     const splitPort = splitHostPort(portUri.path);
     const completionPromise = this.bindPort(portUri, boundPortObject);
@@ -789,29 +871,35 @@ export class Server {
      * bind operation completes and we have a specific port number. Otherwise,
      * populate it immediately. */
     if (splitPort?.port === 0) {
-      completionPromise.then(portNum => {
-        const finalUri: GrpcUri = {
-          scheme: portUri.scheme,
-          authority: portUri.authority,
-          path: combineHostPort({host: splitPort.host, port: portNum})
-        };
-        boundPortObject!.mapKey = uriToString(finalUri);
-        boundPortObject!.completionPromise = null;
-        boundPortObject!.portNumber = portNum;
-        this.boundPorts.set(boundPortObject!.mapKey, boundPortObject!);
-        callback(null, portNum);
-      }, error => {
-        callback(error, 0);
-      })
+      completionPromise.then(
+        portNum => {
+          const finalUri: GrpcUri = {
+            scheme: portUri.scheme,
+            authority: portUri.authority,
+            path: combineHostPort({ host: splitPort.host, port: portNum }),
+          };
+          boundPortObject!.mapKey = uriToString(finalUri);
+          boundPortObject!.completionPromise = null;
+          boundPortObject!.portNumber = portNum;
+          this.boundPorts.set(boundPortObject!.mapKey, boundPortObject!);
+          callback(null, portNum);
+        },
+        error => {
+          callback(error, 0);
+        }
+      );
     } else {
       this.boundPorts.set(boundPortObject.mapKey, boundPortObject);
-      completionPromise.then(portNum => {
-        boundPortObject!.completionPromise = null;
-        boundPortObject!.portNumber = portNum;
-        callback(null, portNum);
-      }, error => {
-        callback(error, 0);
-      });
+      completionPromise.then(
+        portNum => {
+          boundPortObject!.completionPromise = null;
+          boundPortObject!.portNumber = portNum;
+          callback(null, portNum);
+        },
+        error => {
+          callback(error, 0);
+        }
+      );
     }
   }
 
@@ -880,32 +968,35 @@ export class Server {
   }
 
   private closeServer(server: AnyHttp2Server, callback?: () => void) {
-    this.trace('Closing server with address ' + JSON.stringify(server.address()));
+    this.trace(
+      'Closing server with address ' + JSON.stringify(server.address())
+    );
     const serverInfo = this.http2Servers.get(server);
     server.close(() => {
-      if (this.channelzEnabled && serverInfo) {
+      if (serverInfo) {
         this.listenerChildrenTracker.unrefChild(serverInfo.channelzRef);
         unregisterChannelzRef(serverInfo.channelzRef);
       }
       this.http2Servers.delete(server);
       callback?.();
     });
-
   }
 
-  private closeSession(session: http2.ServerHttp2Session, callback?: () => void) {
+  private closeSession(
+    session: http2.ServerHttp2Session,
+    callback?: () => void
+  ) {
     this.trace('Closing session initiated by ' + session.socket?.remoteAddress);
     const sessionInfo = this.sessions.get(session);
     const closeCallback = () => {
-      if (this.channelzEnabled && sessionInfo) {
+      if (sessionInfo) {
         this.sessionChildrenTracker.unrefChild(sessionInfo.ref);
         unregisterChannelzRef(sessionInfo.ref);
       }
-      this.sessions.delete(session);
       callback?.();
     };
     if (session.closed) {
-      process.nextTick(closeCallback);
+      queueMicrotask(closeCallback);
     } else {
       session.close(closeCallback);
     }
@@ -942,7 +1033,12 @@ export class Server {
     }
     const boundPortObject = this.boundPorts.get(uriToString(portUri));
     if (boundPortObject) {
-      this.trace('unbinding ' + boundPortObject.mapKey + ' originally bound as ' + uriToString(boundPortObject.originalUri));
+      this.trace(
+        'unbinding ' +
+          boundPortObject.mapKey +
+          ' originally bound as ' +
+          uriToString(boundPortObject.originalUri)
+      );
       /* If the bind operation is pending, the cancelled flag will trigger
        * the unbind operation later. */
       if (boundPortObject.completionPromise) {
@@ -978,14 +1074,13 @@ export class Server {
     const allSessions: Set<http2.Http2Session> = new Set();
     for (const http2Server of boundPortObject.listeningServers) {
       const serverEntry = this.http2Servers.get(http2Server);
-      if (!serverEntry) {
-        continue;
-      }
-      for (const session of serverEntry.sessions) {
-        allSessions.add(session);
-        this.closeSession(session, () => {
-          allSessions.delete(session);
-        });
+      if (serverEntry) {
+        for (const session of serverEntry.sessions) {
+          allSessions.add(session);
+          this.closeSession(session, () => {
+            allSessions.delete(session);
+          });
+        }
       }
     }
     /* After the grace time ends, send another goaway to all remaining sessions
@@ -1017,9 +1112,7 @@ export class Server {
       session.destroy(http2.constants.NGHTTP2_CANCEL as any);
     });
     this.sessions.clear();
-    if (this.channelzEnabled) {
-      unregisterChannelzRef(this.channelzRef);
-    }
+    unregisterChannelzRef(this.channelzRef);
 
     this.shutdown = true;
   }
@@ -1052,13 +1145,13 @@ export class Server {
   /**
    * @deprecated No longer needed as of version 1.10.x
    */
-  @deprecate('Calling start() is no longer necessary. It can be safely omitted.')
+  @deprecate(
+    'Calling start() is no longer necessary. It can be safely omitted.'
+  )
   start(): void {
     if (
       this.http2Servers.size === 0 ||
-      [...this.http2Servers.keys()].every(
-        server => !server.listening
-      )
+      [...this.http2Servers.keys()].every(server => !server.listening)
     ) {
       throw new Error('server must be bound in order to start');
     }
@@ -1071,9 +1164,7 @@ export class Server {
 
   tryShutdown(callback: (error?: Error) => void): void {
     const wrappedCallback = (error?: Error) => {
-      if (this.channelzEnabled) {
-        unregisterChannelzRef(this.channelzRef);
-      }
+      unregisterChannelzRef(this.channelzRef);
       callback(error);
     };
     let pendingChecks = 0;
@@ -1087,24 +1178,26 @@ export class Server {
     }
     this.shutdown = true;
 
-    for (const server of this.http2Servers.keys()) {
+    for (const [serverKey, server] of this.http2Servers.entries()) {
       pendingChecks++;
-      const serverString = this.http2Servers.get(server)!.channelzRef.name;
+      const serverString = server.channelzRef.name;
       this.trace('Waiting for server ' + serverString + ' to close');
-      this.closeServer(server, () => {
+      this.closeServer(serverKey, () => {
         this.trace('Server ' + serverString + ' finished closing');
         maybeCallback();
       });
+
+      for (const session of server.sessions.keys()) {
+        pendingChecks++;
+        const sessionString = session.socket?.remoteAddress;
+        this.trace('Waiting for session ' + sessionString + ' to close');
+        this.closeSession(session, () => {
+          this.trace('Session ' + sessionString + ' finished closing');
+          maybeCallback();
+        });
+      }
     }
-    for (const session of this.sessions.keys()) {
-      pendingChecks++;
-      const sessionString = session.socket?.remoteAddress;
-      this.trace('Waiting for session ' + sessionString + ' to close');
-      this.closeSession(session, () => {
-        this.trace('Session ' + sessionString + ' finished closing');
-        maybeCallback();
-      });
-    }
+
     if (pendingChecks === 0) {
       wrappedCallback();
     }
@@ -1178,14 +1271,12 @@ export class Server {
       'grpc-message': err.details,
       [http2.constants.HTTP2_HEADER_STATUS]: http2.constants.HTTP_STATUS_OK,
       [http2.constants.HTTP2_HEADER_CONTENT_TYPE]: 'application/grpc+proto',
-      ...err.metadata?.toHttp2Headers()
+      ...err.metadata?.toHttp2Headers(),
     };
-    stream.respond(trailersToSend, {endStream: true});
+    stream.respond(trailersToSend, { endStream: true });
 
-    if (this.channelzEnabled) {
-      this.callTracker.addCallFailed();
-      channelzSessionInfo?.streamTracker.addCallFailed();
-    }
+    this.callTracker.addCallFailed();
+    channelzSessionInfo?.streamTracker.addCallFailed();
   }
 
   private _channelzHandler(
@@ -1193,6 +1284,9 @@ export class Server {
     stream: http2.ServerHttp2Stream,
     headers: http2.IncomingHttpHeaders
   ) {
+    // for handling idle timeout
+    this.onStreamOpened(stream);
+
     const channelzSessionInfo = this.sessions.get(
       stream.session as http2.ServerHttp2Session
     );
@@ -1218,7 +1312,7 @@ export class Server {
       return;
     }
 
-    let callEventTracker: CallEventTracker = {
+    const callEventTracker: CallEventTracker = {
       addMessageSent: () => {
         if (channelzSessionInfo) {
           channelzSessionInfo.messagesSent += 1;
@@ -1246,10 +1340,17 @@ export class Server {
             channelzSessionInfo.streamTracker.addCallFailed();
           }
         }
-      }
-    }
+      },
+    };
 
-    const call = getServerInterceptingCall([...extraInterceptors, ...this.interceptors], stream, headers, callEventTracker, handler, this.options);
+    const call = getServerInterceptingCall(
+      [...extraInterceptors, ...this.interceptors],
+      stream,
+      headers,
+      callEventTracker,
+      handler,
+      this.options
+    );
 
     if (!this._runHandlerForCall(call, handler)) {
       this.callTracker.addCallFailed();
@@ -1267,6 +1368,9 @@ export class Server {
     stream: http2.ServerHttp2Stream,
     headers: http2.IncomingHttpHeaders
   ) {
+    // for handling idle timeout
+    this.onStreamOpened(stream);
+
     if (this._verifyContentType(stream, headers) !== true) {
       return;
     }
@@ -1283,7 +1387,14 @@ export class Server {
       return;
     }
 
-    const call = getServerInterceptingCall([...extraInterceptors, ...this.interceptors], stream, headers, null, handler, this.options);
+    const call = getServerInterceptingCall(
+      [...extraInterceptors, ...this.interceptors],
+      stream,
+      headers,
+      null,
+      handler,
+      this.options
+    );
 
     if (!this._runHandlerForCall(call, handler)) {
       call.sendStatus({
@@ -1295,27 +1406,21 @@ export class Server {
 
   private _runHandlerForCall(
     call: ServerInterceptingCallInterface,
-    handler: Handler<any, any>
+    handler:
+      | UntypedUnaryHandler
+      | UntypedClientStreamingHandler
+      | UntypedServerStreamingHandler
+      | UntypedBidiStreamingHandler
   ): boolean {
-
     const { type } = handler;
     if (type === 'unary') {
-      handleUnary(call, handler as UntypedUnaryHandler);
+      handleUnary(call, handler);
     } else if (type === 'clientStream') {
-      handleClientStreaming(
-        call,
-        handler as UntypedClientStreamingHandler
-      );
+      handleClientStreaming(call, handler);
     } else if (type === 'serverStream') {
-      handleServerStreaming(
-        call,
-        handler as UntypedServerStreamingHandler
-      );
+      handleServerStreaming(call, handler);
     } else if (type === 'bidi') {
-      handleBidiStreaming(
-        call,
-        handler as UntypedBidiStreamingHandler
-      );
+      handleBidiStreaming(call, handler);
     } else {
       return false;
     }
@@ -1346,12 +1451,141 @@ export class Server {
       ? this._channelzHandler
       : this._streamHandler;
 
+    const sessionHandler = this.channelzEnabled
+      ? this._channelzSessionHandler(http2Server)
+      : this._sessionHandler(http2Server);
+
     http2Server.on('stream', handler.bind(this, extraInterceptors));
-    http2Server.on('session', session => {
+    http2Server.on('session', sessionHandler);
+  }
+
+  private _sessionHandler(
+    http2Server: http2.Http2Server | http2.Http2SecureServer
+  ) {
+    return (session: http2.ServerHttp2Session) => {
+      this.http2Servers.get(http2Server)?.sessions.add(session);
+
+      let connectionAgeTimer: NodeJS.Timeout | null = null;
+      let connectionAgeGraceTimer: NodeJS.Timeout | null = null;
+      let keeapliveTimeTimer: NodeJS.Timeout | null = null;
+      let keepaliveTimeoutTimer: NodeJS.Timeout | null = null;
+      let sessionClosedByServer = false;
+
+      const idleTimeoutObj = this.enableIdleTimeout(session);
+
+      if (this.maxConnectionAgeMs !== UNLIMITED_CONNECTION_AGE_MS) {
+        // Apply a random jitter within a +/-10% range
+        const jitterMagnitude = this.maxConnectionAgeMs / 10;
+        const jitter = Math.random() * jitterMagnitude * 2 - jitterMagnitude;
+
+        connectionAgeTimer = setTimeout(() => {
+          sessionClosedByServer = true;
+
+          this.trace(
+            'Connection dropped by max connection age: ' +
+              session.socket?.remoteAddress
+          );
+
+          try {
+            session.goaway(
+              http2.constants.NGHTTP2_NO_ERROR,
+              ~(1 << 31),
+              kMaxAge
+            );
+          } catch (e) {
+            // The goaway can't be sent because the session is already closed
+            session.destroy();
+            return;
+          }
+          session.close();
+
+          /* Allow a grace period after sending the GOAWAY before forcibly
+           * closing the connection. */
+          if (this.maxConnectionAgeGraceMs !== UNLIMITED_CONNECTION_AGE_MS) {
+            connectionAgeGraceTimer = setTimeout(() => {
+              session.destroy();
+            }, this.maxConnectionAgeGraceMs);
+            connectionAgeGraceTimer.unref?.();
+          }
+        }, this.maxConnectionAgeMs + jitter);
+        connectionAgeTimer.unref?.();
+      }
+
+      if (this.keepaliveTimeMs < KEEPALIVE_MAX_TIME_MS) {
+        keeapliveTimeTimer = setInterval(() => {
+          keepaliveTimeoutTimer = setTimeout(() => {
+            sessionClosedByServer = true;
+            session.close();
+          }, this.keepaliveTimeoutMs);
+          keepaliveTimeoutTimer.unref?.();
+
+          try {
+            session.ping(
+              (err: Error | null, duration: number, payload: Buffer) => {
+                if (keepaliveTimeoutTimer) {
+                  clearTimeout(keepaliveTimeoutTimer);
+                }
+
+                if (err) {
+                  sessionClosedByServer = true;
+                  this.trace(
+                    'Connection dropped due to error of a ping frame ' +
+                      err.message +
+                      ' return in ' +
+                      duration
+                  );
+                  session.close();
+                }
+              }
+            );
+          } catch (e) {
+            clearTimeout(keepaliveTimeoutTimer);
+            // The ping can't be sent because the session is already closed
+            session.destroy();
+          }
+        }, this.keepaliveTimeMs);
+        keeapliveTimeTimer.unref?.();
+      }
+
+      session.on('close', () => {
+        if (!sessionClosedByServer) {
+          this.trace(
+            `Connection dropped by client ${session.socket?.remoteAddress}`
+          );
+        }
+
+        if (connectionAgeTimer) {
+          clearTimeout(connectionAgeTimer);
+        }
+
+        if (connectionAgeGraceTimer) {
+          clearTimeout(connectionAgeGraceTimer);
+        }
 
+        if (keeapliveTimeTimer) {
+          clearInterval(keeapliveTimeTimer);
+          if (keepaliveTimeoutTimer) {
+            clearTimeout(keepaliveTimeoutTimer);
+          }
+        }
+
+        if (idleTimeoutObj !== null) {
+          clearTimeout(idleTimeoutObj.timeout);
+          this.sessionIdleTimeouts.delete(session);
+        }
+
+        this.http2Servers.get(http2Server)?.sessions.delete(session);
+      });
+    };
+  }
+
+  private _channelzSessionHandler(
+    http2Server: http2.Http2Server | http2.Http2SecureServer
+  ) {
+    return (session: http2.ServerHttp2Session) => {
       const channelzRef = registerChannelzSocket(
-        session.socket.remoteAddress ?? 'unknown',
-        this.getChannelzSessionInfoGetter(session),
+        session.socket?.remoteAddress ?? 'unknown',
+        this.getChannelzSessionInfo.bind(this, session),
         this.channelzEnabled
       );
 
@@ -1360,40 +1594,47 @@ export class Server {
         streamTracker: new ChannelzCallTracker(),
         messagesSent: 0,
         messagesReceived: 0,
+        keepAlivesSent: 0,
         lastMessageSentTimestamp: null,
         lastMessageReceivedTimestamp: null,
       };
 
       this.http2Servers.get(http2Server)?.sessions.add(session);
       this.sessions.set(session, channelzSessionInfo);
-      const clientAddress = session.socket.remoteAddress;
-      if (this.channelzEnabled) {
-        this.channelzTrace.addTrace(
-          'CT_INFO',
-          'Connection established by client ' + clientAddress
-        );
-        this.sessionChildrenTracker.refChild(channelzRef);
-      }
+      const clientAddress = `${session.socket.remoteAddress}:${session.socket.remotePort}`;
+
+      this.channelzTrace.addTrace(
+        'CT_INFO',
+        'Connection established by client ' + clientAddress
+      );
+      this.trace('Connection established by client ' + clientAddress);
+      this.sessionChildrenTracker.refChild(channelzRef);
+
       let connectionAgeTimer: NodeJS.Timeout | null = null;
       let connectionAgeGraceTimer: NodeJS.Timeout | null = null;
+      let keeapliveTimeTimer: NodeJS.Timeout | null = null;
+      let keepaliveTimeoutTimer: NodeJS.Timeout | null = null;
       let sessionClosedByServer = false;
+
+      const idleTimeoutObj = this.enableIdleTimeout(session);
+
       if (this.maxConnectionAgeMs !== UNLIMITED_CONNECTION_AGE_MS) {
         // Apply a random jitter within a +/-10% range
         const jitterMagnitude = this.maxConnectionAgeMs / 10;
         const jitter = Math.random() * jitterMagnitude * 2 - jitterMagnitude;
+
         connectionAgeTimer = setTimeout(() => {
           sessionClosedByServer = true;
-          if (this.channelzEnabled) {
-            this.channelzTrace.addTrace(
-              'CT_INFO',
-              'Connection dropped by max connection age from ' + clientAddress
-            );
-          }
+          this.channelzTrace.addTrace(
+            'CT_INFO',
+            'Connection dropped by max connection age from ' + clientAddress
+          );
+
           try {
             session.goaway(
               http2.constants.NGHTTP2_NO_ERROR,
               ~(1 << 31),
-              Buffer.from('max_age')
+              kMaxAge
             );
           } catch (e) {
             // The goaway can't be sent because the session is already closed
@@ -1401,61 +1642,191 @@ export class Server {
             return;
           }
           session.close();
+
           /* Allow a grace period after sending the GOAWAY before forcibly
            * closing the connection. */
           if (this.maxConnectionAgeGraceMs !== UNLIMITED_CONNECTION_AGE_MS) {
             connectionAgeGraceTimer = setTimeout(() => {
               session.destroy();
-            }, this.maxConnectionAgeGraceMs).unref?.();
+            }, this.maxConnectionAgeGraceMs);
+            connectionAgeGraceTimer.unref?.();
           }
-        }, this.maxConnectionAgeMs + jitter).unref?.();
+        }, this.maxConnectionAgeMs + jitter);
+        connectionAgeTimer.unref?.();
       }
-      const keeapliveTimeTimer: NodeJS.Timeout | null = setInterval(() => {
-        const timeoutTImer = setTimeout(() => {
-          sessionClosedByServer = true;
-          if (this.channelzEnabled) {
+
+      if (this.keepaliveTimeMs < KEEPALIVE_MAX_TIME_MS) {
+        keeapliveTimeTimer = setInterval(() => {
+          keepaliveTimeoutTimer = setTimeout(() => {
+            sessionClosedByServer = true;
             this.channelzTrace.addTrace(
               'CT_INFO',
               'Connection dropped by keepalive timeout from ' + clientAddress
             );
-          }
-          session.close();
-        }, this.keepaliveTimeoutMs).unref?.();
-        try {
-          session.ping(
-            (err: Error | null, duration: number, payload: Buffer) => {
-              clearTimeout(timeoutTImer);
-            }
-          );
-        } catch (e) {
-          // The ping can't be sent because the session is already closed
-          session.destroy();
-        }
-      }, this.keepaliveTimeMs).unref?.();
-      session.on('close', () => {
-        if (this.channelzEnabled) {
-          if (!sessionClosedByServer) {
-            this.channelzTrace.addTrace(
-              'CT_INFO',
-              'Connection dropped by client ' + clientAddress
+
+            session.close();
+          }, this.keepaliveTimeoutMs);
+          keepaliveTimeoutTimer.unref?.();
+
+          try {
+            session.ping(
+              (err: Error | null, duration: number, payload: Buffer) => {
+                if (keepaliveTimeoutTimer) {
+                  clearTimeout(keepaliveTimeoutTimer);
+                }
+
+                if (err) {
+                  sessionClosedByServer = true;
+                  this.channelzTrace.addTrace(
+                    'CT_INFO',
+                    'Connection dropped due to error of a ping frame ' +
+                      err.message +
+                      ' return in ' +
+                      duration
+                  );
+
+                  session.close();
+                }
+              }
             );
+            channelzSessionInfo.keepAlivesSent += 1;
+          } catch (e) {
+            clearTimeout(keepaliveTimeoutTimer);
+            // The ping can't be sent because the session is already closed
+            session.destroy();
           }
-          this.sessionChildrenTracker.unrefChild(channelzRef);
-          unregisterChannelzRef(channelzRef);
+        }, this.keepaliveTimeMs);
+        keeapliveTimeTimer.unref?.();
+      }
+
+      session.on('close', () => {
+        if (!sessionClosedByServer) {
+          this.channelzTrace.addTrace(
+            'CT_INFO',
+            'Connection dropped by client ' + clientAddress
+          );
         }
+
+        this.sessionChildrenTracker.unrefChild(channelzRef);
+        unregisterChannelzRef(channelzRef);
+
         if (connectionAgeTimer) {
           clearTimeout(connectionAgeTimer);
         }
+
         if (connectionAgeGraceTimer) {
           clearTimeout(connectionAgeGraceTimer);
         }
+
         if (keeapliveTimeTimer) {
-          clearTimeout(keeapliveTimeTimer);
+          clearInterval(keeapliveTimeTimer);
+          if (keepaliveTimeoutTimer) {
+            clearTimeout(keepaliveTimeoutTimer);
+          }
         }
+
+        if (idleTimeoutObj !== null) {
+          clearTimeout(idleTimeoutObj.timeout);
+          this.sessionIdleTimeouts.delete(session);
+        }
+
         this.http2Servers.get(http2Server)?.sessions.delete(session);
         this.sessions.delete(session);
       });
-    });
+    };
+  }
+
+  private enableIdleTimeout(
+    session: http2.ServerHttp2Session
+  ): SessionIdleTimeoutTracker | null {
+    if (this.sessionIdleTimeout >= MAX_CONNECTION_IDLE_MS) {
+      return null;
+    }
+
+    const idleTimeoutObj: SessionIdleTimeoutTracker = {
+      activeStreams: 0,
+      lastIdle: Date.now(),
+      onClose: this.onStreamClose.bind(this, session),
+      timeout: setTimeout(
+        this.onIdleTimeout,
+        this.sessionIdleTimeout,
+        this,
+        session
+      ),
+    };
+    idleTimeoutObj.timeout.unref?.();
+    this.sessionIdleTimeouts.set(session, idleTimeoutObj);
+
+    const { socket } = session;
+    this.trace(
+      'Enable idle timeout for ' +
+        socket.remoteAddress +
+        ':' +
+        socket.remotePort
+    );
+
+    return idleTimeoutObj;
+  }
+
+  private onIdleTimeout(
+    this: undefined,
+    ctx: Server,
+    session: http2.ServerHttp2Session
+  ) {
+    const { socket } = session;
+    const sessionInfo = ctx.sessionIdleTimeouts.get(session);
+
+    // if it is called while we have activeStreams - timer will not be rescheduled
+    // until last active stream is closed, then it will call .refresh() on the timer
+    // important part is to not clearTimeout(timer) or it becomes unusable
+    // for future refreshes
+    if (
+      sessionInfo !== undefined &&
+      sessionInfo.activeStreams === 0 &&
+      Date.now() - sessionInfo.lastIdle >= ctx.sessionIdleTimeout
+    ) {
+      ctx.trace(
+        'Session idle timeout triggered for ' +
+          socket?.remoteAddress +
+          ':' +
+          socket?.remotePort +
+          ' last idle at ' +
+          sessionInfo.lastIdle
+      );
+
+      ctx.closeSession(session);
+    }
+  }
+
+  private onStreamOpened(stream: http2.ServerHttp2Stream) {
+    const session = stream.session as http2.ServerHttp2Session;
+
+    const idleTimeoutObj = this.sessionIdleTimeouts.get(session);
+    if (idleTimeoutObj) {
+      idleTimeoutObj.activeStreams += 1;
+      stream.once('close', idleTimeoutObj.onClose);
+    }
+  }
+
+  private onStreamClose(session: http2.ServerHttp2Session) {
+    const idleTimeoutObj = this.sessionIdleTimeouts.get(session);
+
+    if (idleTimeoutObj) {
+      idleTimeoutObj.activeStreams -= 1;
+      if (idleTimeoutObj.activeStreams === 0) {
+        idleTimeoutObj.lastIdle = Date.now();
+        idleTimeoutObj.timeout.refresh();
+
+        this.trace(
+          'Session onStreamClose' +
+            session.socket?.remoteAddress +
+            ':' +
+            session.socket?.remotePort +
+            ' at ' +
+            idleTimeoutObj.lastIdle
+        );
+      }
+    }
   }
 }
 
@@ -1479,7 +1850,7 @@ async function handleUnary<RequestType, ResponseType>(
       call.sendStatus({
         code: Status.OK,
         details: 'OK',
-        metadata: trailer ?? null
+        metadata: trailer ?? null,
       });
     });
   }
@@ -1496,7 +1867,7 @@ async function handleUnary<RequestType, ResponseType>(
         call.sendStatus({
           code: Status.UNIMPLEMENTED,
           details: `Received a second request message for server streaming method ${handler.path}`,
-          metadata: null
+          metadata: null,
         });
         return;
       }
@@ -1508,18 +1879,25 @@ async function handleUnary<RequestType, ResponseType>(
         call.sendStatus({
           code: Status.UNIMPLEMENTED,
           details: `Received no request message for server streaming method ${handler.path}`,
-          metadata: null
+          metadata: null,
         });
         return;
       }
-      stream = new ServerWritableStreamImpl(handler.path, call, requestMetadata, requestMessage);
+      stream = new ServerWritableStreamImpl(
+        handler.path,
+        call,
+        requestMetadata,
+        requestMessage
+      );
       try {
         handler.func(stream, respond);
       } catch (err) {
         call.sendStatus({
           code: Status.UNKNOWN,
-          details: `Server method handler threw error ${(err as Error).message}`,
-          metadata: null
+          details: `Server method handler threw error ${
+            (err as Error).message
+          }`,
+          metadata: null,
         });
       }
     },
@@ -1552,7 +1930,7 @@ function handleClientStreaming<RequestType, ResponseType>(
       call.sendStatus({
         code: Status.OK,
         details: 'OK',
-        metadata: trailer ?? null
+        metadata: trailer ?? null,
       });
     });
   }
@@ -1565,8 +1943,10 @@ function handleClientStreaming<RequestType, ResponseType>(
       } catch (err) {
         call.sendStatus({
           code: Status.UNKNOWN,
-          details: `Server method handler threw error ${(err as Error).message}`,
-          metadata: null
+          details: `Server method handler threw error ${
+            (err as Error).message
+          }`,
+          metadata: null,
         });
       }
     },
@@ -1604,7 +1984,7 @@ function handleServerStreaming<RequestType, ResponseType>(
         call.sendStatus({
           code: Status.UNIMPLEMENTED,
           details: `Received a second request message for server streaming method ${handler.path}`,
-          metadata: null
+          metadata: null,
         });
         return;
       }
@@ -1616,18 +1996,25 @@ function handleServerStreaming<RequestType, ResponseType>(
         call.sendStatus({
           code: Status.UNIMPLEMENTED,
           details: `Received no request message for server streaming method ${handler.path}`,
-          metadata: null
+          metadata: null,
         });
         return;
       }
-      stream = new ServerWritableStreamImpl(handler.path, call, requestMetadata, requestMessage);
+      stream = new ServerWritableStreamImpl(
+        handler.path,
+        call,
+        requestMetadata,
+        requestMessage
+      );
       try {
         handler.func(stream);
       } catch (err) {
         call.sendStatus({
           code: Status.UNKNOWN,
-          details: `Server method handler threw error ${(err as Error).message}`,
-          metadata: null
+          details: `Server method handler threw error ${
+            (err as Error).message
+          }`,
+          metadata: null,
         });
       }
     },
@@ -1655,8 +2042,10 @@ function handleBidiStreaming<RequestType, ResponseType>(
       } catch (err) {
         call.sendStatus({
           code: Status.UNKNOWN,
-          details: `Server method handler threw error ${(err as Error).message}`,
-          metadata: null
+          details: `Server method handler threw error ${
+            (err as Error).message
+          }`,
+          metadata: null,
         });
       }
     },
diff --git a/packages/grpc-js/src/service-config.ts b/packages/grpc-js/src/service-config.ts
index 5c2ca0d06..db1e30ec5 100644
--- a/packages/grpc-js/src/service-config.ts
+++ b/packages/grpc-js/src/service-config.ts
@@ -143,7 +143,7 @@ function validateRetryPolicy(obj: any): RetryPolicy {
     !DURATION_REGEX.test(obj.initialBackoff)
   ) {
     throw new Error(
-      'Invalid method config retry policy: initialBackoff must be a string consisting of a positive integer followed by s'
+      'Invalid method config retry policy: initialBackoff must be a string consisting of a positive integer or decimal followed by s'
     );
   }
   if (
@@ -152,7 +152,7 @@ function validateRetryPolicy(obj: any): RetryPolicy {
     !DURATION_REGEX.test(obj.maxBackoff)
   ) {
     throw new Error(
-      'Invalid method config retry policy: maxBackoff must be a string consisting of a positive integer followed by s'
+      'Invalid method config retry policy: maxBackoff must be a string consisting of a positive integer or decimal followed by s'
     );
   }
   if (
@@ -228,18 +228,18 @@ function validateHedgingPolicy(obj: any): HedgingPolicy {
       if (typeof value === 'number') {
         if (!Object.values(Status).includes(value)) {
           throw new Error(
-            'Invlid method config hedging policy: nonFatalStatusCodes value not in status code range'
+            'Invalid method config hedging policy: nonFatalStatusCodes value not in status code range'
           );
         }
       } else if (typeof value === 'string') {
         if (!Object.values(Status).includes(value.toUpperCase())) {
           throw new Error(
-            'Invlid method config hedging policy: nonFatalStatusCodes value not a status code name'
+            'Invalid method config hedging policy: nonFatalStatusCodes value not a status code name'
           );
         }
       } else {
         throw new Error(
-          'Invlid method config hedging policy: nonFatalStatusCodes value must be a string or number'
+          'Invalid method config hedging policy: nonFatalStatusCodes value must be a string or number'
         );
       }
     }
@@ -356,17 +356,23 @@ export function validateRetryThrottling(obj: any): RetryThrottling {
 
 function validateLoadBalancingConfig(obj: any): LoadBalancingConfig {
   if (!(typeof obj === 'object' && obj !== null)) {
-    throw new Error(`Invalid loadBalancingConfig: unexpected type ${typeof obj}`);
+    throw new Error(
+      `Invalid loadBalancingConfig: unexpected type ${typeof obj}`
+    );
   }
   const keys = Object.keys(obj);
   if (keys.length > 1) {
-    throw new Error(`Invalid loadBalancingConfig: unexpected multiple keys ${keys}`);
+    throw new Error(
+      `Invalid loadBalancingConfig: unexpected multiple keys ${keys}`
+    );
   }
   if (keys.length === 0) {
-    throw new Error('Invalid loadBalancingConfig: load balancing policy name required');
+    throw new Error(
+      'Invalid loadBalancingConfig: load balancing policy name required'
+    );
   }
   return {
-    [keys[0]]: obj[keys[0]]
+    [keys[0]]: obj[keys[0]],
   };
 }
 
@@ -385,7 +391,6 @@ export function validateServiceConfig(obj: any): ServiceConfig {
   if ('loadBalancingConfig' in obj) {
     if (Array.isArray(obj.loadBalancingConfig)) {
       for (const config of obj.loadBalancingConfig) {
-
         result.loadBalancingConfig.push(validateLoadBalancingConfig(config));
       }
     } else {
diff --git a/packages/grpc-js/src/subchannel-address.ts b/packages/grpc-js/src/subchannel-address.ts
index 70a7962f7..7e4f3e475 100644
--- a/packages/grpc-js/src/subchannel-address.ts
+++ b/packages/grpc-js/src/subchannel-address.ts
@@ -15,7 +15,7 @@
  *
  */
 
-import { isIP } from 'net';
+import { isIP, isIPv6 } from 'net';
 
 export interface TcpSubchannelAddress {
   port: number;
@@ -63,7 +63,11 @@ export function subchannelAddressEqual(
 
 export function subchannelAddressToString(address: SubchannelAddress): string {
   if (isTcpSubchannelAddress(address)) {
-    return address.host + ':' + address.port;
+    if (isIPv6(address.host)) {
+      return '[' + address.host + ']:' + address.port;
+    } else {
+      return address.host + ':' + address.port;
+    }
   } else {
     return address.path;
   }
diff --git a/packages/grpc-js/src/subchannel-call.ts b/packages/grpc-js/src/subchannel-call.ts
index 3b9b6152f..0ce7d72cb 100644
--- a/packages/grpc-js/src/subchannel-call.ts
+++ b/packages/grpc-js/src/subchannel-call.ts
@@ -70,6 +70,7 @@ export interface SubchannelCall {
   startRead(): void;
   halfClose(): void;
   getCallNumber(): number;
+  getDeadlineInfo(): string[];
 }
 
 export interface StatusObjectWithRstCode extends StatusObject {
@@ -81,6 +82,39 @@ export interface SubchannelCallInterceptingListener
   onReceiveStatus(status: StatusObjectWithRstCode): void;
 }
 
+function mapHttpStatusCode(code: number): StatusObject {
+  const details = `Received HTTP status code ${code}`;
+  let mappedStatusCode: number;
+  switch (code) {
+    // TODO(murgatroid99): handle 100 and 101
+    case 400:
+      mappedStatusCode = Status.INTERNAL;
+      break;
+    case 401:
+      mappedStatusCode = Status.UNAUTHENTICATED;
+      break;
+    case 403:
+      mappedStatusCode = Status.PERMISSION_DENIED;
+      break;
+    case 404:
+      mappedStatusCode = Status.UNIMPLEMENTED;
+      break;
+    case 429:
+    case 502:
+    case 503:
+    case 504:
+      mappedStatusCode = Status.UNAVAILABLE;
+      break;
+    default:
+      mappedStatusCode = Status.UNKNOWN;
+  }
+  return {
+    code: mappedStatusCode,
+    details: details,
+    metadata: new Metadata()
+  };
+}
+
 export class Http2SubchannelCall implements SubchannelCall {
   private decoder = new StreamDecoder();
 
@@ -97,14 +131,15 @@ export class Http2SubchannelCall implements SubchannelCall {
 
   private unpushedReadMessages: Buffer[] = [];
 
-  // Status code mapped from :status. To be used if grpc-status is not received
-  private mappedStatusCode: Status = Status.UNKNOWN;
+  private httpStatusCode: number | undefined;
 
   // This is populated (non-null) if and only if the call has ended
   private finalStatus: StatusObject | null = null;
 
   private internalError: SystemError | null = null;
 
+  private serverEndedCall = false;
+
   constructor(
     private readonly http2Stream: http2.ClientHttp2Stream,
     private readonly callEventTracker: CallEventTracker,
@@ -118,29 +153,7 @@ export class Http2SubchannelCall implements SubchannelCall {
         headersString += '\t\t' + header + ': ' + headers[header] + '\n';
       }
       this.trace('Received server headers:\n' + headersString);
-      switch (headers[':status']) {
-        // TODO(murgatroid99): handle 100 and 101
-        case 400:
-          this.mappedStatusCode = Status.INTERNAL;
-          break;
-        case 401:
-          this.mappedStatusCode = Status.UNAUTHENTICATED;
-          break;
-        case 403:
-          this.mappedStatusCode = Status.PERMISSION_DENIED;
-          break;
-        case 404:
-          this.mappedStatusCode = Status.UNIMPLEMENTED;
-          break;
-        case 429:
-        case 502:
-        case 503:
-        case 504:
-          this.mappedStatusCode = Status.UNAVAILABLE;
-          break;
-        default:
-          this.mappedStatusCode = Status.UNKNOWN;
-      }
+      this.httpStatusCode = headers[':status'];
 
       if (flags & http2.constants.NGHTTP2_FLAG_END_STREAM) {
         this.handleTrailers(headers);
@@ -182,6 +195,7 @@ export class Http2SubchannelCall implements SubchannelCall {
       this.maybeOutputStatus();
     });
     http2Stream.on('close', () => {
+      this.serverEndedCall = true;
       /* Use process.next tick to ensure that this code happens after any
        * "error" event that may be emitted at about the same time, so that
        * we can bubble up the error message from that event. */
@@ -204,8 +218,14 @@ export class Http2SubchannelCall implements SubchannelCall {
             if (this.finalStatus !== null) {
               return;
             }
-            code = Status.INTERNAL;
-            details = `Received RST_STREAM with code ${http2Stream.rstCode}`;
+            if (this.httpStatusCode && this.httpStatusCode !== 200) {
+              const mappedStatus = mapHttpStatusCode(this.httpStatusCode);
+              code = mappedStatus.code;
+              details = mappedStatus.details;
+            } else {
+              code = Status.INTERNAL;
+              details = `Received RST_STREAM with code ${http2Stream.rstCode} (Call ended without gRPC status)`;
+            }
             break;
           case http2.constants.NGHTTP2_REFUSED_STREAM:
             code = Status.UNAVAILABLE;
@@ -288,6 +308,9 @@ export class Http2SubchannelCall implements SubchannelCall {
       this.callEventTracker.onStreamEnd(false);
     });
   }
+  getDeadlineInfo(): string[] {
+    return [`remote_addr=${this.getPeer()}`];
+  }
 
   public onDisconnect() {
     this.endCall({
@@ -400,6 +423,7 @@ export class Http2SubchannelCall implements SubchannelCall {
   }
 
   private handleTrailers(headers: http2.IncomingHttpHeaders) {
+    this.serverEndedCall = true;
     this.callEventTracker.onStreamEnd(true);
     let headersString = '';
     for (const header of Object.keys(headers)) {
@@ -413,31 +437,38 @@ export class Http2SubchannelCall implements SubchannelCall {
       metadata = new Metadata();
     }
     const metadataMap = metadata.getMap();
-    let code: Status = this.mappedStatusCode;
-    if (
-      code === Status.UNKNOWN &&
-      typeof metadataMap['grpc-status'] === 'string'
-    ) {
-      const receivedStatus = Number(metadataMap['grpc-status']);
-      if (receivedStatus in Status) {
-        code = receivedStatus;
-        this.trace('received status code ' + receivedStatus + ' from server');
-      }
+    let status: StatusObject;
+    if (typeof metadataMap['grpc-status'] === 'string') {
+      const receivedStatus: Status = Number(metadataMap['grpc-status']);
+      this.trace('received status code ' + receivedStatus + ' from server');
       metadata.remove('grpc-status');
-    }
-    let details = '';
-    if (typeof metadataMap['grpc-message'] === 'string') {
-      try {
-        details = decodeURI(metadataMap['grpc-message']);
-      } catch (e) {
-        details = metadataMap['grpc-message'];
+      let details = '';
+      if (typeof metadataMap['grpc-message'] === 'string') {
+        try {
+          details = decodeURI(metadataMap['grpc-message']);
+        } catch (e) {
+          details = metadataMap['grpc-message'];
+        }
+        metadata.remove('grpc-message');
+        this.trace(
+          'received status details string "' + details + '" from server'
+        );
       }
-      metadata.remove('grpc-message');
-      this.trace(
-        'received status details string "' + details + '" from server'
-      );
+      status = {
+        code: receivedStatus,
+        details: details,
+        metadata: metadata
+      };
+    } else if (this.httpStatusCode) {
+      status = mapHttpStatusCode(this.httpStatusCode);
+      status.metadata = metadata;
+    } else {
+      status = {
+        code: Status.UNKNOWN,
+        details: 'No status information received',
+        metadata: metadata
+      };
     }
-    const status: StatusObject = { code, details, metadata };
     // This is a no-op if the call was already ended when handling headers.
     this.endCall(status);
   }
@@ -445,7 +476,15 @@ export class Http2SubchannelCall implements SubchannelCall {
   private destroyHttp2Stream() {
     // The http2 stream could already have been destroyed if cancelWithStatus
     // is called in response to an internal http2 error.
-    if (!this.http2Stream.destroyed) {
+    if (this.http2Stream.destroyed) {
+      return;
+    }
+    /* If the server ended the call, sending an RST_STREAM is redundant, so we
+     * just half close on the client side instead to finish closing the stream.
+     */
+    if (this.serverEndedCall) {
+      this.http2Stream.end();
+    } else {
       /* If the call has ended with an OK status, communicate that when closing
        * the stream, partly to avoid a situation in which we detect an error
        * RST_STREAM as a result after we have the status */
diff --git a/packages/grpc-js/src/subchannel-interface.ts b/packages/grpc-js/src/subchannel-interface.ts
index c26669ba3..6c314189a 100644
--- a/packages/grpc-js/src/subchannel-interface.ts
+++ b/packages/grpc-js/src/subchannel-interface.ts
@@ -15,7 +15,7 @@
  *
  */
 
-import { SubchannelRef } from './channelz';
+import type { SubchannelRef } from './channelz';
 import { ConnectivityState } from './connectivity-state';
 import { Subchannel } from './subchannel';
 
diff --git a/packages/grpc-js/src/subchannel.ts b/packages/grpc-js/src/subchannel.ts
index 63e254cf3..95b600c4c 100644
--- a/packages/grpc-js/src/subchannel.ts
+++ b/packages/grpc-js/src/subchannel.ts
@@ -31,10 +31,13 @@ import {
   SubchannelRef,
   ChannelzTrace,
   ChannelzChildrenTracker,
+  ChannelzChildrenTrackerStub,
   SubchannelInfo,
   registerChannelzSubchannel,
   ChannelzCallTracker,
+  ChannelzCallTrackerStub,
   unregisterChannelzRef,
+  ChannelzTraceStub,
 } from './channelz';
 import {
   ConnectivityStateListener,
@@ -89,12 +92,15 @@ export class Subchannel {
   // Channelz info
   private readonly channelzEnabled: boolean = true;
   private channelzRef: SubchannelRef;
-  private channelzTrace: ChannelzTrace;
-  private callTracker = new ChannelzCallTracker();
-  private childrenTracker = new ChannelzChildrenTracker();
+
+  private channelzTrace: ChannelzTrace | ChannelzTraceStub;
+  private callTracker: ChannelzCallTracker | ChannelzCallTrackerStub;
+  private childrenTracker:
+    | ChannelzChildrenTracker
+    | ChannelzChildrenTrackerStub;
 
   // Channelz socket info
-  private streamTracker = new ChannelzCallTracker();
+  private streamTracker: ChannelzCallTracker | ChannelzCallTrackerStub;
 
   /**
    * A class representing a connection to a single backend.
@@ -127,16 +133,24 @@ export class Subchannel {
 
     if (options['grpc.enable_channelz'] === 0) {
       this.channelzEnabled = false;
+      this.channelzTrace = new ChannelzTraceStub();
+      this.callTracker = new ChannelzCallTrackerStub();
+      this.childrenTracker = new ChannelzChildrenTrackerStub();
+      this.streamTracker = new ChannelzCallTrackerStub();
+    } else {
+      this.channelzTrace = new ChannelzTrace();
+      this.callTracker = new ChannelzCallTracker();
+      this.childrenTracker = new ChannelzChildrenTracker();
+      this.streamTracker = new ChannelzCallTracker();
     }
-    this.channelzTrace = new ChannelzTrace();
+
     this.channelzRef = registerChannelzSubchannel(
       this.subchannelAddressString,
       () => this.getChannelzInfo(),
       this.channelzEnabled
     );
-    if (this.channelzEnabled) {
-      this.channelzTrace.addTrace('CT_INFO', 'Subchannel created');
-    }
+
+    this.channelzTrace.addTrace('CT_INFO', 'Subchannel created');
     this.trace(
       'Subchannel constructed with options ' +
         JSON.stringify(options, undefined, 2)
@@ -338,12 +352,8 @@ export class Subchannel {
     this.refTrace('refcount ' + this.refcount + ' -> ' + (this.refcount - 1));
     this.refcount -= 1;
     if (this.refcount === 0) {
-      if (this.channelzEnabled) {
-        this.channelzTrace.addTrace('CT_INFO', 'Shutting down');
-      }
-      if (this.channelzEnabled) {
-        unregisterChannelzRef(this.channelzRef);
-      }
+      this.channelzTrace.addTrace('CT_INFO', 'Shutting down');
+      unregisterChannelzRef(this.channelzRef);
       process.nextTick(() => {
         this.transitionToState(
           [ConnectivityState.CONNECTING, ConnectivityState.READY],
diff --git a/packages/grpc-js/src/transport.ts b/packages/grpc-js/src/transport.ts
index b21581375..66a5d4556 100644
--- a/packages/grpc-js/src/transport.ts
+++ b/packages/grpc-js/src/transport.ts
@@ -28,6 +28,7 @@ import { ChannelCredentials } from './channel-credentials';
 import { ChannelOptions } from './channel-options';
 import {
   ChannelzCallTracker,
+  ChannelzCallTrackerStub,
   registerChannelzSocket,
   SocketInfo,
   SocketRef,
@@ -136,7 +137,7 @@ class Http2Transport implements Transport {
   // Channelz info
   private channelzRef: SocketRef;
   private readonly channelzEnabled: boolean = true;
-  private streamTracker = new ChannelzCallTracker();
+  private streamTracker: ChannelzCallTracker | ChannelzCallTrackerStub;
   private keepalivesSent = 0;
   private messagesSent = 0;
   private messagesReceived = 0;
@@ -159,12 +160,17 @@ class Http2Transport implements Transport {
 
     if (options['grpc.enable_channelz'] === 0) {
       this.channelzEnabled = false;
+      this.streamTracker = new ChannelzCallTrackerStub();
+    } else {
+      this.streamTracker = new ChannelzCallTracker();
     }
+
     this.channelzRef = registerChannelzSocket(
       this.subchannelAddressString,
       () => this.getChannelzInfo(),
       this.channelzEnabled
     );
+
     // Build user-agent string.
     this.userAgent = [
       options['grpc.primary_user_agent'],
@@ -192,6 +198,7 @@ class Http2Transport implements Transport {
       this.stopKeepalivePings();
       this.handleDisconnect();
     });
+
     session.once(
       'goaway',
       (errorCode: number, lastStreamID: number, opaqueData?: Buffer) => {
@@ -205,15 +212,22 @@ class Http2Transport implements Transport {
         ) {
           tooManyPings = true;
         }
-        this.trace('connection closed by GOAWAY with code ' + errorCode + ' and data ' + opaqueData?.toString());
+        this.trace(
+          'connection closed by GOAWAY with code ' +
+            errorCode +
+            ' and data ' +
+            opaqueData?.toString()
+        );
         this.reportDisconnectToOwner(tooManyPings);
       }
     );
+
     session.once('error', error => {
       /* Do nothing here. Any error should also trigger a close event, which is
        * where we want to handle that.  */
       this.trace('connection closed with error ' + (error as Error).message);
     });
+
     if (logging.isTracerEnabled(TRACER_NAME)) {
       session.on('remoteSettings', (settings: http2.Settings) => {
         this.trace(
@@ -232,6 +246,7 @@ class Http2Transport implements Transport {
         );
       });
     }
+
     /* Start the keepalive timer last, because this can trigger trace logs,
      * which should only happen after everything else is set up. */
     if (this.keepaliveWithoutCalls) {
@@ -462,7 +477,8 @@ class Http2Transport implements Transport {
       );
       this.keepaliveTimerId = setTimeout(() => {
         this.maybeSendPing();
-      }, this.keepaliveTimeMs).unref?.();
+      }, this.keepaliveTimeMs);
+      this.keepaliveTimerId.unref?.();
     }
     /* Otherwise, there is already either a keepalive timer or a ping pending,
      * wait for those to resolve. */
@@ -620,6 +636,7 @@ export class Http2SubchannelConnector implements SubchannelConnector {
   private session: http2.ClientHttp2Session | null = null;
   private isShutdown = false;
   constructor(private channelTarget: GrpcUri) {}
+
   private trace(text: string) {
     logging.trace(
       LogVerbosity.DEBUG,
@@ -627,6 +644,7 @@ export class Http2SubchannelConnector implements SubchannelConnector {
       uriToString(this.channelTarget) + ' ' + text
     );
   }
+
   private createSession(
     address: SubchannelAddress,
     credentials: ChannelCredentials,
@@ -636,6 +654,7 @@ export class Http2SubchannelConnector implements SubchannelConnector {
     if (this.isShutdown) {
       return Promise.reject();
     }
+
     return new Promise<Http2Transport>((resolve, reject) => {
       let remoteName: string | null;
       if (proxyConnectionResult.realTarget) {
@@ -675,11 +694,13 @@ export class Http2SubchannelConnector implements SubchannelConnector {
         if (options['grpc.ssl_target_name_override']) {
           const sslTargetNameOverride =
             options['grpc.ssl_target_name_override']!;
+          const originalCheckServerIdentity =
+            connectionOptions.checkServerIdentity ?? checkServerIdentity;
           connectionOptions.checkServerIdentity = (
             host: string,
             cert: PeerCertificate
           ): Error | undefined => {
-            return checkServerIdentity(sslTargetNameOverride, cert);
+            return originalCheckServerIdentity(sslTargetNameOverride, cert);
           };
           connectionOptions.servername = sslTargetNameOverride;
         } else {
@@ -762,6 +783,7 @@ export class Http2SubchannelConnector implements SubchannelConnector {
       });
     });
   }
+
   connect(
     address: SubchannelAddress,
     credentials: ChannelCredentials,
@@ -784,11 +806,13 @@ export class Http2SubchannelConnector implements SubchannelConnector {
       // This option is used for testing only.
       if (options['grpc.ssl_target_name_override']) {
         const sslTargetNameOverride = options['grpc.ssl_target_name_override']!;
+        const originalCheckServerIdentity =
+          connectionOptions.checkServerIdentity ?? checkServerIdentity;
         connectionOptions.checkServerIdentity = (
           host: string,
           cert: PeerCertificate
         ): Error | undefined => {
-          return checkServerIdentity(sslTargetNameOverride, cert);
+          return originalCheckServerIdentity(sslTargetNameOverride, cert);
         };
         connectionOptions.servername = sslTargetNameOverride;
       } else {
diff --git a/packages/grpc-js/test/common.ts b/packages/grpc-js/test/common.ts
index f6aeed103..5efbf9808 100644
--- a/packages/grpc-js/test/common.ts
+++ b/packages/grpc-js/test/common.ts
@@ -19,6 +19,8 @@ import * as loader from '@grpc/proto-loader';
 import * as assert2 from './assert2';
 import * as path from 'path';
 import * as grpc from '../src';
+import * as fsPromises from 'fs/promises';
+import * as os from 'os';
 
 import {
   GrpcObject,
@@ -31,7 +33,7 @@ import {
   HealthListener,
   SubchannelInterface,
 } from '../src/subchannel-interface';
-import { SubchannelRef } from '../src/channelz';
+import { EntityTypes, SubchannelRef } from '../src/channelz';
 import { Subchannel } from '../src/subchannel';
 import { ConnectivityState } from '../src/connectivity-state';
 
@@ -71,54 +73,77 @@ const serviceImpl = {
 
 export class TestServer {
   private server: grpc.Server;
-  public port: number | null = null;
+  private target: string | null = null;
   constructor(public useTls: boolean, options?: grpc.ServerOptions) {
     this.server = new grpc.Server(options);
     this.server.addService(echoService.service, serviceImpl);
   }
-  start(): Promise<void> {
-    let credentials: grpc.ServerCredentials;
+
+  private getCredentials(): grpc.ServerCredentials {
     if (this.useTls) {
-      credentials = grpc.ServerCredentials.createSsl(null, [
+      return grpc.ServerCredentials.createSsl(null, [
         { private_key: key, cert_chain: cert },
       ]);
     } else {
-      credentials = grpc.ServerCredentials.createInsecure();
+      return grpc.ServerCredentials.createInsecure();
     }
+  }
+
+  start(): Promise<void> {
     return new Promise<void>((resolve, reject) => {
-      this.server.bindAsync('localhost:0', credentials, (error, port) => {
+      this.server.bindAsync('localhost:0', this.getCredentials(), (error, port) => {
         if (error) {
           reject(error);
           return;
         }
-        this.port = port;
+        this.target = `localhost:${port}`;
         resolve();
       });
     });
   }
 
+  startUds(): Promise<void> {
+    return fsPromises.mkdtemp(path.join(os.tmpdir(), 'uds')).then(dir => {
+      return new Promise<void>((resolve, reject) => {
+        const target = `unix://${dir}/socket`;
+        this.server.bindAsync(target, this.getCredentials(), (error, port) => {
+          if (error) {
+            reject(error);
+            return;
+          }
+          this.target = target;
+          resolve();
+        });
+      });
+    });
+  }
+
   shutdown() {
     this.server.forceShutdown();
   }
+
+  getTarget() {
+    if (this.target === null) {
+      throw new Error('Server not yet started');
+    }
+    return this.target;
+  }
 }
 
 export class TestClient {
   private client: ServiceClient;
-  constructor(port: number, useTls: boolean, options?: grpc.ChannelOptions) {
+  constructor(target: string, useTls: boolean, options?: grpc.ChannelOptions) {
     let credentials: grpc.ChannelCredentials;
     if (useTls) {
       credentials = grpc.credentials.createSsl(ca);
     } else {
       credentials = grpc.credentials.createInsecure();
     }
-    this.client = new echoService(`localhost:${port}`, credentials, options);
+    this.client = new echoService(target, credentials, options);
   }
 
   static createFromServer(server: TestServer, options?: grpc.ChannelOptions) {
-    if (server.port === null) {
-      throw new Error('Cannot create client, server not started');
-    }
-    return new TestClient(server.port, server.useTls, options);
+    return new TestClient(server.getTarget(), server.useTls, options);
   }
 
   waitForReady(deadline: grpc.Deadline, callback: (error?: Error) => void) {
@@ -129,7 +154,10 @@ export class TestClient {
     this.client.echo({}, callback);
   }
 
-  sendRequestWithMetadata(metadata: grpc.Metadata, callback: (error?: grpc.ServiceError) => void) {
+  sendRequestWithMetadata(
+    metadata: grpc.Metadata,
+    callback: (error?: grpc.ServiceError) => void
+  ) {
     this.client.echo({}, metadata, callback);
   }
 
@@ -137,6 +165,27 @@ export class TestClient {
     return this.client.getChannel().getConnectivityState(false);
   }
 
+  waitForClientState(
+    deadline: grpc.Deadline,
+    state: ConnectivityState,
+    callback: (error?: Error) => void
+  ) {
+    this.client
+      .getChannel()
+      .watchConnectivityState(this.getChannelState(), deadline, err => {
+        if (err) {
+          return callback(err);
+        }
+
+        const currentState = this.getChannelState();
+        if (currentState === state) {
+          callback();
+        } else {
+          return this.waitForClientState(deadline, currentState, callback);
+        }
+      });
+  }
+
   close() {
     this.client.close();
   }
@@ -193,7 +242,7 @@ export class MockSubchannel implements SubchannelInterface {
   unref(): void {}
   getChannelzRef(): SubchannelRef {
     return {
-      kind: 'subchannel',
+      kind: EntityTypes.subchannel,
       id: -1,
       name: this.address,
     };
diff --git a/packages/grpc-js/test/test-channel-credentials.ts b/packages/grpc-js/test/test-channel-credentials.ts
index b05b0d048..b5c011581 100644
--- a/packages/grpc-js/test/test-channel-credentials.ts
+++ b/packages/grpc-js/test/test-channel-credentials.ts
@@ -150,8 +150,12 @@ describe('ChannelCredentials Implementation', () => {
 describe('ChannelCredentials usage', () => {
   let client: ServiceClient;
   let server: grpc.Server;
+  let portNum: number;
+  let caCert: Buffer;
+  const hostnameOverride = 'foo.test.google.fr';
   before(async () => {
     const { ca, key, cert } = await pFixtures;
+    caCert = ca;
     const serverCreds = grpc.ServerCredentials.createSsl(null, [
       { private_key: key, cert_chain: cert },
     ]);
@@ -178,9 +182,10 @@ describe('ChannelCredentials usage', () => {
           reject(err);
           return;
         }
+        portNum = port;
         client = new echoService(`localhost:${port}`, combinedCreds, {
-          'grpc.ssl_target_name_override': 'foo.test.google.fr',
-          'grpc.default_authority': 'foo.test.google.fr',
+          'grpc.ssl_target_name_override': hostnameOverride,
+          'grpc.default_authority': hostnameOverride,
         });
         server.start();
         resolve();
@@ -207,4 +212,25 @@ describe('ChannelCredentials usage', () => {
     );
     assert2.afterMustCallsSatisfied(done);
   });
+
+  it('Should call the checkServerIdentity callback', done => {
+    const channelCreds = ChannelCredentials.createSsl(caCert, null, null, {
+      checkServerIdentity: assert2.mustCall((hostname, cert) => {
+        assert.strictEqual(hostname, hostnameOverride);
+        return undefined;
+      }),
+    });
+    const client = new echoService(`localhost:${portNum}`, channelCreds, {
+      'grpc.ssl_target_name_override': hostnameOverride,
+      'grpc.default_authority': hostnameOverride,
+    });
+    client.echo(
+      { value: 'test value', value2: 3 },
+      assert2.mustCall((error: ServiceError, response: any) => {
+        assert.ifError(error);
+        assert.deepStrictEqual(response, { value: 'test value', value2: 3 });
+      })
+    );
+    assert2.afterMustCallsSatisfied(done);
+  });
 });
diff --git a/packages/grpc-js/test/test-confg-parsing.ts b/packages/grpc-js/test/test-confg-parsing.ts
index 569b83f5e..b5b9832a7 100644
--- a/packages/grpc-js/test/test-confg-parsing.ts
+++ b/packages/grpc-js/test/test-confg-parsing.ts
@@ -28,7 +28,7 @@ import parseLoadBalancingConfig = experimental.parseLoadBalancingConfig;
  */
 interface TestCase {
   name: string;
-  input: object,
+  input: object;
   output?: object;
   error?: RegExp;
 }
@@ -40,52 +40,52 @@ interface TestCase {
  * Note: some tests have an expected output that is different from the output,
  * but all non-error tests additionally verify that parsing the output again
  * produces the same output. */
-const allTestCases: {[lbPolicyName: string]: TestCase[]} = {
+const allTestCases: { [lbPolicyName: string]: TestCase[] } = {
   pick_first: [
     {
       name: 'no fields set',
       input: {},
       output: {
-        shuffleAddressList: false
-      }
+        shuffleAddressList: false,
+      },
     },
     {
       name: 'shuffleAddressList set',
       input: {
-        shuffleAddressList: true
-      }
-    }
+        shuffleAddressList: true,
+      },
+    },
   ],
   round_robin: [
     {
       name: 'no fields set',
-      input: {}
-    }
+      input: {},
+    },
   ],
   outlier_detection: [
     {
       name: 'only required fields set',
       input: {
-        child_policy: [{round_robin: {}}]
+        child_policy: [{ round_robin: {} }],
       },
       output: {
         interval: {
           seconds: 10,
-          nanos: 0
+          nanos: 0,
         },
         base_ejection_time: {
           seconds: 30,
-          nanos: 0
+          nanos: 0,
         },
         max_ejection_time: {
           seconds: 300,
-          nanos: 0
+          nanos: 0,
         },
         max_ejection_percent: 10,
         success_rate_ejection: undefined,
         failure_percentage_ejection: undefined,
-        child_policy: [{round_robin: {}}]
-      }
+        child_policy: [{ round_robin: {} }],
+      },
     },
     {
       name: 'all optional fields undefined',
@@ -96,53 +96,53 @@ const allTestCases: {[lbPolicyName: string]: TestCase[]} = {
         max_ejection_percent: undefined,
         success_rate_ejection: undefined,
         failure_percentage_ejection: undefined,
-        child_policy: [{round_robin: {}}]
+        child_policy: [{ round_robin: {} }],
       },
       output: {
         interval: {
           seconds: 10,
-          nanos: 0
+          nanos: 0,
         },
         base_ejection_time: {
           seconds: 30,
-          nanos: 0
+          nanos: 0,
         },
         max_ejection_time: {
           seconds: 300,
-          nanos: 0
+          nanos: 0,
         },
         max_ejection_percent: 10,
         success_rate_ejection: undefined,
         failure_percentage_ejection: undefined,
-        child_policy: [{round_robin: {}}]
-      }
+        child_policy: [{ round_robin: {} }],
+      },
     },
     {
       name: 'empty ejection configs',
       input: {
         success_rate_ejection: {},
         failure_percentage_ejection: {},
-        child_policy: [{round_robin: {}}]
+        child_policy: [{ round_robin: {} }],
       },
       output: {
         interval: {
           seconds: 10,
-          nanos: 0
+          nanos: 0,
         },
         base_ejection_time: {
           seconds: 30,
-          nanos: 0
+          nanos: 0,
         },
         max_ejection_time: {
           seconds: 300,
-          nanos: 0
+          nanos: 0,
         },
         max_ejection_percent: 10,
         success_rate_ejection: {
           stdev_factor: 1900,
           enforcement_percentage: 100,
           minimum_hosts: 5,
-          request_volume: 100
+          request_volume: 100,
         },
         failure_percentage_ejection: {
           threshold: 85,
@@ -150,30 +150,30 @@ const allTestCases: {[lbPolicyName: string]: TestCase[]} = {
           minimum_hosts: 5,
           request_volume: 50,
         },
-        child_policy: [{round_robin: {}}]
-      }
+        child_policy: [{ round_robin: {} }],
+      },
     },
     {
       name: 'all fields populated',
       input: {
         interval: {
           seconds: 20,
-          nanos: 0
+          nanos: 0,
         },
         base_ejection_time: {
           seconds: 40,
-          nanos: 0
+          nanos: 0,
         },
         max_ejection_time: {
           seconds: 400,
-          nanos: 0
+          nanos: 0,
         },
         max_ejection_percent: 20,
         success_rate_ejection: {
           stdev_factor: 1800,
           enforcement_percentage: 90,
           minimum_hosts: 4,
-          request_volume: 200
+          request_volume: 200,
         },
         failure_percentage_ejection: {
           threshold: 95,
@@ -181,29 +181,34 @@ const allTestCases: {[lbPolicyName: string]: TestCase[]} = {
           minimum_hosts: 4,
           request_volume: 60,
         },
-        child_policy: [{round_robin: {}}]
-
-      }
-    }
-  ]
-}
+        child_policy: [{ round_robin: {} }],
+      },
+    },
+  ],
+};
 
 describe('Load balancing policy config parsing', () => {
   for (const [lbPolicyName, testCases] of Object.entries(allTestCases)) {
     describe(lbPolicyName, () => {
       for (const testCase of testCases) {
         it(testCase.name, () => {
-          const lbConfigInput = {[lbPolicyName]: testCase.input};
+          const lbConfigInput = { [lbPolicyName]: testCase.input };
           if (testCase.error) {
             assert.throws(() => {
               parseLoadBalancingConfig(lbConfigInput);
             }, testCase.error);
           } else {
             const expectedOutput = testCase.output ?? testCase.input;
-            const parsedJson = parseLoadBalancingConfig(lbConfigInput).toJsonObject();
-            assert.deepStrictEqual(parsedJson, {[lbPolicyName]: expectedOutput});
+            const parsedJson =
+              parseLoadBalancingConfig(lbConfigInput).toJsonObject();
+            assert.deepStrictEqual(parsedJson, {
+              [lbPolicyName]: expectedOutput,
+            });
             // Test idempotency
-            assert.deepStrictEqual(parseLoadBalancingConfig(parsedJson).toJsonObject(), parsedJson);
+            assert.deepStrictEqual(
+              parseLoadBalancingConfig(parsedJson).toJsonObject(),
+              parsedJson
+            );
           }
         });
       }
diff --git a/packages/grpc-js/test/test-idle-timer.ts b/packages/grpc-js/test/test-idle-timer.ts
index 3fdeb1f64..3f2a8ed20 100644
--- a/packages/grpc-js/test/test-idle-timer.ts
+++ b/packages/grpc-js/test/test-idle-timer.ts
@@ -128,3 +128,130 @@ describe('Channel idle timer', () => {
     });
   });
 });
+
+describe('Channel idle timer with UDS', () => {
+  let server: TestServer;
+  let client: TestClient | null = null;
+  before(() => {
+    server = new TestServer(false);
+    return server.startUds();
+  });
+  afterEach(() => {
+    if (client) {
+      client.close();
+      client = null;
+    }
+  });
+  after(() => {
+    server.shutdown();
+  });
+  it('Should be able to make a request after going idle', function (done) {
+    this.timeout(5000);
+    client = TestClient.createFromServer(server, {
+      'grpc.client_idle_timeout_ms': 1000,
+    });
+    client.sendRequest(error => {
+      assert.ifError(error);
+      assert.strictEqual(
+        client!.getChannelState(),
+        grpc.connectivityState.READY
+      );
+      setTimeout(() => {
+        assert.strictEqual(
+          client!.getChannelState(),
+          grpc.connectivityState.IDLE
+        );
+        client!.sendRequest(error => {
+          assert.ifError(error);
+          done();
+        });
+      }, 1100);
+    });
+  });
+});
+
+describe('Server idle timer', () => {
+  let server: TestServer;
+  let client: TestClient | null = null;
+  before(() => {
+    server = new TestServer(false, {
+      'grpc.max_connection_idle_ms': 500, // small for testing purposes
+    });
+    return server.start();
+  });
+  afterEach(() => {
+    if (client) {
+      client.close();
+      client = null;
+    }
+  });
+  after(() => {
+    server.shutdown();
+  });
+
+  it('Should go idle after the specified time after a request ends', function (done) {
+    this.timeout(5000);
+    client = TestClient.createFromServer(server);
+    client.sendRequest(error => {
+      assert.ifError(error);
+      assert.strictEqual(
+        client!.getChannelState(),
+        grpc.connectivityState.READY
+      );
+      client?.waitForClientState(
+        Date.now() + 600,
+        grpc.connectivityState.IDLE,
+        done
+      );
+    });
+  });
+
+  it('Should be able to make a request after going idle', function (done) {
+    this.timeout(5000);
+    client = TestClient.createFromServer(server);
+    client.sendRequest(error => {
+      assert.ifError(error);
+      assert.strictEqual(
+        client!.getChannelState(),
+        grpc.connectivityState.READY
+      );
+
+      client!.waitForClientState(
+        Date.now() + 600,
+        grpc.connectivityState.IDLE,
+        err => {
+          if (err) return done(err);
+
+          assert.strictEqual(
+            client!.getChannelState(),
+            grpc.connectivityState.IDLE
+          );
+          client!.sendRequest(error => {
+            assert.ifError(error);
+            done();
+          });
+        }
+      );
+    });
+  });
+
+  it('Should go idle after the specified time after waitForReady ends', function (done) {
+    this.timeout(5000);
+    client = TestClient.createFromServer(server);
+    const deadline = new Date();
+    deadline.setSeconds(deadline.getSeconds() + 3);
+    client.waitForReady(deadline, error => {
+      assert.ifError(error);
+      assert.strictEqual(
+        client!.getChannelState(),
+        grpc.connectivityState.READY
+      );
+
+      client!.waitForClientState(
+        Date.now() + 600,
+        grpc.connectivityState.IDLE,
+        done
+      );
+    });
+  });
+});
diff --git a/packages/grpc-js/test/test-pick-first.ts b/packages/grpc-js/test/test-pick-first.ts
index df7a3c741..9803a5853 100644
--- a/packages/grpc-js/test/test-pick-first.ts
+++ b/packages/grpc-js/test/test-pick-first.ts
@@ -561,28 +561,43 @@ describe('pick_first load balancing policy', () => {
         },
         updateState: updateStateCallBackForExpectedStateSequence(
           [ConnectivityState.CONNECTING, ConnectivityState.TRANSIENT_FAILURE],
-          err => setImmediate(() => {
-            assert.strictEqual(reresolutionRequestCount, targetReresolutionRequestCount);
-            done(err);
-          })
+          err =>
+            setImmediate(() => {
+              assert.strictEqual(
+                reresolutionRequestCount,
+                targetReresolutionRequestCount
+              );
+              done(err);
+            })
         ),
         requestReresolution: () => {
           reresolutionRequestCount += 1;
-        }
+        },
       }
     );
     const pickFirst = new PickFirstLoadBalancer(channelControlHelper, {});
-    pickFirst.updateAddressList([{ addresses: [{ host: 'localhost', port: 1 }]}], config);
+    pickFirst.updateAddressList(
+      [{ addresses: [{ host: 'localhost', port: 1 }] }],
+      config
+    );
     process.nextTick(() => {
       subchannels[0].transitionToState(ConnectivityState.TRANSIENT_FAILURE);
       process.nextTick(() => {
-        pickFirst.updateAddressList([{ addresses: [{ host: 'localhost', port: 2 }]}], config);
+        pickFirst.updateAddressList(
+          [{ addresses: [{ host: 'localhost', port: 2 }] }],
+          config
+        );
         process.nextTick(() => {
           subchannels[1].transitionToState(ConnectivityState.TRANSIENT_FAILURE);
           process.nextTick(() => {
-            pickFirst.updateAddressList([{ addresses: [{ host: 'localhost', port: 3 }]}], config);
+            pickFirst.updateAddressList(
+              [{ addresses: [{ host: 'localhost', port: 3 }] }],
+              config
+            );
             process.nextTick(() => {
-              subchannels[2].transitionToState(ConnectivityState.TRANSIENT_FAILURE);
+              subchannels[2].transitionToState(
+                ConnectivityState.TRANSIENT_FAILURE
+              );
             });
           });
         });
@@ -606,22 +621,35 @@ describe('pick_first load balancing policy', () => {
         },
         updateState: updateStateCallBackForExpectedStateSequence(
           [ConnectivityState.TRANSIENT_FAILURE],
-          err => setImmediate(() => {
-            assert.strictEqual(reresolutionRequestCount, targetReresolutionRequestCount);
-            done(err);
-          })
+          err =>
+            setImmediate(() => {
+              assert.strictEqual(
+                reresolutionRequestCount,
+                targetReresolutionRequestCount
+              );
+              done(err);
+            })
         ),
         requestReresolution: () => {
           reresolutionRequestCount += 1;
-        }
+        },
       }
     );
     const pickFirst = new PickFirstLoadBalancer(channelControlHelper, {});
-    pickFirst.updateAddressList([{ addresses: [{ host: 'localhost', port: 1 }]}], config);
+    pickFirst.updateAddressList(
+      [{ addresses: [{ host: 'localhost', port: 1 }] }],
+      config
+    );
     process.nextTick(() => {
-      pickFirst.updateAddressList([{ addresses: [{ host: 'localhost', port: 2 }]}], config);
+      pickFirst.updateAddressList(
+        [{ addresses: [{ host: 'localhost', port: 2 }] }],
+        config
+      );
       process.nextTick(() => {
-        pickFirst.updateAddressList([{ addresses: [{ host: 'localhost', port: 2 }]}], config);
+        pickFirst.updateAddressList(
+          [{ addresses: [{ host: 'localhost', port: 2 }] }],
+          config
+        );
       });
     });
   });
@@ -639,13 +667,20 @@ describe('pick_first load balancing policy', () => {
           return subchannel;
         },
         updateState: updateStateCallBackForExpectedStateSequence(
-          [ConnectivityState.READY, ConnectivityState.IDLE, ConnectivityState.READY],
+          [
+            ConnectivityState.READY,
+            ConnectivityState.IDLE,
+            ConnectivityState.READY,
+          ],
           done
         ),
       }
     );
     const pickFirst = new PickFirstLoadBalancer(channelControlHelper, {});
-    pickFirst.updateAddressList([{ addresses: [{ host: 'localhost', port: 1 }]}], config);
+    pickFirst.updateAddressList(
+      [{ addresses: [{ host: 'localhost', port: 1 }] }],
+      config
+    );
     process.nextTick(() => {
       subchannels[0].transitionToState(ConnectivityState.IDLE);
       process.nextTick(() => {
@@ -776,7 +811,7 @@ describe('pick_first load balancing policy', () => {
       before(async () => {
         server = new TestServer(false);
         await server.start();
-        client = new TestClient(server.port!, false, {
+        client = TestClient.createFromServer(server, {
           'grpc.service_config': JSON.stringify(serviceConfig),
         });
       });
diff --git a/packages/grpc-js/test/test-retry-config.ts b/packages/grpc-js/test/test-retry-config.ts
index 77952e668..0e110d1d7 100644
--- a/packages/grpc-js/test/test-retry-config.ts
+++ b/packages/grpc-js/test/test-retry-config.ts
@@ -101,19 +101,19 @@ const RETRY_TEST_CASES: TestCase[] = [
       retryableStatusCodes: [14],
     },
     error:
-      /retry policy: initialBackoff must be a string consisting of a positive integer followed by s/,
+      /retry policy: initialBackoff must be a string consisting of a positive integer or decimal followed by s/,
   },
   {
     description: 'a non-numeric initialBackoff',
     config: { ...validRetryConfig, initialBackoff: 'abcs' },
     error:
-      /retry policy: initialBackoff must be a string consisting of a positive integer followed by s/,
+      /retry policy: initialBackoff must be a string consisting of a positive integer or decimal followed by s/,
   },
   {
     description: 'an initialBackoff without an s',
     config: { ...validRetryConfig, initialBackoff: '123' },
     error:
-      /retry policy: initialBackoff must be a string consisting of a positive integer followed by s/,
+      /retry policy: initialBackoff must be a string consisting of a positive integer or decimal followed by s/,
   },
   {
     description: 'omitted maxBackoff',
@@ -124,19 +124,19 @@ const RETRY_TEST_CASES: TestCase[] = [
       retryableStatusCodes: [14],
     },
     error:
-      /retry policy: maxBackoff must be a string consisting of a positive integer followed by s/,
+      /retry policy: maxBackoff must be a string consisting of a positive integer or decimal followed by s/,
   },
   {
     description: 'a non-numeric maxBackoff',
     config: { ...validRetryConfig, maxBackoff: 'abcs' },
     error:
-      /retry policy: maxBackoff must be a string consisting of a positive integer followed by s/,
+      /retry policy: maxBackoff must be a string consisting of a positive integer or decimal followed by s/,
   },
   {
     description: 'an maxBackoff without an s',
     config: { ...validRetryConfig, maxBackoff: '123' },
     error:
-      /retry policy: maxBackoff must be a string consisting of a positive integer followed by s/,
+      /retry policy: maxBackoff must be a string consisting of a positive integer or decimal followed by s/,
   },
   {
     description: 'omitted backoffMultiplier',
diff --git a/packages/grpc-js/test/test-server-interceptors.ts b/packages/grpc-js/test/test-server-interceptors.ts
index b6b5b55f2..5d4038599 100644
--- a/packages/grpc-js/test/test-server-interceptors.ts
+++ b/packages/grpc-js/test/test-server-interceptors.ts
@@ -26,24 +26,26 @@ const echoService = loadProtoFile(protoFile)
 
 const AUTH_HEADER_KEY = 'auth';
 const AUTH_HEADER_ALLOWED_VALUE = 'allowed';
-const testAuthInterceptor: grpc.ServerInterceptor = (methodDescriptor, call) => {
-  return new grpc.ServerInterceptingCall(call, {
-    start: next => {
-      const authListener: grpc.ServerListener = {
-        onReceiveMetadata: (metadata, mdNext) => {
-          if (metadata.get(AUTH_HEADER_KEY)?.[0] !== AUTH_HEADER_ALLOWED_VALUE) {
-            call.sendStatus({
-              code: grpc.status.UNAUTHENTICATED,
-              details: 'Auth metadata not correct'
-            });
-          } else {
-            mdNext(metadata);
-          }
-        }
-      };
-      next(authListener);
-    }
-  });
+const testAuthInterceptor: grpc.ServerInterceptor = (
+  methodDescriptor,
+  call
+) => {
+  const authListener = (new grpc.ServerListenerBuilder())
+    .withOnReceiveMetadata((metadata, mdNext) => {
+      if (
+        metadata.get(AUTH_HEADER_KEY)?.[0] !== AUTH_HEADER_ALLOWED_VALUE
+      ) {
+        call.sendStatus({
+          code: grpc.status.UNAUTHENTICATED,
+          details: 'Auth metadata not correct',
+        });
+      } else {
+        mdNext(metadata);
+      }
+    }).build();
+  const responder = (new grpc.ResponderBuilder())
+    .withStart(next => next(authListener)).build();
+  return new grpc.ServerInterceptingCall(call, responder);
 };
 
 let eventCounts = {
@@ -52,7 +54,7 @@ let eventCounts = {
   receiveHalfClose: 0,
   sendMetadata: 0,
   sendMessage: 0,
-  sendStatus: 0
+  sendStatus: 0,
 };
 
 function resetEventCounts() {
@@ -62,7 +64,7 @@ function resetEventCounts() {
     receiveHalfClose: 0,
     sendMetadata: 0,
     sendMessage: 0,
-    sendStatus: 0
+    sendStatus: 0,
   };
 }
 
@@ -72,7 +74,10 @@ function resetEventCounts() {
  * @param methodDescription
  * @param call
  */
-const testLoggingInterceptor: grpc.ServerInterceptor = (methodDescription, call) => {
+const testLoggingInterceptor: grpc.ServerInterceptor = (
+  methodDescription,
+  call
+) => {
   return new grpc.ServerInterceptingCall(call, {
     start: next => {
       next({
@@ -87,7 +92,7 @@ const testLoggingInterceptor: grpc.ServerInterceptor = (methodDescription, call)
         onReceiveHalfClose: hcNext => {
           eventCounts.receiveHalfClose += 1;
           hcNext();
-        }
+        },
       });
     },
     sendMetadata: (metadata, mdNext) => {
@@ -101,21 +106,24 @@ const testLoggingInterceptor: grpc.ServerInterceptor = (methodDescription, call)
     sendStatus: (status, statusNext) => {
       eventCounts.sendStatus += 1;
       statusNext(status);
-    }
+    },
   });
 };
 
-const testHeaderInjectionInterceptor: grpc.ServerInterceptor = (methodDescriptor, call) => {
+const testHeaderInjectionInterceptor: grpc.ServerInterceptor = (
+  methodDescriptor,
+  call
+) => {
   return new grpc.ServerInterceptingCall(call, {
     start: next => {
       const authListener: grpc.ServerListener = {
         onReceiveMetadata: (metadata, mdNext) => {
           metadata.set('injected-header', 'present');
           mdNext(metadata);
-        }
+        },
       };
       next(authListener);
-    }
+    },
   });
 };
 
@@ -126,22 +134,29 @@ describe('Server interceptors', () => {
     /* Tests that an interceptor can entirely prevent the handler from being
      * invoked, based on the contents of the metadata. */
     before(done => {
-      server = new grpc.Server({interceptors: [testAuthInterceptor]});
+      server = new grpc.Server({ interceptors: [testAuthInterceptor] });
       server.addService(echoService.service, {
         echo: (
           call: grpc.ServerUnaryCall<any, any>,
           callback: grpc.sendUnaryData<any>
         ) => {
           // A test will fail if a request makes it to the handler without the correct auth header
-          assert.strictEqual(call.metadata.get(AUTH_HEADER_KEY)?.[0], AUTH_HEADER_ALLOWED_VALUE);
+          assert.strictEqual(
+            call.metadata.get(AUTH_HEADER_KEY)?.[0],
+            AUTH_HEADER_ALLOWED_VALUE
+          );
           callback(null, call.request);
         },
       });
-      server.bindAsync('localhost:0', grpc.ServerCredentials.createInsecure(), (error, port) => {
-        assert.ifError(error);
-        client = new TestClient(port, false);
-        done();
-      });
+      server.bindAsync(
+        'localhost:0',
+        grpc.ServerCredentials.createInsecure(),
+        (error, port) => {
+          assert.ifError(error);
+          client = new TestClient(`localhost:${port}`, false);
+          done();
+        }
+      );
     });
     after(done => {
       client.close();
@@ -165,7 +180,7 @@ describe('Server interceptors', () => {
     let server: grpc.Server;
     let client: TestClient;
     before(done => {
-      server = new grpc.Server({interceptors: [testLoggingInterceptor]});
+      server = new grpc.Server({ interceptors: [testLoggingInterceptor] });
       server.addService(echoService.service, {
         echo: (
           call: grpc.ServerUnaryCall<any, any>,
@@ -175,11 +190,15 @@ describe('Server interceptors', () => {
           callback(null, call.request);
         },
       });
-      server.bindAsync('localhost:0', grpc.ServerCredentials.createInsecure(), (error, port) => {
-        assert.ifError(error);
-        client = new TestClient(port, false);
-        done();
-      });
+      server.bindAsync(
+        'localhost:0',
+        grpc.ServerCredentials.createInsecure(),
+        (error, port) => {
+          assert.ifError(error);
+          client = new TestClient(`localhost:${port}`, false);
+          done();
+        }
+      );
     });
     after(done => {
       client.close();
@@ -197,7 +216,7 @@ describe('Server interceptors', () => {
           receiveHalfClose: 1,
           sendMetadata: 1,
           sendMessage: 1,
-          sendStatus: 1
+          sendStatus: 1,
         });
         done();
       });
@@ -207,21 +226,30 @@ describe('Server interceptors', () => {
     let server: grpc.Server;
     let client: TestClient;
     before(done => {
-      server = new grpc.Server({interceptors: [testHeaderInjectionInterceptor]});
+      server = new grpc.Server({
+        interceptors: [testHeaderInjectionInterceptor],
+      });
       server.addService(echoService.service, {
         echo: (
           call: grpc.ServerUnaryCall<any, any>,
           callback: grpc.sendUnaryData<any>
         ) => {
-          assert.strictEqual(call.metadata.get('injected-header')?.[0], 'present');
+          assert.strictEqual(
+            call.metadata.get('injected-header')?.[0],
+            'present'
+          );
           callback(null, call.request);
         },
       });
-      server.bindAsync('localhost:0', grpc.ServerCredentials.createInsecure(), (error, port) => {
-        assert.ifError(error);
-        client = new TestClient(port, false);
-        done();
-      });
+      server.bindAsync(
+        'localhost:0',
+        grpc.ServerCredentials.createInsecure(),
+        (error, port) => {
+          assert.ifError(error);
+          client = new TestClient(`localhost:${port}`, false);
+          done();
+        }
+      );
     });
     after(done => {
       client.close();
@@ -235,23 +263,39 @@ describe('Server interceptors', () => {
     let server: grpc.Server;
     let client: TestClient;
     before(done => {
-      server = new grpc.Server({interceptors: [testAuthInterceptor, testLoggingInterceptor, testHeaderInjectionInterceptor]});
+      server = new grpc.Server({
+        interceptors: [
+          testAuthInterceptor,
+          testLoggingInterceptor,
+          testHeaderInjectionInterceptor,
+        ],
+      });
       server.addService(echoService.service, {
         echo: (
           call: grpc.ServerUnaryCall<any, any>,
           callback: grpc.sendUnaryData<any>
         ) => {
-          assert.strictEqual(call.metadata.get(AUTH_HEADER_KEY)?.[0], AUTH_HEADER_ALLOWED_VALUE);
-          assert.strictEqual(call.metadata.get('injected-header')?.[0], 'present');
+          assert.strictEqual(
+            call.metadata.get(AUTH_HEADER_KEY)?.[0],
+            AUTH_HEADER_ALLOWED_VALUE
+          );
+          assert.strictEqual(
+            call.metadata.get('injected-header')?.[0],
+            'present'
+          );
           call.sendMetadata(new grpc.Metadata());
           callback(null, call.request);
         },
       });
-      server.bindAsync('localhost:0', grpc.ServerCredentials.createInsecure(), (error, port) => {
-        assert.ifError(error);
-        client = new TestClient(port, false);
-        done();
-      });
+      server.bindAsync(
+        'localhost:0',
+        grpc.ServerCredentials.createInsecure(),
+        (error, port) => {
+          assert.ifError(error);
+          client = new TestClient(`localhost:${port}`, false);
+          done();
+        }
+      );
     });
     after(done => {
       client.close();
@@ -271,7 +315,7 @@ describe('Server interceptors', () => {
           receiveHalfClose: 0,
           sendMetadata: 0,
           sendMessage: 0,
-          sendStatus: 0
+          sendStatus: 0,
         });
         done();
       });
@@ -287,7 +331,7 @@ describe('Server interceptors', () => {
           receiveHalfClose: 1,
           sendMetadata: 1,
           sendMessage: 1,
-          sendStatus: 1
+          sendStatus: 1,
         });
         done();
       });
diff --git a/packages/grpc-js/test/test-server.ts b/packages/grpc-js/test/test-server.ts
index 14d6b4141..1ea14097f 100644
--- a/packages/grpc-js/test/test-server.ts
+++ b/packages/grpc-js/test/test-server.ts
@@ -151,14 +151,22 @@ describe('Server', () => {
     });
 
     it('succeeds when called with an already bound port', done => {
-      server.bindAsync('localhost:0', ServerCredentials.createInsecure(), (err, port) => {
-        assert.ifError(err);
-        server.bindAsync(`localhost:${port}`, ServerCredentials.createInsecure(), (err2, port2) => {
-          assert.ifError(err2);
-          assert.strictEqual(port, port2);
-          done();
-        });
-      });
+      server.bindAsync(
+        'localhost:0',
+        ServerCredentials.createInsecure(),
+        (err, port) => {
+          assert.ifError(err);
+          server.bindAsync(
+            `localhost:${port}`,
+            ServerCredentials.createInsecure(),
+            (err2, port2) => {
+              assert.ifError(err2);
+              assert.strictEqual(port, port2);
+              done();
+            }
+          );
+        }
+      );
     });
 
     it('fails when called on a bound port with different credentials', done => {
@@ -167,15 +175,19 @@ describe('Server', () => {
         [{ private_key: key, cert_chain: cert }],
         true
       );
-      server.bindAsync('localhost:0', ServerCredentials.createInsecure(), (err, port) => {
-        assert.ifError(err);
-        server.bindAsync(`localhost:${port}`, secureCreds, (err2, port2) => {
-          assert(err2 !== null);
-          assert.match(err2.message, /credentials/);
-          done();
-        })
-      });
-    })
+      server.bindAsync(
+        'localhost:0',
+        ServerCredentials.createInsecure(),
+        (err, port) => {
+          assert.ifError(err);
+          server.bindAsync(`localhost:${port}`, secureCreds, (err2, port2) => {
+            assert(err2 !== null);
+            assert.match(err2.message, /credentials/);
+            done();
+          });
+        }
+      );
+    });
   });
 
   describe('unbind', () => {
@@ -190,42 +202,73 @@ describe('Server', () => {
       assert.throws(() => {
         server.unbind('localhost:0');
       }, /port 0/);
-      server.bindAsync('localhost:0', ServerCredentials.createInsecure(), (err, port) => {
-        assert.ifError(err);
-        assert.notStrictEqual(port, 0);
-        assert.throws(() => {
-          server.unbind('localhost:0');
-        }, /port 0/);
-        done();
-      })
+      server.bindAsync(
+        'localhost:0',
+        ServerCredentials.createInsecure(),
+        (err, port) => {
+          assert.ifError(err);
+          assert.notStrictEqual(port, 0);
+          assert.throws(() => {
+            server.unbind('localhost:0');
+          }, /port 0/);
+          done();
+        }
+      );
     });
 
     it('successfully unbinds a bound ephemeral port', done => {
-      server.bindAsync('localhost:0', ServerCredentials.createInsecure(), (err, port) => {
-        client = new grpc.Client(`localhost:${port}`, grpc.credentials.createInsecure());
-        client.makeUnaryRequest('/math.Math/Div', x => x, x => x, Buffer.from('abc'), (callError1, result) => {
-          assert(callError1);
-          // UNIMPLEMENTED means that the request reached the call handling code
-          assert.strictEqual(callError1.code, grpc.status.UNIMPLEMENTED);
-          server.unbind(`localhost:${port}`);
-          const deadline = new Date();
-          deadline.setSeconds(deadline.getSeconds() + 1);
-          client!.makeUnaryRequest('/math.Math/Div', x => x, x => x, Buffer.from('abc'), {deadline: deadline}, (callError2, result) => {
-            assert(callError2);
-            // DEADLINE_EXCEEDED means that the server is unreachable
-            assert(callError2.code === grpc.status.DEADLINE_EXCEEDED || callError2.code === grpc.status.UNAVAILABLE);
-            done();
-          });
-        });
-      })
+      server.bindAsync(
+        'localhost:0',
+        ServerCredentials.createInsecure(),
+        (err, port) => {
+          client = new grpc.Client(
+            `localhost:${port}`,
+            grpc.credentials.createInsecure()
+          );
+          client.makeUnaryRequest(
+            '/math.Math/Div',
+            x => x,
+            x => x,
+            Buffer.from('abc'),
+            (callError1, result) => {
+              assert(callError1);
+              // UNIMPLEMENTED means that the request reached the call handling code
+              assert.strictEqual(callError1.code, grpc.status.UNIMPLEMENTED);
+              server.unbind(`localhost:${port}`);
+              const deadline = new Date();
+              deadline.setSeconds(deadline.getSeconds() + 1);
+              client!.makeUnaryRequest(
+                '/math.Math/Div',
+                x => x,
+                x => x,
+                Buffer.from('abc'),
+                { deadline: deadline },
+                (callError2, result) => {
+                  assert(callError2);
+                  // DEADLINE_EXCEEDED means that the server is unreachable
+                  assert(
+                    callError2.code === grpc.status.DEADLINE_EXCEEDED ||
+                      callError2.code === grpc.status.UNAVAILABLE
+                  );
+                  done();
+                }
+              );
+            }
+          );
+        }
+      );
     });
 
     it('cancels a bindAsync in progress', done => {
-      server.bindAsync('localhost:50051', ServerCredentials.createInsecure(), (err, port) => {
-        assert(err);
-        assert.match(err.message, /cancelled by unbind/);
-        done();
-      });
+      server.bindAsync(
+        'localhost:50051',
+        ServerCredentials.createInsecure(),
+        (err, port) => {
+          assert(err);
+          assert.match(err.message, /cancelled by unbind/);
+          done();
+        }
+      );
       server.unbind('localhost:50051');
     });
   });
@@ -284,7 +327,7 @@ describe('Server', () => {
       call.on('data', () => {
         server.drain(`localhost:${portNumber!}`, 100);
       });
-      call.write({value: 'abc'});
+      call.write({ value: 'abc' });
     });
   });
 
diff --git a/packages/grpc-reflection/package.json b/packages/grpc-reflection/package.json
index c7f05558e..af96dfd9d 100644
--- a/packages/grpc-reflection/package.json
+++ b/packages/grpc-reflection/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/reflection",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "author": {
     "name": "Google Inc."
   },
@@ -31,7 +31,7 @@
     "generate-types": "proto-loader-gen-types --longs String --enums String --bytes Array --defaults --oneofs --includeComments --includeDirs proto/ -O src/generated grpc/reflection/v1/reflection.proto grpc/reflection/v1alpha/reflection.proto"
   },
   "dependencies": {
-    "@grpc/proto-loader": "^0.7.10",
+    "@grpc/proto-loader": "^0.7.13",
     "protobufjs": "^7.2.5"
   },
   "peerDependencies": {
diff --git a/packages/proto-loader/README.md b/packages/proto-loader/README.md
index 5abf4d1dd..3ee672725 100644
--- a/packages/proto-loader/README.md
+++ b/packages/proto-loader/README.md
@@ -114,8 +114,8 @@ Consume the types:
 ```ts
 import * as grpc from '@grpc/grpc-js';
 import * as protoLoader from '@grpc/proto-loader';
-import { ProtoGrpcType } from './proto/example';
-import { ExampleHandlers } from './proto/example_package/Example';
+import type { ProtoGrpcType } from './proto/example.ts';
+import type { ExampleHandlers } from './proto/example_package/Example.ts';
 
 const exampleServer: ExampleHandlers = {
   // server handlers implementation...
diff --git a/packages/proto-loader/bin/proto-loader-gen-types.ts b/packages/proto-loader/bin/proto-loader-gen-types.ts
index 6db109904..b586983d9 100644
--- a/packages/proto-loader/bin/proto-loader-gen-types.ts
+++ b/packages/proto-loader/bin/proto-loader-gen-types.ts
@@ -555,7 +555,7 @@ function generateServiceClientInterface(formatter: TextFormatter, serviceType: P
   formatter.indent();
   for (const methodName of Object.keys(serviceType.methods).sort()) {
     const method = serviceType.methods[methodName];
-    for (const name of [methodName, camelCase(methodName)]) {
+    for (const name of new Set([methodName, camelCase(methodName)])) {
       if (CLIENT_RESERVED_METHOD_NAMES.has(name)) {
         continue;
       }
diff --git a/packages/proto-loader/package.json b/packages/proto-loader/package.json
index a7f4d159f..290ed8440 100644
--- a/packages/proto-loader/package.json
+++ b/packages/proto-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grpc/proto-loader",
-  "version": "0.7.10",
+  "version": "0.7.13",
   "author": "Google Inc.",
   "contributors": [
     {
@@ -47,7 +47,7 @@
   "dependencies": {
     "lodash.camelcase": "^4.3.0",
     "long": "^5.0.0",
-    "protobufjs": "^7.2.4",
+    "protobufjs": "^7.2.5",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
@@ -57,8 +57,10 @@
     "@types/node": "^10.17.26",
     "@types/yargs": "^17.0.24",
     "clang-format": "^1.2.2",
+    "google-proto-files": "^3.0.2",
     "gts": "^3.1.0",
     "rimraf": "^3.0.2",
+    "ts-node": "^10.9.2",
     "typescript": "~4.7.4"
   },
   "engines": {
diff --git a/packages/proto-loader/src/index.ts b/packages/proto-loader/src/index.ts
index d607668a9..59e68df93 100644
--- a/packages/proto-loader/src/index.ts
+++ b/packages/proto-loader/src/index.ts
@@ -115,6 +115,34 @@ export interface EnumTypeDefinition extends ProtobufTypeDefinition {
   format: 'Protocol Buffer 3 EnumDescriptorProto';
 }
 
+export enum IdempotencyLevel {
+  IDEMPOTENCY_UNKNOWN = 'IDEMPOTENCY_UNKNOWN',
+  NO_SIDE_EFFECTS = 'NO_SIDE_EFFECTS',
+  IDEMPOTENT = 'IDEMPOTENT'
+}
+
+export interface NamePart {
+  name_part: string;
+  is_extension: boolean;
+}
+
+export interface UninterpretedOption {
+  name?: NamePart[];
+  identifier_value?: string;
+  positive_int_value?: number;
+  negative_int_value?: number;
+  double_value?: number;
+  string_value?: string;
+  aggregate_value?: string;
+}
+
+export interface MethodOptions {
+  deprecated: boolean;
+  idempotency_level: IdempotencyLevel;
+  uninterpreted_option: UninterpretedOption[];
+  [k: string]: unknown;
+}
+
 export interface MethodDefinition<RequestType, ResponseType, OutputRequestType=RequestType, OutputResponseType=ResponseType> {
   path: string;
   requestStream: boolean;
@@ -126,6 +154,7 @@ export interface MethodDefinition<RequestType, ResponseType, OutputRequestType=R
   originalName?: string;
   requestType: MessageTypeDefinition;
   responseType: MessageTypeDefinition;
+  options: MethodOptions;
 }
 
 export interface ServiceDefinition {
@@ -220,6 +249,27 @@ function createSerializer(cls: Protobuf.Type): Serialize<object> {
   };
 }
 
+function mapMethodOptions(options: Partial<MethodOptions>[] | undefined): MethodOptions {
+  return (options || []).reduce((obj: MethodOptions, item: Partial<MethodOptions>) => {
+    for (const [key, value] of Object.entries(item)) {
+      switch (key) {
+        case 'uninterpreted_option' :
+          obj.uninterpreted_option.push(item.uninterpreted_option as UninterpretedOption);
+          break;
+        default:
+          obj[key] = value
+      }
+    }
+    return obj
+  },
+    {
+      deprecated: false,
+      idempotency_level: IdempotencyLevel.IDEMPOTENCY_UNKNOWN,
+      uninterpreted_option: [],
+    }
+  ) as MethodOptions;
+}
+
 function createMethodDefinition(
   method: Protobuf.Method,
   serviceName: string,
@@ -242,6 +292,7 @@ function createMethodDefinition(
     originalName: camelCase(method.name),
     requestType: createMessageDefinition(requestType, fileDescriptors),
     responseType: createMessageDefinition(responseType, fileDescriptors),
+    options: mapMethodOptions(method.parsedOptions),
   };
 }
 
diff --git a/packages/proto-loader/test/descriptor_type_test.ts b/packages/proto-loader/test/descriptor_type_test.ts
index 180681c12..7a2ed3939 100644
--- a/packages/proto-loader/test/descriptor_type_test.ts
+++ b/packages/proto-loader/test/descriptor_type_test.ts
@@ -20,6 +20,7 @@ import { rpcFileDescriptorSet } from '../test_protos/rpc.desc';
 import { readFileSync } from 'fs';
 
 import * as proto_loader from '../src/index';
+import { dirname } from 'path';
 
 // Relative path from build output directory to test_protos directory
 const TEST_PROTO_DIR = `${__dirname}/../../test_protos/`;
@@ -128,4 +129,53 @@ describe('Descriptor types', () => {
     // This will throw if the file descriptor object cannot be parsed
     proto_loader.loadFileDescriptorSetFromObject(rpcFileDescriptorSet);
   });
+
+  it('Can parse method options into object correctly', () => {
+    const includeDirs = [
+      dirname(require.resolve('google-proto-files/package.json'))
+    ];
+    const packageDefinition = proto_loader.loadSync(`${TEST_PROTO_DIR}/method_options.proto`, { includeDirs });
+    assert('Hello' in packageDefinition);
+    const service = packageDefinition.Hello as proto_loader.ServiceDefinition
+    assert.deepStrictEqual(service.Hello.options, {
+      deprecated: true,
+      idempotency_level: 'NO_SIDE_EFFECTS',
+      uninterpreted_option: [{
+        name: {
+          name_part: 'foo',
+          is_extension: false,
+        },
+        identifier_value: 'bar',
+        positive_int_value: 9007199254740991,
+        negative_int_value: -9007199254740991,
+        double_value: 1.2345,
+        string_value: 'foobar',
+        aggregate_value: 'foobar'
+      }],
+      '(google.api.http)': {
+        post: '/hello',
+        body: '*',
+        response_body: '*',
+        additional_bindings: {}
+      },
+      '(google.api.method_signature)': 'bar'
+    })
+    assert.deepStrictEqual(service.HelloWithoutOptions.options, {
+      deprecated: false,
+      idempotency_level: 'IDEMPOTENCY_UNKNOWN',
+      uninterpreted_option: []
+    })
+    assert.deepStrictEqual(service.HelloWithSomeOptions.options, {
+      deprecated: true,
+      idempotency_level: 'IDEMPOTENCY_UNKNOWN',
+      uninterpreted_option: [],
+      '(google.api.http)': {
+        get: '/hello',
+        additional_bindings: {
+          body: '*',
+          get: '/hello-world'
+        }
+      },
+    })
+  })
 });
diff --git a/packages/proto-loader/test_protos/method_options.proto b/packages/proto-loader/test_protos/method_options.proto
new file mode 100644
index 000000000..97c4fd3aa
--- /dev/null
+++ b/packages/proto-loader/test_protos/method_options.proto
@@ -0,0 +1,48 @@
+syntax = "proto3";
+
+import "google/api/annotations.proto";
+import "google/api/client.proto";
+import "google/api/httpbody.proto";
+
+message Empty {}
+
+message MethodSignature {
+  repeated string method_signature = 1;
+}
+
+service Hello {
+  rpc Hello (Empty) returns (Empty) {
+    option deprecated = true;
+    option idempotency_level = NO_SIDE_EFFECTS;
+    option uninterpreted_option = {
+      name: {
+        name_part: 'foo'
+        is_extension:  false
+      }
+      identifier_value: 'bar'
+      positive_int_value: 9007199254740991
+      negative_int_value: -9007199254740991
+      double_value: 1.2345
+      string_value: 'foobar'
+      aggregate_value: 'foobar'
+    };
+    option (google.api.http) = {
+      post: "/hello"
+      body: "*"
+      response_body: "*"
+      additional_bindings: {}
+    };
+    option (google.api.method_signature) = 'bar';
+  }
+  rpc HelloWithoutOptions (Empty) returns (Empty) {}
+  rpc HelloWithSomeOptions (Empty) returns (Empty) {
+    option deprecated = true;
+    option (google.api.http) = {
+      get: "/hello"
+      additional_bindings: {
+        get: "/hello-world"
+        body: "*"
+      }
+    };
+  }
+}
diff --git a/test/kokoro/xds-interop.cfg b/test/kokoro/xds-interop.cfg
deleted file mode 100644
index 866cb4b58..000000000
--- a/test/kokoro/xds-interop.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2017 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Config file for Kokoro (in protobuf text format)
-
-# Location of the continuous shell script in repository.
-build_file: "grpc-node/packages/grpc-js-xds/scripts/xds.sh"
-timeout_mins: 360
-action {
-  define_artifacts {
-    regex: "github/grpc/reports/**"
-  }
-}
diff --git a/test/kokoro/xds_k8s_lb.cfg b/test/kokoro/xds_k8s_lb.cfg
index 09aa3d17d..980dfb6ac 100644
--- a/test/kokoro/xds_k8s_lb.cfg
+++ b/test/kokoro/xds_k8s_lb.cfg
@@ -15,8 +15,8 @@
 # Config file for Kokoro (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc-node/packages/grpc-js-xds/scripts/xds_k8s_lb.sh"
-timeout_mins: 180
+build_file: "grpc-node/packages/grpc-js-xds/scripts/psm-interop-test-node.sh"
+timeout_mins: 360
 action {
   define_artifacts {
     regex: "artifacts/**/*sponge_log.xml"
@@ -24,3 +24,7 @@ action {
     strip_prefix: "artifacts"
   }
 }
+env_vars {
+  key: "PSM_TEST_SUITE"
+  value: "lb"
+}
diff --git a/test/kokoro/xds_k8s_url_map.cfg b/test/kokoro/xds_k8s_url_map.cfg
index 50d523b66..bb6e6baf1 100644
--- a/test/kokoro/xds_k8s_url_map.cfg
+++ b/test/kokoro/xds_k8s_url_map.cfg
@@ -15,7 +15,7 @@
 # Config file for Kokoro (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc-node/packages/grpc-js-xds/scripts/xds_k8s_url_map.sh"
+build_file: "grpc-node/packages/grpc-js-xds/scripts/psm-interop-test-node.sh"
 timeout_mins: 180
 action {
   define_artifacts {
@@ -24,3 +24,7 @@ action {
     strip_prefix: "artifacts"
   }
 }
+env_vars {
+  key: "PSM_TEST_SUITE"
+  value: "url_map"
+}