diff --git a/contrib/envoy/extensions/compression/qatzip/compressor/v3alpha/qatzip.pb.validate.go b/contrib/envoy/extensions/compression/qatzip/compressor/v3alpha/qatzip.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/compression/qatzstd/compressor/v3alpha/qatzstd.pb.validate.go b/contrib/envoy/extensions/compression/qatzstd/compressor/v3alpha/qatzstd.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/config/v3alpha/kv_store_xds_delegate_config.pb.validate.go b/contrib/envoy/extensions/config/v3alpha/kv_store_xds_delegate_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/http/checksum/v3alpha/checksum.pb.validate.go b/contrib/envoy/extensions/filters/http/checksum/v3alpha/checksum.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/http/dynamo/v3/dynamo.pb.validate.go b/contrib/envoy/extensions/filters/http/dynamo/v3/dynamo.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/http/golang/v3alpha/golang.pb.validate.go b/contrib/envoy/extensions/filters/http/golang/v3alpha/golang.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/http/language/v3alpha/language.pb.validate.go b/contrib/envoy/extensions/filters/http/language/v3alpha/language.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/http/squash/v3/squash.pb.validate.go b/contrib/envoy/extensions/filters/http/squash/v3/squash.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/http/sxg/v3alpha/sxg.pb.validate.go b/contrib/envoy/extensions/filters/http/sxg/v3alpha/sxg.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.validate.go b/contrib/envoy/extensions/filters/network/client_ssl_auth/v3/client_ssl_auth.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3/kafka.pb.validate.go b/contrib/envoy/extensions/filters/network/generic_proxy/codecs/kafka/v3/kafka.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/network/golang/v3alpha/golang.pb.validate.go b/contrib/envoy/extensions/filters/network/golang/v3alpha/golang.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.pb.validate.go b/contrib/envoy/extensions/filters/network/kafka_broker/v3/kafka_broker.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha/kafka_mesh.pb.validate.go b/contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha/kafka_mesh.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.pb.validate.go b/contrib/envoy/extensions/filters/network/mysql_proxy/v3/mysql_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.pb.validate.go b/contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/postgres_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.validate.go b/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/rocketmq_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.pb.validate.go b/contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/route.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/network/sip_proxy/router/v3alpha/router.pb.validate.go b/contrib/envoy/extensions/filters/network/sip_proxy/router/v3alpha/router.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/tra.pb.validate.go b/contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/tra.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/route.pb.validate.go b/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/route.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/sip_proxy.pb.validate.go b/contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/sip_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/matching/input_matchers/hyperscan/v3alpha/hyperscan.pb.validate.go b/contrib/envoy/extensions/matching/input_matchers/hyperscan/v3alpha/hyperscan.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.pb.validate.go b/contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/dlb.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/cryptomb.pb.validate.go b/contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/cryptomb.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/private_key_providers/qat/v3alpha/qat.pb.validate.go b/contrib/envoy/extensions/private_key_providers/qat/v3alpha/qat.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/regex_engines/hyperscan/v3alpha/hyperscan.pb.validate.go b/contrib/envoy/extensions/regex_engines/hyperscan/v3alpha/hyperscan.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/router/cluster_specifier/golang/v3alpha/golang.pb.validate.go b/contrib/envoy/extensions/router/cluster_specifier/golang/v3alpha/golang.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/tap_sinks/udp_sink/v3alpha/udp_sink.pb.validate.go b/contrib/envoy/extensions/tap_sinks/udp_sink/v3alpha/udp_sink.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/upstreams/http/tcp/golang/v3alpha/golang.pb.validate.go b/contrib/envoy/extensions/upstreams/http/tcp/golang/v3alpha/golang.pb.validate.go
old mode 100755
new mode 100644
diff --git a/contrib/envoy/extensions/vcl/v3alpha/vcl_socket_interface.pb.validate.go b/contrib/envoy/extensions/vcl/v3alpha/vcl_socket_interface.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/COMMIT b/envoy/COMMIT
index 657057a908..93f76d8268 100644
--- a/envoy/COMMIT
+++ b/envoy/COMMIT
@@ -1 +1 @@
-4861b2057afbc67290da0ec77ae1f1af60f152d0
+5285554ba5ba6701dc40108e550563e6e4d717d0
diff --git a/envoy/admin/v2alpha/certs.pb.validate.go b/envoy/admin/v2alpha/certs.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v2alpha/clusters.pb.validate.go b/envoy/admin/v2alpha/clusters.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v2alpha/config_dump.pb.validate.go b/envoy/admin/v2alpha/config_dump.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v2alpha/listeners.pb.validate.go b/envoy/admin/v2alpha/listeners.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v2alpha/memory.pb.validate.go b/envoy/admin/v2alpha/memory.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v2alpha/metrics.pb.validate.go b/envoy/admin/v2alpha/metrics.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v2alpha/mutex_stats.pb.validate.go b/envoy/admin/v2alpha/mutex_stats.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v2alpha/server_info.pb.validate.go b/envoy/admin/v2alpha/server_info.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v2alpha/tap.pb.validate.go b/envoy/admin/v2alpha/tap.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v3/certs.pb.validate.go b/envoy/admin/v3/certs.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v3/clusters.pb.go b/envoy/admin/v3/clusters.pb.go
index 3467740ac1..cb079eb047 100755
--- a/envoy/admin/v3/clusters.pb.go
+++ b/envoy/admin/v3/clusters.pb.go
@@ -263,8 +263,8 @@ type HostStatus struct {
 	//
 	// .. note::
 	//
-	//	The message will be missing if the host didn't receive enough traffic to compute a success rate, or if the
-	//	cluster didn't have enough hosts to perform outlier ejection based on success rate.
+	//	The message will be missing if the host didn’t receive enough traffic to compute a success rate, or if the
+	//	cluster didn’t have enough hosts to perform outlier ejection based on success rate.
 	LocalOriginSuccessRate *v3.Percent `protobuf:"bytes,8,opt,name=local_origin_success_rate,json=localOriginSuccessRate,proto3" json:"local_origin_success_rate,omitempty"`
 	// locality of the host.
 	Locality *v32.Locality `protobuf:"bytes,9,opt,name=locality,proto3" json:"locality,omitempty"`
@@ -381,19 +381,15 @@ type HostHealthStatus struct {
 	// The host has been removed from service discovery, but is being stabilized due to active
 	// health checking.
 	PendingDynamicRemoval bool `protobuf:"varint,5,opt,name=pending_dynamic_removal,json=pendingDynamicRemoval,proto3" json:"pending_dynamic_removal,omitempty"`
-	// The host is awaiting first health check.
+	// The host has not yet been health checked.
 	PendingActiveHc bool `protobuf:"varint,6,opt,name=pending_active_hc,json=pendingActiveHc,proto3" json:"pending_active_hc,omitempty"`
 	// The host should be excluded from panic, spillover, etc. calculations because it was explicitly
 	// taken out of rotation via protocol signal and is not meant to be routed to.
 	ExcludedViaImmediateHcFail bool `protobuf:"varint,7,opt,name=excluded_via_immediate_hc_fail,json=excludedViaImmediateHcFail,proto3" json:"excluded_via_immediate_hc_fail,omitempty"`
-	// The host failed active health check due to timeout.
+	// The host failed active HC due to timeout.
 	ActiveHcTimeout bool `protobuf:"varint,8,opt,name=active_hc_timeout,json=activeHcTimeout,proto3" json:"active_hc_timeout,omitempty"`
-	// Health status as reported by EDS.
-	//
-	// .. note::
-	//
-	//	Currently, only ``HEALTHY`` and ``UNHEALTHY`` are supported.
-	//
+	// Health status as reported by EDS. Note: only HEALTHY and UNHEALTHY are currently supported
+	// here.
 	// [#comment:TODO(mrice32): pipe through remaining EDS health status possibilities.]
 	EdsHealthStatus v32.HealthStatus `protobuf:"varint,3,opt,name=eds_health_status,json=edsHealthStatus,proto3,enum=envoy.config.core.v3.HealthStatus" json:"eds_health_status,omitempty"`
 }
diff --git a/envoy/admin/v3/clusters.pb.validate.go b/envoy/admin/v3/clusters.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v3/config_dump.pb.validate.go b/envoy/admin/v3/config_dump.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v3/config_dump_shared.pb.validate.go b/envoy/admin/v3/config_dump_shared.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v3/init_dump.pb.validate.go b/envoy/admin/v3/init_dump.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v3/listeners.pb.validate.go b/envoy/admin/v3/listeners.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v3/memory.pb.validate.go b/envoy/admin/v3/memory.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v3/metrics.pb.validate.go b/envoy/admin/v3/metrics.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v3/mutex_stats.pb.validate.go b/envoy/admin/v3/mutex_stats.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v3/server_info.pb.validate.go b/envoy/admin/v3/server_info.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/admin/v3/tap.pb.validate.go b/envoy/admin/v3/tap.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/annotations/deprecation.pb.validate.go b/envoy/annotations/deprecation.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/annotations/resource.pb.validate.go b/envoy/annotations/resource.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/auth/cert.pb.validate.go b/envoy/api/v2/auth/cert.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/auth/common.pb.validate.go b/envoy/api/v2/auth/common.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/auth/secret.pb.validate.go b/envoy/api/v2/auth/secret.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/auth/tls.pb.validate.go b/envoy/api/v2/auth/tls.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/cds.pb.validate.go b/envoy/api/v2/cds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/cluster.pb.validate.go b/envoy/api/v2/cluster.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/cluster/circuit_breaker.pb.validate.go b/envoy/api/v2/cluster/circuit_breaker.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/cluster/filter.pb.validate.go b/envoy/api/v2/cluster/filter.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/cluster/outlier_detection.pb.validate.go b/envoy/api/v2/cluster/outlier_detection.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/core/address.pb.validate.go b/envoy/api/v2/core/address.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/core/backoff.pb.validate.go b/envoy/api/v2/core/backoff.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/core/base.pb.validate.go b/envoy/api/v2/core/base.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/core/config_source.pb.validate.go b/envoy/api/v2/core/config_source.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/core/event_service_config.pb.validate.go b/envoy/api/v2/core/event_service_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/core/grpc_method_list.pb.validate.go b/envoy/api/v2/core/grpc_method_list.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/core/grpc_service.pb.validate.go b/envoy/api/v2/core/grpc_service.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/core/health_check.pb.validate.go b/envoy/api/v2/core/health_check.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/core/http_uri.pb.validate.go b/envoy/api/v2/core/http_uri.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/core/protocol.pb.validate.go b/envoy/api/v2/core/protocol.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/core/socket_option.pb.validate.go b/envoy/api/v2/core/socket_option.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/discovery.pb.validate.go b/envoy/api/v2/discovery.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/eds.pb.validate.go b/envoy/api/v2/eds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/endpoint.pb.validate.go b/envoy/api/v2/endpoint.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/endpoint/endpoint.pb.validate.go b/envoy/api/v2/endpoint/endpoint.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/endpoint/endpoint_components.pb.validate.go b/envoy/api/v2/endpoint/endpoint_components.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/endpoint/load_report.pb.validate.go b/envoy/api/v2/endpoint/load_report.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/lds.pb.validate.go b/envoy/api/v2/lds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/listener.pb.validate.go b/envoy/api/v2/listener.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/listener/listener.pb.validate.go b/envoy/api/v2/listener/listener.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/listener/listener_components.pb.validate.go b/envoy/api/v2/listener/listener_components.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/listener/quic_config.pb.validate.go b/envoy/api/v2/listener/quic_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/listener/udp_listener_config.pb.validate.go b/envoy/api/v2/listener/udp_listener_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/ratelimit/ratelimit.pb.validate.go b/envoy/api/v2/ratelimit/ratelimit.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/rds.pb.validate.go b/envoy/api/v2/rds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/route.pb.validate.go b/envoy/api/v2/route.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/route/route.pb.validate.go b/envoy/api/v2/route/route.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/route/route_components.pb.validate.go b/envoy/api/v2/route/route_components.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/scoped_route.pb.validate.go b/envoy/api/v2/scoped_route.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/api/v2/srds.pb.validate.go b/envoy/api/v2/srds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/accesslog/v2/als.pb.validate.go b/envoy/config/accesslog/v2/als.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/accesslog/v2/file.pb.validate.go b/envoy/config/accesslog/v2/file.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/accesslog/v3/accesslog.pb.validate.go b/envoy/config/accesslog/v3/accesslog.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/bootstrap/v2/bootstrap.pb.validate.go b/envoy/config/bootstrap/v2/bootstrap.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/bootstrap/v3/bootstrap.pb.go b/envoy/config/bootstrap/v3/bootstrap.pb.go
index 7e53ab982f..a8522cc1a8 100755
--- a/envoy/config/bootstrap/v3/bootstrap.pb.go
+++ b/envoy/config/bootstrap/v3/bootstrap.pb.go
@@ -1572,7 +1572,9 @@ type Bootstrap_StaticResources struct {
 	// 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.
+	// 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 []*v37.Cluster `protobuf:"bytes,2,rep,name=clusters,proto3" json:"clusters,omitempty"`
 	// These static secrets can be used by :ref:`SdsSecretConfig
 	// <envoy_v3_api_msg_extensions.transport_sockets.tls.v3.SdsSecretConfig>`
diff --git a/envoy/config/bootstrap/v3/bootstrap.pb.validate.go b/envoy/config/bootstrap/v3/bootstrap.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/cluster/aggregate/v2alpha/cluster.pb.validate.go b/envoy/config/cluster/aggregate/v2alpha/cluster.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.pb.validate.go b/envoy/config/cluster/dynamic_forward_proxy/v2alpha/cluster.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/cluster/redis/redis_cluster.pb.validate.go b/envoy/config/cluster/redis/redis_cluster.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/cluster/v3/circuit_breaker.pb.validate.go b/envoy/config/cluster/v3/circuit_breaker.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/cluster/v3/cluster.pb.validate.go b/envoy/config/cluster/v3/cluster.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/cluster/v3/filter.pb.validate.go b/envoy/config/cluster/v3/filter.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/cluster/v3/outlier_detection.pb.validate.go b/envoy/config/cluster/v3/outlier_detection.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.pb.validate.go b/envoy/config/common/dynamic_forward_proxy/v2alpha/dns_cache.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/common/key_value/v3/config.pb.validate.go b/envoy/config/common/key_value/v3/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/common/matcher/v3/matcher.pb.go b/envoy/config/common/matcher/v3/matcher.pb.go
index 61be20272d..a71f82fa09 100755
--- a/envoy/config/common/matcher/v3/matcher.pb.go
+++ b/envoy/config/common/matcher/v3/matcher.pb.go
@@ -464,16 +464,6 @@ type Matcher_OnMatch struct {
 	//	*Matcher_OnMatch_Matcher
 	//	*Matcher_OnMatch_Action
 	OnMatch isMatcher_OnMatch_OnMatch `protobuf_oneof:"on_match"`
-	// If true, the action will be taken but the caller will behave as if no
-	// match was found. This applies both to actions directly encoded in the
-	// action field and to actions returned from a nested matcher tree in the
-	// matcher field. A subsequent matcher on_no_match action will be used
-	// instead.
-	//
-	// This field is not supported in all contexts in which the matcher API is
-	// used. If this field is set in a context in which it's not supported,
-	// the resource will be rejected.
-	KeepMatching bool `protobuf:"varint,3,opt,name=keep_matching,json=keepMatching,proto3" json:"keep_matching,omitempty"`
 }
 
 func (x *Matcher_OnMatch) Reset() {
@@ -529,13 +519,6 @@ func (x *Matcher_OnMatch) GetAction() *v31.TypedExtensionConfig {
 	return nil
 }
 
-func (x *Matcher_OnMatch) GetKeepMatching() bool {
-	if x != nil {
-		return x.KeepMatching
-	}
-	return false
-}
-
 type isMatcher_OnMatch_OnMatch interface {
 	isMatcher_OnMatch_OnMatch()
 }
@@ -1236,7 +1219,7 @@ var file_envoy_config_common_matcher_v3_matcher_proto_rawDesc = []byte{
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e,
 	0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f,
-	0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xff,
+	0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xda,
 	0x11, 0x0a, 0x07, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x58, 0x0a, 0x0c, 0x6d, 0x61,
 	0x74, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x33, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
@@ -1254,7 +1237,7 @@ var file_envoy_config_common_matcher_v3_matcher_proto_rawDesc = []byte{
 	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
 	0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4f, 0x6e, 0x4d,
 	0x61, 0x74, 0x63, 0x68, 0x52, 0x09, 0x6f, 0x6e, 0x4e, 0x6f, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a,
-	0xca, 0x01, 0x0a, 0x07, 0x4f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x43, 0x0a, 0x07, 0x6d,
+	0xa5, 0x01, 0x0a, 0x07, 0x4f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x43, 0x0a, 0x07, 0x6d,
 	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
 	0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61,
@@ -1263,229 +1246,226 @@ var file_envoy_config_common_matcher_v3_matcher_proto_rawDesc = []byte{
 	0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
 	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74,
 	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x06,
-	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x6b,
-	0x65, 0x65, 0x70, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x42, 0x0f, 0x0a, 0x08, 0x6f,
-	0x6e, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a, 0xa2, 0x09, 0x0a,
-	0x0b, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x66, 0x0a, 0x08,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c,
-	0x69, 0x73, 0x74, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
-	0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x73, 0x1a, 0xdc, 0x06, 0x0a, 0x09, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x12, 0x7a, 0x0a, 0x10, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f, 0x70, 0x72, 0x65,
-	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4d, 0x2e, 0x65,
+	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0f, 0x0a, 0x08, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a, 0xa2, 0x09, 0x0a, 0x0b, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x66, 0x0a, 0x08, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2e, 0x46,
+	0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05,
+	0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x73, 0x1a,
+	0xdc, 0x06, 0x0a, 0x09, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x7a, 0x0a,
+	0x10, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
+	0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2e, 0x50, 0x72, 0x65,
+	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x50, 0x72, 0x65,
+	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x0f, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65,
+	0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x6c, 0x0a, 0x0a, 0x6f, 0x72, 0x5f,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4b, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69,
+	0x73, 0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x72, 0x65,
+	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x6f, 0x72,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x6e, 0x0a, 0x0b, 0x61, 0x6e, 0x64, 0x5f, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4b, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
 	0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61,
 	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73,
-	0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x69, 0x6e, 0x67,
-	0x6c, 0x65, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x0f, 0x73,
-	0x69, 0x6e, 0x67, 0x6c, 0x65, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x6c,
-	0x0a, 0x0a, 0x6f, 0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x4b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
-	0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74,
-	0x65, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x48,
-	0x00, 0x52, 0x09, 0x6f, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x6e, 0x0a, 0x0b,
-	0x61, 0x6e, 0x64, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x4b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
-	0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65,
-	0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00,
-	0x52, 0x0a, 0x61, 0x6e, 0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x60, 0x0a, 0x0b,
-	0x6e, 0x6f, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x3d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
-	0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65,
-	0x48, 0x00, 0x52, 0x0a, 0x6e, 0x6f, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x1a, 0x87,
-	0x02, 0x0a, 0x0f, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x12, 0x4a, 0x0a, 0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x08, 0xfa,
-	0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x47,
-	0x0a, 0x0b, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65,
-	0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69,
-	0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0a, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x4f, 0x0a, 0x0c, 0x63, 0x75, 0x73, 0x74, 0x6f,
-	0x6d, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x75, 0x73,
-	0x74, 0x6f, 0x6d, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x0e, 0x0a, 0x07, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a, 0x76, 0x0a, 0x0d, 0x50, 0x72, 0x65, 0x64,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x65, 0x0a, 0x09, 0x70, 0x72, 0x65,
-	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x65,
+	0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x72, 0x65, 0x64,
+	0x69, 0x63, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x61, 0x6e, 0x64,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x60, 0x0a, 0x0b, 0x6e, 0x6f, 0x74, 0x5f, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
 	0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61,
 	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73,
-	0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05,
-	0x92, 0x01, 0x02, 0x08, 0x02, 0x52, 0x09, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65,
-	0x42, 0x11, 0x0a, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03,
-	0xf8, 0x42, 0x01, 0x1a, 0xcb, 0x01, 0x0a, 0x0c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x72, 0x12, 0x65, 0x0a, 0x09, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x6e,
+	0x6f, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x1a, 0x87, 0x02, 0x0a, 0x0f, 0x53, 0x69,
+	0x6e, 0x67, 0x6c, 0x65, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x4a, 0x0a,
+	0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02,
+	0x10, 0x01, 0x52, 0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x47, 0x0a, 0x0b, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x12, 0x4f, 0x0a, 0x0c, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x42, 0x0e, 0x0a, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x03,
+	0xf8, 0x42, 0x01, 0x1a, 0x76, 0x0a, 0x0d, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x4c, 0x69, 0x73, 0x74, 0x12, 0x65, 0x0a, 0x09, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74,
+	0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
 	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61,
 	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
 	0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2e, 0x50, 0x72, 0x65,
-	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01,
-	0x52, 0x09, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x54, 0x0a, 0x08, 0x6f,
-	0x6e, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x08,
-	0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x07, 0x6f, 0x6e, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x1a, 0xe7, 0x04, 0x0a, 0x0b, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x54, 0x72, 0x65,
-	0x65, 0x12, 0x4a, 0x0a, 0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x08, 0xfa, 0x42,
-	0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x66, 0x0a,
-	0x0f, 0x65, 0x78, 0x61, 0x63, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x6d, 0x61, 0x70,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x54, 0x72, 0x65, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x4d, 0x61, 0x70, 0x48, 0x00, 0x52, 0x0d, 0x65, 0x78, 0x61, 0x63, 0x74, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x4d, 0x61, 0x70, 0x12, 0x68, 0x0a, 0x10, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f,
-	0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x6d, 0x61, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x3c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33,
-	0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
-	0x54, 0x72, 0x65, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70, 0x48, 0x00, 0x52,
-	0x0e, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70, 0x12,
-	0x4f, 0x0a, 0x0c, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70,
-	0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x1a, 0xd6, 0x01, 0x0a, 0x08, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70, 0x12, 0x61, 0x0a,
-	0x03, 0x6d, 0x61, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x45, 0x2e, 0x65, 0x6e, 0x76,
+	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x02,
+	0x52, 0x09, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x11, 0x0a, 0x0a, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x1a, 0xcb,
+	0x01, 0x0a, 0x0c, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12,
+	0x65, 0x0a, 0x09, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
+	0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x2e, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74,
+	0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x09, 0x70, 0x72, 0x65,
+	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x54, 0x0a, 0x08, 0x6f, 0x6e, 0x5f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x2e, 0x4f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01,
+	0x02, 0x10, 0x01, 0x52, 0x07, 0x6f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0xe7, 0x04, 0x0a,
+	0x0b, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x54, 0x72, 0x65, 0x65, 0x12, 0x4a, 0x0a, 0x05,
+	0x69, 0x6e, 0x70, 0x75, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
+	0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10,
+	0x01, 0x52, 0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x66, 0x0a, 0x0f, 0x65, 0x78, 0x61, 0x63,
+	0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x6d, 0x61, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x3c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
+	0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x72, 0x54, 0x72, 0x65, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70, 0x48,
+	0x00, 0x52, 0x0d, 0x65, 0x78, 0x61, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70,
+	0x12, 0x68, 0x0a, 0x10, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x5f, 0x6d, 0x61, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
 	0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63,
 	0x68, 0x65, 0x72, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x54, 0x72, 0x65, 0x65, 0x2e,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70, 0x2e, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72,
-	0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x9a, 0x01, 0x02, 0x08, 0x01, 0x52, 0x03, 0x6d, 0x61, 0x70,
-	0x1a, 0x67, 0x0a, 0x08, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
-	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x45,
-	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x10, 0x0a, 0x09, 0x74, 0x72, 0x65,
-	0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x13, 0x0a, 0x0c, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01,
-	0x22, 0xe8, 0x08, 0x0a, 0x0e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63,
-	0x61, 0x74, 0x65, 0x12, 0x54, 0x0a, 0x08, 0x6f, 0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70, 0x48, 0x00, 0x52, 0x0e, 0x70, 0x72, 0x65, 0x66,
+	0x69, 0x78, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70, 0x12, 0x4f, 0x0a, 0x0c, 0x63, 0x75,
+	0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x2a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x0b,
+	0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0xd6, 0x01, 0x0a, 0x08,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x61, 0x70, 0x12, 0x61, 0x0a, 0x03, 0x6d, 0x61, 0x70, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x45, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
 	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64,
-	0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x74, 0x48, 0x00,
-	0x52, 0x07, 0x6f, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x56, 0x0a, 0x09, 0x61, 0x6e, 0x64,
-	0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x53, 0x65, 0x74, 0x48, 0x00, 0x52, 0x08, 0x61, 0x6e, 0x64, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x12, 0x4d, 0x0a, 0x09, 0x6e, 0x6f, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69,
-	0x63, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x08, 0x6e, 0x6f, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x12, 0x26, 0x0a, 0x09, 0x61, 0x6e, 0x79, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x08, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x6a, 0x02, 0x08, 0x01, 0x48, 0x00, 0x52, 0x08,
-	0x61, 0x6e, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x6f, 0x0a, 0x1a, 0x68, 0x74, 0x74, 0x70,
-	0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
-	0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65,
+	0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x54, 0x72, 0x65, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x4d, 0x61, 0x70, 0x2e, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x42, 0x08, 0xfa, 0x42,
+	0x05, 0x9a, 0x01, 0x02, 0x08, 0x01, 0x52, 0x03, 0x6d, 0x61, 0x70, 0x1a, 0x67, 0x0a, 0x08, 0x4d,
+	0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x45, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x2e, 0x4f, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x3a, 0x02, 0x38, 0x01, 0x42, 0x10, 0x0a, 0x09, 0x74, 0x72, 0x65, 0x65, 0x5f, 0x74, 0x79, 0x70,
+	0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x13, 0x0a, 0x0c, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xe8, 0x08, 0x0a, 0x0e,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x54,
+	0x0a, 0x08, 0x6f, 0x72, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x37, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76,
+	0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x74, 0x48, 0x00, 0x52, 0x07, 0x6f, 0x72, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x12, 0x56, 0x0a, 0x09, 0x61, 0x6e, 0x64, 0x5f, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72,
+	0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x74,
+	0x48, 0x00, 0x52, 0x08, 0x61, 0x6e, 0x64, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x4d, 0x0a, 0x09,
+	0x6e, 0x6f, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33,
+	0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x48,
+	0x00, 0x52, 0x08, 0x6e, 0x6f, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x26, 0x0a, 0x09, 0x61,
+	0x6e, 0x79, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x42, 0x07,
+	0xfa, 0x42, 0x04, 0x6a, 0x02, 0x08, 0x01, 0x48, 0x00, 0x52, 0x08, 0x61, 0x6e, 0x79, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x12, 0x6f, 0x0a, 0x1a, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x17, 0x68, 0x74, 0x74,
+	0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x12, 0x71, 0x0a, 0x1b, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x48,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x18, 0x68,
+	0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65,
+	0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x71, 0x0a, 0x1b, 0x68, 0x74, 0x74, 0x70, 0x5f,
+	0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73,
+	0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
 	0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74,
 	0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00,
-	0x52, 0x17, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x71, 0x0a, 0x1b, 0x68, 0x74, 0x74,
-	0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65,
-	0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e,
-	0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68,
-	0x48, 0x00, 0x52, 0x18, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54,
-	0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x71, 0x0a, 0x1b,
-	0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e,
-	0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x18, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
-	0x73, 0x0a, 0x1c, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x5f, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x19, 0x68, 0x74, 0x74, 0x70, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x12, 0x7c, 0x0a, 0x1f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x62, 0x6f, 0x64,
-	0x79, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48,
+	0x52, 0x18, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x73, 0x0a, 0x1c, 0x68, 0x74,
+	0x74, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74, 0x72, 0x61, 0x69,
+	0x6c, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x30, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76,
+	0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74,
+	0x63, 0x68, 0x48, 0x00, 0x52, 0x19, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
+	0x7c, 0x0a, 0x1f, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f,
+	0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x62, 0x6f, 0x64, 0x79, 0x5f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x47, 0x65,
+	0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00,
+	0x52, 0x1b, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x47, 0x65, 0x6e,
+	0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x7e, 0x0a,
+	0x20, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x67,
+	0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x62, 0x6f, 0x64, 0x79, 0x5f, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x47, 0x65, 0x6e,
+	0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52,
+	0x1c, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x47, 0x65, 0x6e,
+	0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x1a, 0x5a, 0x0a,
+	0x08, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x74, 0x12, 0x4e, 0x0a, 0x05, 0x72, 0x75, 0x6c,
+	0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x50,
+	0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02,
+	0x08, 0x02, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x42, 0x0b, 0x0a, 0x04, 0x72, 0x75, 0x6c,
+	0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0x52, 0x0a, 0x10, 0x48, 0x74, 0x74, 0x70, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x3e, 0x0a, 0x07, 0x68, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65,
+	0x72, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x22, 0xa1, 0x02, 0x0a, 0x14, 0x48,
 	0x74, 0x74, 0x70, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x1b, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x12, 0x7e, 0x0a, 0x20, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x5f, 0x62, 0x6f, 0x64, 0x79,
-	0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74,
-	0x74, 0x70, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x48, 0x00, 0x52, 0x1c, 0x68, 0x74, 0x74, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x1a, 0x5a, 0x0a, 0x08, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x65, 0x74, 0x12, 0x4e,
-	0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x42, 0x08, 0xfa,
-	0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x02, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x42, 0x0b,
-	0x0a, 0x04, 0x72, 0x75, 0x6c, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0x52, 0x0a, 0x10, 0x48,
-	0x74, 0x74, 0x70, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
-	0x3e, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x22,
-	0xa1, 0x02, 0x0a, 0x14, 0x48, 0x74, 0x74, 0x70, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42,
-	0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x79, 0x74, 0x65,
-	0x73, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x62,
-	0x79, 0x74, 0x65, 0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x6b, 0x0a, 0x08, 0x70, 0x61, 0x74,
-	0x74, 0x65, 0x72, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x45, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74,
-	0x70, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x2e, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x54, 0x65, 0x78, 0x74, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x08, 0x70, 0x61,
-	0x74, 0x74, 0x65, 0x72, 0x6e, 0x73, 0x1a, 0x7b, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69,
-	0x63, 0x54, 0x65, 0x78, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x2c, 0x0a, 0x0c, 0x73, 0x74,
-	0x72, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x2c, 0x0a, 0x0c, 0x62, 0x69, 0x6e, 0x61,
-	0x72, 0x79, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x07,
-	0xfa, 0x42, 0x04, 0x7a, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x62, 0x69, 0x6e, 0x61, 0x72,
-	0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x0b, 0x0a, 0x04, 0x72, 0x75, 0x6c, 0x65, 0x12, 0x03,
-	0xf8, 0x42, 0x01, 0x42, 0x97, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x2c,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4f, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
-	0x2f, 0x76, 0x33, 0x3b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x63, 0x68, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x6c, 0x69, 0x6d,
+	0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x62, 0x79, 0x74, 0x65, 0x73, 0x4c,
+	0x69, 0x6d, 0x69, 0x74, 0x12, 0x6b, 0x0a, 0x08, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x73,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x45, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x47, 0x65, 0x6e, 0x65,
+	0x72, 0x69, 0x63, 0x42, 0x6f, 0x64, 0x79, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x47, 0x65, 0x6e,
+	0x65, 0x72, 0x69, 0x63, 0x54, 0x65, 0x78, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x42, 0x08, 0xfa,
+	0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x08, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e,
+	0x73, 0x1a, 0x7b, 0x0a, 0x10, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x69, 0x63, 0x54, 0x65, 0x78, 0x74,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x2c, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04,
+	0x72, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x12, 0x2c, 0x0a, 0x0c, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x6d, 0x61,
+	0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x7a, 0x02,
+	0x10, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x42, 0x0b, 0x0a, 0x04, 0x72, 0x75, 0x6c, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42, 0x97,
+	0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x2c, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
+	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/envoy/config/common/matcher/v3/matcher.pb.validate.go b/envoy/config/common/matcher/v3/matcher.pb.validate.go
old mode 100755
new mode 100644
index 884983c8e2..88607c30b1
--- a/envoy/config/common/matcher/v3/matcher.pb.validate.go
+++ b/envoy/config/common/matcher/v3/matcher.pb.validate.go
@@ -1086,8 +1086,6 @@ func (m *Matcher_OnMatch) validate(all bool) error {
 
 	var errors []error
 
-	// no validation rules for KeepMatching
-
 	oneofOnMatchPresent := false
 	switch v := m.OnMatch.(type) {
 	case *Matcher_OnMatch_Matcher:
diff --git a/envoy/config/common/matcher/v3/matcher_vtproto.pb.go b/envoy/config/common/matcher/v3/matcher_vtproto.pb.go
index 82390469bb..431572ef8e 100755
--- a/envoy/config/common/matcher/v3/matcher_vtproto.pb.go
+++ b/envoy/config/common/matcher/v3/matcher_vtproto.pb.go
@@ -49,16 +49,6 @@ func (m *Matcher_OnMatch) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error)
 		i -= len(m.unknownFields)
 		copy(dAtA[i:], m.unknownFields)
 	}
-	if m.KeepMatching {
-		i--
-		if m.KeepMatching {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i--
-		dAtA[i] = 0x18
-	}
 	if msg, ok := m.OnMatch.(*Matcher_OnMatch_Action); ok {
 		size, err := msg.MarshalToSizedBufferVTStrict(dAtA[:i])
 		if err != nil {
@@ -1447,9 +1437,6 @@ func (m *Matcher_OnMatch) SizeVT() (n int) {
 	if vtmsg, ok := m.OnMatch.(interface{ SizeVT() int }); ok {
 		n += vtmsg.SizeVT()
 	}
-	if m.KeepMatching {
-		n += 2
-	}
 	n += len(m.unknownFields)
 	return n
 }
diff --git a/envoy/config/common/mutation_rules/v3/mutation_rules.pb.validate.go b/envoy/config/common/mutation_rules/v3/mutation_rules.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/common/tap/v2alpha/common.pb.validate.go b/envoy/config/common/tap/v2alpha/common.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/address.pb.go b/envoy/config/core/v3/address.pb.go
index a4bd17a56f..1fabda9c9c 100755
--- a/envoy/config/core/v3/address.pb.go
+++ b/envoy/config/core/v3/address.pb.go
@@ -247,21 +247,9 @@ type SocketAddress struct {
 	// allow both IPv4 and IPv6 connections, with peer IPv4 addresses mapped into
 	// IPv6 space as “::FFFF:<IPv4-address>“.
 	Ipv4Compat bool `protobuf:"varint,6,opt,name=ipv4_compat,json=ipv4Compat,proto3" json:"ipv4_compat,omitempty"`
-	// Filepath that specifies the Linux network namespace this socket will be created in (see “man 7
-	// network_namespaces“). If this field is set, Envoy will create the socket in the specified
-	// network namespace.
-	//
-	// .. note::
-	//
-	//	Setting this parameter requires Envoy to run with the ``CAP_NET_ADMIN`` capability.
-	//
-	// .. note::
-	//
-	//	Currently only used for Listener sockets.
-	//
-	// .. attention::
-	//
-	//	Network namespaces are only configurable on Linux. Otherwise, this field has no effect.
+	// The Linux network namespace to bind the socket to. If this is set, Envoy will
+	// create the socket in the specified network namespace. Only supported on Linux.
+	// [#not-implemented-hide:]
 	NetworkNamespaceFilepath string `protobuf:"bytes,7,opt,name=network_namespace_filepath,json=networkNamespaceFilepath,proto3" json:"network_namespace_filepath,omitempty"`
 }
 
diff --git a/envoy/config/core/v3/address.pb.validate.go b/envoy/config/core/v3/address.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/backoff.pb.validate.go b/envoy/config/core/v3/backoff.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/base.pb.go b/envoy/config/core/v3/base.pb.go
index 673df4d5ae..488fcf5e39 100755
--- a/envoy/config/core/v3/base.pb.go
+++ b/envoy/config/core/v3/base.pb.go
@@ -2583,287 +2583,290 @@ var file_envoy_config_core_v3_base_proto_rawDesc = []byte{
 	0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
 	0x3a, 0x21, 0x9a, 0xc5, 0x88, 0x1e, 0x1c, 0x0a, 0x1a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
 	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64,
-	0x61, 0x74, 0x61, 0x22, 0x7d, 0x0a, 0x0d, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x55, 0x49,
-	0x6e, 0x74, 0x33, 0x32, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x64, 0x65, 0x66,
-	0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x75, 0x6e,
-	0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
-	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4b, 0x65, 0x79, 0x3a, 0x26, 0x9a, 0xc5, 0x88, 0x1e,
-	0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x55, 0x49, 0x6e, 0x74,
-	0x33, 0x32, 0x22, 0x6e, 0x0a, 0x0e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x50, 0x65, 0x72,
-	0x63, 0x65, 0x6e, 0x74, 0x12, 0x3b, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x65, 0x72, 0x63,
-	0x65, 0x6e, 0x74, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4b,
-	0x65, 0x79, 0x22, 0x7d, 0x0a, 0x0d, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x44, 0x6f, 0x75,
-	0x62, 0x6c, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x74,
-	0x69, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4b, 0x65, 0x79, 0x3a, 0x26, 0x9a, 0xc5, 0x88, 0x1e, 0x21,
-	0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x44, 0x6f, 0x75, 0x62, 0x6c,
-	0x65, 0x22, 0xad, 0x01, 0x0a, 0x12, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x65, 0x61,
-	0x74, 0x75, 0x72, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x49, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05,
-	0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b,
-	0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
-	0x65, 0x4b, 0x65, 0x79, 0x3a, 0x2b, 0x9a, 0xc5, 0x88, 0x1e, 0x26, 0x0a, 0x24, 0x65, 0x6e, 0x76,
+	0x61, 0x74, 0x61, 0x22, 0x86, 0x01, 0x0a, 0x0d, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x55,
+	0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
+	0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x64, 0x65,
+	0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x28, 0x0a, 0x0b, 0x72, 0x75,
+	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42,
+	0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0a, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x4b, 0x65, 0x79, 0x3a, 0x26, 0x9a, 0xc5, 0x88, 0x1e, 0x21, 0x0a, 0x1f, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x52,
-	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x46, 0x6c, 0x61,
-	0x67, 0x22, 0x57, 0x0a, 0x08, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x28, 0x0a,
-	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x16, 0xfa, 0x42, 0x08, 0x72,
-	0x06, 0x10, 0x01, 0x28, 0x80, 0x80, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30,
-	0x18, 0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e,
-	0x30, 0x18, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x5b, 0x0a, 0x0c, 0x4b, 0x65,
-	0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x50, 0x61, 0x69, 0x72, 0x12, 0x1d, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0x10, 0x01,
-	0x28, 0x80, 0x80, 0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2c, 0x0a, 0x05, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xf5, 0x02, 0x0a, 0x0e, 0x4b, 0x65, 0x79, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x12, 0x3a, 0x0a, 0x06, 0x72, 0x65,
-	0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x50, 0x61, 0x69, 0x72, 0x52, 0x06,
-	0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x49, 0x0a, 0x05, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4b, 0x65, 0x79,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x13, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x08, 0x01, 0x92,
-	0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x05, 0x65, 0x6e, 0x74, 0x72,
-	0x79, 0x12, 0x5b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x2e, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42,
-	0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x7f,
-	0x0a, 0x14, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64,
-	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x17, 0x41, 0x50, 0x50, 0x45, 0x4e, 0x44,
-	0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x5f, 0x4f, 0x52, 0x5f, 0x41, 0x44,
-	0x44, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x41, 0x44, 0x44, 0x5f, 0x49, 0x46, 0x5f, 0x41, 0x42,
-	0x53, 0x45, 0x4e, 0x54, 0x10, 0x01, 0x12, 0x1e, 0x0a, 0x1a, 0x4f, 0x56, 0x45, 0x52, 0x57, 0x52,
-	0x49, 0x54, 0x45, 0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x5f, 0x4f, 0x52,
-	0x5f, 0x41, 0x44, 0x44, 0x10, 0x02, 0x12, 0x17, 0x0a, 0x13, 0x4f, 0x56, 0x45, 0x52, 0x57, 0x52,
-	0x49, 0x54, 0x45, 0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x10, 0x03, 0x22,
-	0x73, 0x0a, 0x10, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4d, 0x75, 0x74, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x3c, 0x0a, 0x06, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4b, 0x65, 0x79, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x52, 0x06, 0x61, 0x70, 0x70, 0x65, 0x6e,
-	0x64, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x42, 0x09, 0xfa, 0x42, 0x06, 0x72, 0x04, 0x28, 0x80, 0x80, 0x01, 0x52, 0x06, 0x72, 0x65,
-	0x6d, 0x6f, 0x76, 0x65, 0x22, 0x41, 0x0a, 0x0e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72,
-	0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x12, 0x19, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x03, 0x6b, 0x65,
-	0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xcd, 0x01, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x11, 0xfa, 0x42, 0x0e, 0x72, 0x0c, 0x10, 0x01, 0x28, 0x80, 0x80,
-	0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x37, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x21, 0xfa, 0x42, 0x0c,
-	0x72, 0x0a, 0x28, 0x80, 0x80, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02, 0xf2, 0x98, 0xfe, 0x8f,
-	0x05, 0x0c, 0x12, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x52, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x3a, 0x0a, 0x09, 0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x1d, 0xfa, 0x42, 0x08, 0x7a, 0x06, 0x10,
-	0x00, 0x18, 0x80, 0x80, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x0c, 0x12, 0x0a, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x52, 0x08, 0x72, 0x61, 0x77, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x24, 0x9a, 0xc5, 0x88, 0x1e, 0x1f, 0x0a, 0x1d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xd9, 0x03, 0x0a, 0x11, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x43, 0x0a,
-	0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x12, 0x3f, 0x0a, 0x06, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b,
-	0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x06, 0x61, 0x70, 0x70,
-	0x65, 0x6e, 0x64, 0x12, 0x69, 0x0a, 0x0d, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x5f, 0x61, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64,
-	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01,
-	0x52, 0x0c, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x28,
-	0x0a, 0x10, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x5f, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x6b, 0x65, 0x65, 0x70, 0x45, 0x6d,
-	0x70, 0x74, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x7d, 0x0a, 0x12, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1b,
-	0x0a, 0x17, 0x41, 0x50, 0x50, 0x45, 0x4e, 0x44, 0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49, 0x53,
-	0x54, 0x53, 0x5f, 0x4f, 0x52, 0x5f, 0x41, 0x44, 0x44, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x41,
-	0x44, 0x44, 0x5f, 0x49, 0x46, 0x5f, 0x41, 0x42, 0x53, 0x45, 0x4e, 0x54, 0x10, 0x01, 0x12, 0x1e,
-	0x0a, 0x1a, 0x4f, 0x56, 0x45, 0x52, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x49, 0x46, 0x5f, 0x45,
-	0x58, 0x49, 0x53, 0x54, 0x53, 0x5f, 0x4f, 0x52, 0x5f, 0x41, 0x44, 0x44, 0x10, 0x02, 0x12, 0x17,
-	0x0a, 0x13, 0x4f, 0x56, 0x45, 0x52, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x49, 0x46, 0x5f, 0x45,
-	0x58, 0x49, 0x53, 0x54, 0x53, 0x10, 0x03, 0x3a, 0x2a, 0x9a, 0xc5, 0x88, 0x1e, 0x25, 0x0a, 0x23,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x22, 0x6c, 0x0a, 0x09, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x70,
-	0x12, 0x3b, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x3a, 0x22, 0x9a,
-	0xc5, 0x88, 0x1e, 0x1d, 0x0a, 0x1b, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x61,
-	0x70, 0x22, 0x2f, 0x0a, 0x10, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65,
-	0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x1b, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x70, 0x61,
-	0x74, 0x68, 0x22, 0xc9, 0x02, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x12, 0x25, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x08,
-	0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x69, 0x6e, 0x6c, 0x69,
-	0x6e, 0x65, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00,
-	0x52, 0x0b, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x25, 0x0a,
-	0x0d, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0c, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x53, 0x74,
-	0x72, 0x69, 0x6e, 0x67, 0x12, 0x3c, 0x0a, 0x14, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d,
-	0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x48, 0x00, 0x52, 0x13, 0x65,
-	0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62,
-	0x6c, 0x65, 0x12, 0x53, 0x0a, 0x11, 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x64, 0x69,
-	0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65,
-	0x63, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x10, 0x77, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x44, 0x69,
-	0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x3a, 0x23, 0x9a, 0xc5, 0x88, 0x1e, 0x1e, 0x0a, 0x1c,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x22, 0x77, 0x0a, 0x0e,
+	0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x12, 0x3b,
+	0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79,
+	0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0c, 0x64,
+	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x28, 0x0a, 0x0b, 0x72,
+	0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0a, 0x72, 0x75, 0x6e, 0x74, 0x69,
+	0x6d, 0x65, 0x4b, 0x65, 0x79, 0x22, 0x86, 0x01, 0x0a, 0x0d, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d,
+	0x65, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75,
+	0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0c,
+	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x28, 0x0a, 0x0b,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0a, 0x72, 0x75, 0x6e, 0x74,
+	0x69, 0x6d, 0x65, 0x4b, 0x65, 0x79, 0x3a, 0x26, 0x9a, 0xc5, 0x88, 0x1e, 0x21, 0x0a, 0x1f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x22, 0xb6,
+	0x01, 0x0a, 0x12, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x65, 0x61, 0x74, 0x75, 0x72,
+	0x65, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x49, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
+	0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42,
+	0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02,
+	0x10, 0x01, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x12, 0x28, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0a,
+	0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4b, 0x65, 0x79, 0x3a, 0x2b, 0x9a, 0xc5, 0x88, 0x1e,
+	0x26, 0x0a, 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x65, 0x61, 0x74,
+	0x75, 0x72, 0x65, 0x46, 0x6c, 0x61, 0x67, 0x22, 0x57, 0x0a, 0x08, 0x4b, 0x65, 0x79, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x28, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x42, 0x16, 0xfa, 0x42, 0x08, 0x72, 0x06, 0x10, 0x01, 0x28, 0x80, 0x80, 0x01, 0x92, 0xc7, 0x86,
+	0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x0b, 0x92, 0xc7,
+	0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x22, 0x5b, 0x0a, 0x0c, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x50, 0x61, 0x69, 0x72,
+	0x12, 0x1d, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa,
+	0x42, 0x08, 0x72, 0x06, 0x10, 0x01, 0x28, 0x80, 0x80, 0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x2c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xf5, 0x02,
+	0x0a, 0x0e, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64,
+	0x12, 0x3a, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x50, 0x61, 0x69, 0x72, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x49, 0x0a, 0x05,
+	0x65, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
+	0x76, 0x33, 0x2e, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x13, 0xfa, 0x42, 0x05,
+	0x8a, 0x01, 0x02, 0x08, 0x01, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01,
+	0x52, 0x05, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x5b, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x4b,
+	0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x2e, 0x4b, 0x65,
+	0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x41, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x06, 0x61, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x22, 0x7f, 0x0a, 0x14, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x17,
+	0x41, 0x50, 0x50, 0x45, 0x4e, 0x44, 0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53,
+	0x5f, 0x4f, 0x52, 0x5f, 0x41, 0x44, 0x44, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x41, 0x44, 0x44,
+	0x5f, 0x49, 0x46, 0x5f, 0x41, 0x42, 0x53, 0x45, 0x4e, 0x54, 0x10, 0x01, 0x12, 0x1e, 0x0a, 0x1a,
+	0x4f, 0x56, 0x45, 0x52, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49,
+	0x53, 0x54, 0x53, 0x5f, 0x4f, 0x52, 0x5f, 0x41, 0x44, 0x44, 0x10, 0x02, 0x12, 0x17, 0x0a, 0x13,
+	0x4f, 0x56, 0x45, 0x52, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49,
+	0x53, 0x54, 0x53, 0x10, 0x03, 0x22, 0x73, 0x0a, 0x10, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3c, 0x0a, 0x06, 0x61, 0x70, 0x70,
+	0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
+	0x2e, 0x4b, 0x65, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x52,
+	0x06, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x76,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x09, 0xfa, 0x42, 0x06, 0x72, 0x04, 0x28, 0x80,
+	0x80, 0x01, 0x52, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x22, 0x41, 0x0a, 0x0e, 0x51, 0x75,
+	0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x12, 0x19, 0x0a, 0x03,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02,
+	0x10, 0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xcd, 0x01,
+	0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x11, 0xfa, 0x42, 0x0e, 0x72,
+	0x0c, 0x10, 0x01, 0x28, 0x80, 0x80, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x03, 0x6b,
+	0x65, 0x79, 0x12, 0x37, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x42, 0x21, 0xfa, 0x42, 0x0c, 0x72, 0x0a, 0x28, 0x80, 0x80, 0x01, 0xc8, 0x01, 0x00, 0xc0,
+	0x01, 0x02, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x0c, 0x12, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f,
+	0x74, 0x79, 0x70, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x3a, 0x0a, 0x09, 0x72,
+	0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x1d,
+	0xfa, 0x42, 0x08, 0x7a, 0x06, 0x10, 0x00, 0x18, 0x80, 0x80, 0x01, 0xf2, 0x98, 0xfe, 0x8f, 0x05,
+	0x0c, 0x12, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x52, 0x08, 0x72,
+	0x61, 0x77, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x24, 0x9a, 0xc5, 0x88, 0x1e, 0x1f, 0x0a, 0x1d,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x10, 0x0a, 0x09,
-	0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xee,
-	0x05, 0x0a, 0x0b, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x4b,
-	0x0a, 0x0e, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x6f, 0x66, 0x66,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x42, 0x61,
-	0x63, 0x6b, 0x6f, 0x66, 0x66, 0x53, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x52, 0x0c, 0x72,
-	0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66, 0x66, 0x12, 0x52, 0x0a, 0x0b, 0x6e,
-	0x75, 0x6d, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x13,
-	0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x0d, 0x0a, 0x0b, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x65, 0x74, 0x72,
-	0x69, 0x65, 0x73, 0x52, 0x0a, 0x6e, 0x75, 0x6d, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x12,
-	0x19, 0x0a, 0x08, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x07, 0x72, 0x65, 0x74, 0x72, 0x79, 0x4f, 0x6e, 0x12, 0x56, 0x0a, 0x0e, 0x72, 0x65,
-	0x74, 0x72, 0x79, 0x5f, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50,
-	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72,
-	0x69, 0x74, 0x79, 0x52, 0x0d, 0x72, 0x65, 0x74, 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69,
-	0x74, 0x79, 0x12, 0x66, 0x0a, 0x14, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x68, 0x6f, 0x73, 0x74,
-	0x5f, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65,
-	0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x12, 0x72, 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73,
-	0x74, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x48, 0x0a, 0x21, 0x68, 0x6f,
-	0x73, 0x74, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x74,
-	0x72, 0x79, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x61, 0x74, 0x74, 0x65, 0x6d, 0x70, 0x74, 0x73, 0x18,
-	0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x1d, 0x68, 0x6f, 0x73, 0x74, 0x53, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x4d, 0x61, 0x78, 0x41, 0x74, 0x74, 0x65,
-	0x6d, 0x70, 0x74, 0x73, 0x1a, 0x76, 0x0a, 0x0d, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x72, 0x69,
-	0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x12, 0x39, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00,
-	0x52, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x0d, 0x0a,
-	0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x1a, 0x7b, 0x0a, 0x12,
-	0x52, 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61,
-	0x74, 0x65, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
-	0x39, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x74,
-	0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x24, 0x9a, 0xc5, 0x88, 0x1e, 0x1f,
-	0x0a, 0x1d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22,
-	0xe8, 0x01, 0x0a, 0x10, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x12, 0x42, 0x0a, 0x08, 0x68, 0x74, 0x74, 0x70, 0x5f, 0x75, 0x72, 0x69,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74,
-	0x74, 0x70, 0x55, 0x72, 0x69, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52,
-	0x07, 0x68, 0x74, 0x74, 0x70, 0x55, 0x72, 0x69, 0x12, 0x1f, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x32,
-	0x35, 0x36, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10,
-	0x01, 0x52, 0x06, 0x73, 0x68, 0x61, 0x32, 0x35, 0x36, 0x12, 0x44, 0x0a, 0x0c, 0x72, 0x65, 0x74,
-	0x72, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69,
-	0x63, 0x79, 0x52, 0x0b, 0x72, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x3a,
-	0x29, 0x9a, 0xc5, 0x88, 0x1e, 0x24, 0x0a, 0x22, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65,
-	0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x22, 0xc9, 0x01, 0x0a, 0x0f, 0x41,
-	0x73, 0x79, 0x6e, 0x63, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x38,
-	0x0a, 0x05, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x48,
-	0x00, 0x52, 0x05, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x12, 0x40, 0x0a, 0x06, 0x72, 0x65, 0x6d, 0x6f,
-	0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xd9, 0x03,
+	0x0a, 0x11, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x43, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65,
+	0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01,
+	0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x3f, 0x0a, 0x06, 0x61, 0x70, 0x70, 0x65,
+	0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x42, 0x0b, 0x92, 0xc7, 0x86, 0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18,
+	0x01, 0x52, 0x06, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x12, 0x69, 0x0a, 0x0d, 0x61, 0x70, 0x70,
+	0x65, 0x6e, 0x64, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e,
+	0x32, 0x3a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42,
+	0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x41, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x28, 0x0a, 0x10, 0x6b, 0x65, 0x65, 0x70, 0x5f, 0x65, 0x6d, 0x70,
+	0x74, 0x79, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e,
+	0x6b, 0x65, 0x65, 0x70, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x7d,
+	0x0a, 0x12, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x41, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1b, 0x0a, 0x17, 0x41, 0x50, 0x50, 0x45, 0x4e, 0x44, 0x5f, 0x49,
+	0x46, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x5f, 0x4f, 0x52, 0x5f, 0x41, 0x44, 0x44, 0x10,
+	0x00, 0x12, 0x11, 0x0a, 0x0d, 0x41, 0x44, 0x44, 0x5f, 0x49, 0x46, 0x5f, 0x41, 0x42, 0x53, 0x45,
+	0x4e, 0x54, 0x10, 0x01, 0x12, 0x1e, 0x0a, 0x1a, 0x4f, 0x56, 0x45, 0x52, 0x57, 0x52, 0x49, 0x54,
+	0x45, 0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x5f, 0x4f, 0x52, 0x5f, 0x41,
+	0x44, 0x44, 0x10, 0x02, 0x12, 0x17, 0x0a, 0x13, 0x4f, 0x56, 0x45, 0x52, 0x57, 0x52, 0x49, 0x54,
+	0x45, 0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x10, 0x03, 0x3a, 0x2a, 0x9a,
+	0xc5, 0x88, 0x1e, 0x25, 0x0a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x6c, 0x0a, 0x09, 0x48, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x12, 0x3b, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x68, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x73, 0x3a, 0x22, 0x9a, 0xc5, 0x88, 0x1e, 0x1d, 0x0a, 0x1b, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x4d, 0x61, 0x70, 0x22, 0x2f, 0x0a, 0x10, 0x57, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x64, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x1b, 0x0a, 0x04, 0x70,
+	0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02,
+	0x10, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x22, 0xc9, 0x02, 0x0a, 0x0a, 0x44, 0x61, 0x74,
+	0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x25, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02,
+	0x10, 0x01, 0x48, 0x00, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x23,
+	0x0a, 0x0c, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x0b, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x42, 0x79,
+	0x74, 0x65, 0x73, 0x12, 0x25, 0x0a, 0x0d, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x73, 0x74,
+	0x72, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0c, 0x69, 0x6e,
+	0x6c, 0x69, 0x6e, 0x65, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x3c, 0x0a, 0x14, 0x65, 0x6e,
+	0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62,
+	0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10,
+	0x01, 0x48, 0x00, 0x52, 0x13, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74,
+	0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x53, 0x0a, 0x11, 0x77, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x64, 0x5f, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x57, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x64, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x10, 0x77, 0x61, 0x74,
+	0x63, 0x68, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x3a, 0x23, 0x9a,
+	0xc5, 0x88, 0x1e, 0x1e, 0x0a, 0x1c, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x42, 0x10, 0x0a, 0x09, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12,
+	0x03, 0xf8, 0x42, 0x01, 0x22, 0xee, 0x05, 0x0a, 0x0b, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f,
+	0x6c, 0x69, 0x63, 0x79, 0x12, 0x4b, 0x0a, 0x0e, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x62, 0x61,
+	0x63, 0x6b, 0x5f, 0x6f, 0x66, 0x66, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x42, 0x61, 0x63, 0x6b, 0x6f, 0x66, 0x66, 0x53, 0x74, 0x72, 0x61, 0x74,
+	0x65, 0x67, 0x79, 0x52, 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x4f, 0x66,
+	0x66, 0x12, 0x52, 0x0a, 0x0b, 0x6e, 0x75, 0x6d, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x42, 0x13, 0xf2, 0x98, 0xfe, 0x8f, 0x05, 0x0d, 0x0a, 0x0b, 0x6d, 0x61,
+	0x78, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x52, 0x0a, 0x6e, 0x75, 0x6d, 0x52, 0x65,
+	0x74, 0x72, 0x69, 0x65, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x6f,
+	0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x65, 0x74, 0x72, 0x79, 0x4f, 0x6e,
+	0x12, 0x56, 0x0a, 0x0e, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69,
+	0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
 	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
+	0x52, 0x65, 0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, 0x72,
+	0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x52, 0x0d, 0x72, 0x65, 0x74, 0x72, 0x79,
+	0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x66, 0x0a, 0x14, 0x72, 0x65, 0x74, 0x72,
+	0x79, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65,
+	0x74, 0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x48,
+	0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x52, 0x12, 0x72, 0x65,
+	0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65,
+	0x12, 0x48, 0x0a, 0x21, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x61, 0x74, 0x74,
+	0x65, 0x6d, 0x70, 0x74, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x1d, 0x68, 0x6f, 0x73,
+	0x74, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x4d,
+	0x61, 0x78, 0x41, 0x74, 0x74, 0x65, 0x6d, 0x70, 0x74, 0x73, 0x1a, 0x76, 0x0a, 0x0d, 0x52, 0x65,
+	0x74, 0x72, 0x79, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x1b, 0x0a, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02,
+	0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x39, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65,
+	0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79,
+	0x70, 0x65, 0x1a, 0x7b, 0x0a, 0x12, 0x52, 0x65, 0x74, 0x72, 0x79, 0x48, 0x6f, 0x73, 0x74, 0x50,
+	0x72, 0x65, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x39, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e,
+	0x79, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x3a,
+	0x24, 0x9a, 0xc5, 0x88, 0x1e, 0x1f, 0x0a, 0x1d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x52, 0x65, 0x74, 0x72, 0x79, 0x50,
+	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x22, 0xe8, 0x01, 0x0a, 0x10, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65,
+	0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x42, 0x0a, 0x08, 0x68, 0x74,
+	0x74, 0x70, 0x5f, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x55, 0x72, 0x69, 0x42, 0x08, 0xfa, 0x42, 0x05,
+	0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x07, 0x68, 0x74, 0x74, 0x70, 0x55, 0x72, 0x69, 0x12, 0x1f,
+	0x0a, 0x06, 0x73, 0x68, 0x61, 0x32, 0x35, 0x36, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07,
+	0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x06, 0x73, 0x68, 0x61, 0x32, 0x35, 0x36, 0x12,
+	0x44, 0x0a, 0x0c, 0x72, 0x65, 0x74, 0x72, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x74,
+	0x72, 0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x0b, 0x72, 0x65, 0x74, 0x72, 0x79, 0x50,
+	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x3a, 0x29, 0x9a, 0xc5, 0x88, 0x1e, 0x24, 0x0a, 0x22, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
 	0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x48, 0x00, 0x52, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x3a, 0x28, 0x9a, 0xc5, 0x88, 0x1e,
-	0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x42, 0x10, 0x0a, 0x09, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65,
-	0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xb0, 0x01, 0x0a, 0x0f, 0x54, 0x72, 0x61, 0x6e, 0x73,
-	0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10,
-	0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x39, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64,
-	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e,
-	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
-	0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x3a, 0x28, 0x9a, 0xc5, 0x88, 0x1e, 0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x54, 0x72, 0x61,
-	0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x0d, 0x0a, 0x0b,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10,
-	0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xbf, 0x01, 0x0a, 0x18, 0x52, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50,
-	0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x12, 0x4f, 0x0a, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72,
-	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x42,
-	0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x64, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x75, 0x6e, 0x74, 0x69,
-	0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x75,
-	0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4b, 0x65, 0x79, 0x3a, 0x31, 0x9a, 0xc5, 0x88, 0x1e, 0x2c, 0x0a,
-	0x2a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x22, 0x55, 0x0a, 0x0c, 0x43,
-	0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x50, 0x6c, 0x61, 0x6e, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69,
-	0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x3a, 0x25, 0x9a, 0xc5, 0x88,
-	0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32,
-	0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x50, 0x6c, 0x61,
-	0x6e, 0x65, 0x2a, 0x28, 0x0a, 0x0f, 0x52, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x69,
-	0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54,
-	0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x49, 0x47, 0x48, 0x10, 0x01, 0x2a, 0x89, 0x01, 0x0a,
-	0x0d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x16,
-	0x0a, 0x12, 0x4d, 0x45, 0x54, 0x48, 0x4f, 0x44, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49,
-	0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x47, 0x45, 0x54, 0x10, 0x01, 0x12,
-	0x08, 0x0a, 0x04, 0x48, 0x45, 0x41, 0x44, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x50, 0x4f, 0x53,
-	0x54, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x50, 0x55, 0x54, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06,
-	0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x05, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x4f, 0x4e, 0x4e,
-	0x45, 0x43, 0x54, 0x10, 0x06, 0x12, 0x0b, 0x0a, 0x07, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x53,
-	0x10, 0x07, 0x12, 0x09, 0x0a, 0x05, 0x54, 0x52, 0x41, 0x43, 0x45, 0x10, 0x08, 0x12, 0x09, 0x0a,
-	0x05, 0x50, 0x41, 0x54, 0x43, 0x48, 0x10, 0x09, 0x2a, 0x3e, 0x0a, 0x10, 0x54, 0x72, 0x61, 0x66,
-	0x66, 0x69, 0x63, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0f, 0x0a, 0x0b,
-	0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a,
-	0x07, 0x49, 0x4e, 0x42, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x55,
-	0x54, 0x42, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x02, 0x42, 0x7d, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
-	0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
-	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x42, 0x61, 0x73, 0x65, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33,
-	0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x22, 0xc9, 0x01, 0x0a, 0x0f, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x12, 0x38, 0x0a, 0x05, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x48, 0x00, 0x52, 0x05, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x12, 0x40,
+	0x0a, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
+	0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x44, 0x61, 0x74, 0x61,
+	0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x48, 0x00, 0x52, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65,
+	0x3a, 0x28, 0x9a, 0xc5, 0x88, 0x1e, 0x23, 0x0a, 0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61,
+	0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x41, 0x73, 0x79, 0x6e, 0x63,
+	0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x10, 0x0a, 0x09, 0x73, 0x70,
+	0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xb0, 0x01, 0x0a,
+	0x0f, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74,
+	0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07,
+	0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x39, 0x0a,
+	0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x74, 0x79, 0x70,
+	0x65, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3a, 0x28, 0x9a, 0xc5, 0x88, 0x1e, 0x23, 0x0a,
+	0x21, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f,
+	0x72, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x63, 0x6b,
+	0x65, 0x74, 0x42, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70,
+	0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22,
+	0xbf, 0x01, 0x0a, 0x18, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x46, 0x72, 0x61, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x12, 0x4f, 0x0a, 0x0d,
+	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65,
+	0x72, 0x63, 0x65, 0x6e, 0x74, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52,
+	0x0c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a,
+	0x0b, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0a, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x4b, 0x65, 0x79, 0x3a, 0x31,
+	0x9a, 0xc5, 0x88, 0x1e, 0x2c, 0x0a, 0x2a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x61, 0x70, 0x69,
+	0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65,
+	0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e,
+	0x74, 0x22, 0x55, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x50, 0x6c, 0x61, 0x6e,
+	0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65,
+	0x72, 0x3a, 0x25, 0x9a, 0xc5, 0x88, 0x1e, 0x20, 0x0a, 0x1e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x76, 0x32, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x74,
+	0x72, 0x6f, 0x6c, 0x50, 0x6c, 0x61, 0x6e, 0x65, 0x2a, 0x28, 0x0a, 0x0f, 0x52, 0x6f, 0x75, 0x74,
+	0x69, 0x6e, 0x67, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x0b, 0x0a, 0x07, 0x44,
+	0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x49, 0x47, 0x48,
+	0x10, 0x01, 0x2a, 0x89, 0x01, 0x0a, 0x0d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x4d, 0x65,
+	0x74, 0x68, 0x6f, 0x64, 0x12, 0x16, 0x0a, 0x12, 0x4d, 0x45, 0x54, 0x48, 0x4f, 0x44, 0x5f, 0x55,
+	0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03,
+	0x47, 0x45, 0x54, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x45, 0x41, 0x44, 0x10, 0x02, 0x12,
+	0x08, 0x0a, 0x04, 0x50, 0x4f, 0x53, 0x54, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x50, 0x55, 0x54,
+	0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x05, 0x12, 0x0b,
+	0x0a, 0x07, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x10, 0x06, 0x12, 0x0b, 0x0a, 0x07, 0x4f,
+	0x50, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0x07, 0x12, 0x09, 0x0a, 0x05, 0x54, 0x52, 0x41, 0x43,
+	0x45, 0x10, 0x08, 0x12, 0x09, 0x0a, 0x05, 0x50, 0x41, 0x54, 0x43, 0x48, 0x10, 0x09, 0x2a, 0x3e,
+	0x0a, 0x10, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
+	0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x49, 0x4e, 0x42, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x01,
+	0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x55, 0x54, 0x42, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x02, 0x42, 0x7d,
+	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x22, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x42, 0x61,
+	0x73, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63,
+	0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x72, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/envoy/config/core/v3/base.pb.validate.go b/envoy/config/core/v3/base.pb.validate.go
old mode 100755
new mode 100644
index 3e4cec0c4b..a346981f42
--- a/envoy/config/core/v3/base.pb.validate.go
+++ b/envoy/config/core/v3/base.pb.validate.go
@@ -1001,7 +1001,16 @@ func (m *RuntimeUInt32) validate(all bool) error {
 
 	// no validation rules for DefaultValue
 
-	// no validation rules for RuntimeKey
+	if utf8.RuneCountInString(m.GetRuntimeKey()) < 1 {
+		err := RuntimeUInt32ValidationError{
+			field:  "RuntimeKey",
+			reason: "value length must be at least 1 runes",
+		}
+		if !all {
+			return err
+		}
+		errors = append(errors, err)
+	}
 
 	if len(errors) > 0 {
 		return RuntimeUInt32MultiError(errors)
@@ -1132,7 +1141,16 @@ func (m *RuntimePercent) validate(all bool) error {
 		}
 	}
 
-	// no validation rules for RuntimeKey
+	if utf8.RuneCountInString(m.GetRuntimeKey()) < 1 {
+		err := RuntimePercentValidationError{
+			field:  "RuntimeKey",
+			reason: "value length must be at least 1 runes",
+		}
+		if !all {
+			return err
+		}
+		errors = append(errors, err)
+	}
 
 	if len(errors) > 0 {
 		return RuntimePercentMultiError(errors)
@@ -1236,7 +1254,16 @@ func (m *RuntimeDouble) validate(all bool) error {
 
 	// no validation rules for DefaultValue
 
-	// no validation rules for RuntimeKey
+	if utf8.RuneCountInString(m.GetRuntimeKey()) < 1 {
+		err := RuntimeDoubleValidationError{
+			field:  "RuntimeKey",
+			reason: "value length must be at least 1 runes",
+		}
+		if !all {
+			return err
+		}
+		errors = append(errors, err)
+	}
 
 	if len(errors) > 0 {
 		return RuntimeDoubleMultiError(errors)
@@ -1378,7 +1405,16 @@ func (m *RuntimeFeatureFlag) validate(all bool) error {
 		}
 	}
 
-	// no validation rules for RuntimeKey
+	if utf8.RuneCountInString(m.GetRuntimeKey()) < 1 {
+		err := RuntimeFeatureFlagValidationError{
+			field:  "RuntimeKey",
+			reason: "value length must be at least 1 runes",
+		}
+		if !all {
+			return err
+		}
+		errors = append(errors, err)
+	}
 
 	if len(errors) > 0 {
 		return RuntimeFeatureFlagMultiError(errors)
diff --git a/envoy/config/core/v3/config_source.pb.validate.go b/envoy/config/core/v3/config_source.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/event_service_config.pb.validate.go b/envoy/config/core/v3/event_service_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/extension.pb.validate.go b/envoy/config/core/v3/extension.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/grpc_method_list.pb.validate.go b/envoy/config/core/v3/grpc_method_list.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/grpc_service.pb.validate.go b/envoy/config/core/v3/grpc_service.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/health_check.pb.validate.go b/envoy/config/core/v3/health_check.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/http_service.pb.validate.go b/envoy/config/core/v3/http_service.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/http_uri.pb.validate.go b/envoy/config/core/v3/http_uri.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/protocol.pb.go b/envoy/config/core/v3/protocol.pb.go
index 1d0d5f44fa..8a2e6d16b8 100755
--- a/envoy/config/core/v3/protocol.pb.go
+++ b/envoy/config/core/v3/protocol.pb.go
@@ -211,11 +211,8 @@ type QuicProtocolOptions struct {
 	// <https://tools.ietf.org/html/draft-ietf-quic-transport-34#section-4.1>`_ size. Valid values range from
 	// 1 to 16777216 (2^24, maximum supported by QUICHE) and defaults to 16777216 (16 * 1024 * 1024).
 	//
-	// .. note::
-	//
-	//	16384 (2^14) is the minimum window size supported in Google QUIC. If configured smaller than it, we will use
-	//	16384 instead. QUICHE IETF Quic implementation supports 1 bytes window. We only support increasing the default
-	//	window size now, so it's also the minimum.
+	// NOTE: 16384 (2^14) is the minimum window size supported in Google QUIC. If configured smaller than it, we will use 16384 instead.
+	// QUICHE IETF Quic implementation supports 1 bytes window. We only support increasing the default window size now, so it's also the minimum.
 	//
 	// This field also acts as a soft limit on the number of bytes Envoy will buffer per-stream in the
 	// QUIC stream send and receive buffers. Once the buffer reaches this pointer, watermark callbacks will fire to
@@ -225,10 +222,8 @@ type QuicProtocolOptions struct {
 	// flow-control. Valid values rage from 1 to 25165824 (24MB, maximum supported by QUICHE) and defaults
 	// to 25165824 (24 * 1024 * 1024).
 	//
-	// .. note::
-	//
-	//	16384 (2^14) is the minimum window size supported in Google QUIC. We only support increasing the default
-	//	window size now, so it's also the minimum.
+	// NOTE: 16384 (2^14) is the minimum window size supported in Google QUIC. We only support increasing the default
+	// window size now, so it's also the minimum.
 	InitialConnectionWindowSize *wrapperspb.UInt32Value `protobuf:"bytes,3,opt,name=initial_connection_window_size,json=initialConnectionWindowSize,proto3" json:"initial_connection_window_size,omitempty"`
 	// The number of timeouts that can occur before port migration is triggered for QUIC clients.
 	// This defaults to 4. If set to 0, port migration will not occur on path degrading.
@@ -595,27 +590,19 @@ type HttpProtocolOptions struct {
 	// :ref:`HTTP Connection Manager
 	// <envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.common_http_protocol_options>`.
 	//
-	// .. note::
-	//
-	//	Currently some protocol codecs impose limits on the maximum size of a single header.
+	// Note: currently some protocol codecs impose limits on the maximum size of a single header:
 	//
-	//	* HTTP/2 (when using nghttp2) limits a single header to around 100kb.
-	//	* HTTP/3 limits a single header to around 1024kb.
+	//	HTTP/2 (when using nghttp2) limits a single header to around 100kb.
+	//	HTTP/3 limits a single header to around 1024kb.
 	MaxResponseHeadersKb *wrapperspb.UInt32Value `protobuf:"bytes,7,opt,name=max_response_headers_kb,json=maxResponseHeadersKb,proto3" json:"max_response_headers_kb,omitempty"`
 	// Total duration to keep alive an HTTP request/response stream. If the time limit is reached the stream will be
 	// reset independent of any other timeouts. If not specified, this value is not set.
 	MaxStreamDuration *durationpb.Duration `protobuf:"bytes,4,opt,name=max_stream_duration,json=maxStreamDuration,proto3" json:"max_stream_duration,omitempty"`
 	// Action to take when a client request with a header name containing underscore characters is received.
 	// If this setting is not specified, the value defaults to ALLOW.
-	//
-	// .. note::
-	//
-	//	Upstream responses are not affected by this setting.
-	//
-	// .. 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.
+	// Note: upstream responses are not affected by this setting.
+	// 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.
 	HeadersWithUnderscoresAction HttpProtocolOptions_HeadersWithUnderscoresAction `protobuf:"varint,5,opt,name=headers_with_underscores_action,json=headersWithUnderscoresAction,proto3,enum=envoy.config.core.v3.HttpProtocolOptions_HeadersWithUnderscoresAction" json:"headers_with_underscores_action,omitempty"`
 	// Optional maximum requests for both upstream and downstream connections.
 	// If not specified, there is no limit.
@@ -1016,10 +1003,8 @@ type Http2ProtocolOptions struct {
 	// (2^16 - 1, HTTP/2 default) to 2147483647 (2^31 - 1, HTTP/2 maximum) and defaults to 268435456
 	// (256 * 1024 * 1024).
 	//
-	// .. note::
-	//
-	//	65535 is the initial window size from HTTP/2 spec. We only support increasing the default window size now,
-	//	so it's also the minimum.
+	// NOTE: 65535 is the initial window size from HTTP/2 spec. We only support increasing the default
+	// window size now, so it's also the minimum.
 	//
 	// This field also acts as a soft limit on the number of bytes Envoy will buffer per-stream in the
 	// HTTP/2 codec buffers. Once the buffer reaches this pointer, watermark callbacks will fire to
diff --git a/envoy/config/core/v3/protocol.pb.validate.go b/envoy/config/core/v3/protocol.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/proxy_protocol.pb.validate.go b/envoy/config/core/v3/proxy_protocol.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/resolver.pb.validate.go b/envoy/config/core/v3/resolver.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/socket_cmsg_headers.pb.validate.go b/envoy/config/core/v3/socket_cmsg_headers.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/socket_option.pb.validate.go b/envoy/config/core/v3/socket_option.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/substitution_format_string.pb.validate.go b/envoy/config/core/v3/substitution_format_string.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/core/v3/udp_socket_config.pb.validate.go b/envoy/config/core/v3/udp_socket_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/endpoint/v3/endpoint.pb.validate.go b/envoy/config/endpoint/v3/endpoint.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/endpoint/v3/endpoint_components.pb.validate.go b/envoy/config/endpoint/v3/endpoint_components.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/endpoint/v3/load_report.pb.validate.go b/envoy/config/endpoint/v3/load_report.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/accesslog/v2/accesslog.pb.validate.go b/envoy/config/filter/accesslog/v2/accesslog.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/dubbo/router/v2alpha1/router.pb.validate.go b/envoy/config/filter/dubbo/router/v2alpha1/router.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/fault/v2/fault.pb.validate.go b/envoy/config/filter/fault/v2/fault.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.pb.validate.go b/envoy/config/filter/http/adaptive_concurrency/v2alpha/adaptive_concurrency.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/aws_lambda/v2alpha/aws_lambda.pb.validate.go b/envoy/config/filter/http/aws_lambda/v2alpha/aws_lambda.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/aws_request_signing/v2alpha/aws_request_signing.pb.validate.go b/envoy/config/filter/http/aws_request_signing/v2alpha/aws_request_signing.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/buffer/v2/buffer.pb.validate.go b/envoy/config/filter/http/buffer/v2/buffer.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/cache/v2alpha/cache.pb.validate.go b/envoy/config/filter/http/cache/v2alpha/cache.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/compressor/v2/compressor.pb.validate.go b/envoy/config/filter/http/compressor/v2/compressor.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/cors/v2/cors.pb.validate.go b/envoy/config/filter/http/cors/v2/cors.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/csrf/v2/csrf.pb.validate.go b/envoy/config/filter/http/csrf/v2/csrf.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.pb.validate.go b/envoy/config/filter/http/dynamic_forward_proxy/v2alpha/dynamic_forward_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/dynamo/v2/dynamo.pb.validate.go b/envoy/config/filter/http/dynamo/v2/dynamo.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/ext_authz/v2/ext_authz.pb.validate.go b/envoy/config/filter/http/ext_authz/v2/ext_authz.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/fault/v2/fault.pb.validate.go b/envoy/config/filter/http/fault/v2/fault.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/grpc_http1_bridge/v2/config.pb.validate.go b/envoy/config/filter/http/grpc_http1_bridge/v2/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.pb.validate.go b/envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/grpc_stats/v2alpha/config.pb.validate.go b/envoy/config/filter/http/grpc_stats/v2alpha/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/grpc_web/v2/grpc_web.pb.validate.go b/envoy/config/filter/http/grpc_web/v2/grpc_web.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/gzip/v2/gzip.pb.validate.go b/envoy/config/filter/http/gzip/v2/gzip.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.pb.validate.go b/envoy/config/filter/http/header_to_metadata/v2/header_to_metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/health_check/v2/health_check.pb.validate.go b/envoy/config/filter/http/health_check/v2/health_check.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/ip_tagging/v2/ip_tagging.pb.validate.go b/envoy/config/filter/http/ip_tagging/v2/ip_tagging.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.validate.go b/envoy/config/filter/http/jwt_authn/v2alpha/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/lua/v2/lua.pb.validate.go b/envoy/config/filter/http/lua/v2/lua.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/on_demand/v2/on_demand.pb.validate.go b/envoy/config/filter/http/on_demand/v2/on_demand.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/original_src/v2alpha1/original_src.pb.validate.go b/envoy/config/filter/http/original_src/v2alpha1/original_src.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/rate_limit/v2/rate_limit.pb.validate.go b/envoy/config/filter/http/rate_limit/v2/rate_limit.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/rbac/v2/rbac.pb.validate.go b/envoy/config/filter/http/rbac/v2/rbac.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/router/v2/router.pb.validate.go b/envoy/config/filter/http/router/v2/router.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/squash/v2/squash.pb.validate.go b/envoy/config/filter/http/squash/v2/squash.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/tap/v2alpha/tap.pb.validate.go b/envoy/config/filter/http/tap/v2alpha/tap.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/http/transcoder/v2/transcoder.pb.validate.go b/envoy/config/filter/http/transcoder/v2/transcoder.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/listener/http_inspector/v2/http_inspector.pb.validate.go b/envoy/config/filter/listener/http_inspector/v2/http_inspector.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/listener/original_dst/v2/original_dst.pb.validate.go b/envoy/config/filter/listener/original_dst/v2/original_dst.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/listener/original_src/v2alpha1/original_src.pb.validate.go b/envoy/config/filter/listener/original_src/v2alpha1/original_src.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/listener/proxy_protocol/v2/proxy_protocol.pb.validate.go b/envoy/config/filter/listener/proxy_protocol/v2/proxy_protocol.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/listener/tls_inspector/v2/tls_inspector.pb.validate.go b/envoy/config/filter/listener/tls_inspector/v2/tls_inspector.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.validate.go b/envoy/config/filter/network/client_ssl_auth/v2/client_ssl_auth.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/direct_response/v2/config.pb.validate.go b/envoy/config/filter/network/direct_response/v2/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.pb.validate.go b/envoy/config/filter/network/dubbo_proxy/v2alpha1/dubbo_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.pb.validate.go b/envoy/config/filter/network/dubbo_proxy/v2alpha1/route.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/echo/v2/echo.pb.validate.go b/envoy/config/filter/network/echo/v2/echo.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/ext_authz/v2/ext_authz.pb.validate.go b/envoy/config/filter/network/ext_authz/v2/ext_authz.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.go b/envoy/config/filter/network/http_connection_manager/v2/http_connection_manager.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/kafka_broker/v2alpha1/kafka_broker.pb.validate.go b/envoy/config/filter/network/kafka_broker/v2alpha1/kafka_broker.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/local_rate_limit/v2alpha/local_rate_limit.pb.validate.go b/envoy/config/filter/network/local_rate_limit/v2alpha/local_rate_limit.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.validate.go b/envoy/config/filter/network/mongo_proxy/v2/mongo_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.pb.validate.go b/envoy/config/filter/network/mysql_proxy/v1alpha1/mysql_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/rate_limit/v2/rate_limit.pb.validate.go b/envoy/config/filter/network/rate_limit/v2/rate_limit.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/rbac/v2/rbac.pb.validate.go b/envoy/config/filter/network/rbac/v2/rbac.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.go b/envoy/config/filter/network/redis_proxy/v2/redis_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/sni_cluster/v2/sni_cluster.pb.validate.go b/envoy/config/filter/network/sni_cluster/v2/sni_cluster.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.go b/envoy/config/filter/network/tcp_proxy/v2/tcp_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.validate.go b/envoy/config/filter/network/thrift_proxy/v2alpha1/route.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.validate.go b/envoy/config/filter/network/thrift_proxy/v2alpha1/thrift_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.pb.validate.go b/envoy/config/filter/network/zookeeper_proxy/v1alpha1/zookeeper_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.pb.validate.go b/envoy/config/filter/thrift/rate_limit/v2alpha1/rate_limit.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/thrift/router/v2alpha1/router.pb.validate.go b/envoy/config/filter/thrift/router/v2alpha1/router.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/filter/udp/udp_proxy/v2alpha/udp_proxy.pb.validate.go b/envoy/config/filter/udp/udp_proxy/v2alpha/udp_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/grpc_credential/v2alpha/aws_iam.pb.validate.go b/envoy/config/grpc_credential/v2alpha/aws_iam.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.validate.go b/envoy/config/grpc_credential/v2alpha/file_based_metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/grpc_credential/v3/file_based_metadata.pb.validate.go b/envoy/config/grpc_credential/v3/file_based_metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/health_checker/redis/v2/redis.pb.validate.go b/envoy/config/health_checker/redis/v2/redis.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/listener/v2/api_listener.pb.validate.go b/envoy/config/listener/v2/api_listener.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/listener/v3/api_listener.pb.validate.go b/envoy/config/listener/v3/api_listener.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/listener/v3/listener.pb.validate.go b/envoy/config/listener/v3/listener.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/listener/v3/listener_components.pb.validate.go b/envoy/config/listener/v3/listener_components.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/listener/v3/quic_config.pb.validate.go b/envoy/config/listener/v3/quic_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/listener/v3/udp_listener_config.pb.validate.go b/envoy/config/listener/v3/udp_listener_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/metrics/v2/metrics_service.pb.validate.go b/envoy/config/metrics/v2/metrics_service.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/metrics/v2/stats.pb.validate.go b/envoy/config/metrics/v2/stats.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/metrics/v3/metrics_service.pb.validate.go b/envoy/config/metrics/v3/metrics_service.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/metrics/v3/stats.pb.validate.go b/envoy/config/metrics/v3/stats.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/overload/v2alpha/overload.pb.validate.go b/envoy/config/overload/v2alpha/overload.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/overload/v3/overload.pb.validate.go b/envoy/config/overload/v3/overload.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/ratelimit/v2/rls.pb.validate.go b/envoy/config/ratelimit/v2/rls.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/ratelimit/v3/rls.pb.validate.go b/envoy/config/ratelimit/v3/rls.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/rbac/v2/rbac.pb.validate.go b/envoy/config/rbac/v2/rbac.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/rbac/v3/rbac.pb.go b/envoy/config/rbac/v3/rbac.pb.go
index e55f8cc739..6967bb9781 100755
--- a/envoy/config/rbac/v3/rbac.pb.go
+++ b/envoy/config/rbac/v3/rbac.pb.go
@@ -670,13 +670,10 @@ type Permission_Any struct {
 }
 
 type Permission_Header struct {
-	// A header (or pseudo-header such as “:path“ or “:method“) on the incoming HTTP request. Only available
-	// for HTTP request.
-	//
-	// .. note::
-	//
-	//	The pseudo-header ``:path`` includes the query and fragment string. Use the ``url_path`` field if you
-	//	want to match the URL path without the query and fragment string.
+	// A header (or pseudo-header such as :path or :method) on the incoming HTTP request. Only
+	// available for HTTP request.
+	// Note: the pseudo-header :path includes the query and fragment string. Use the “url_path“
+	// field if you want to match the URL path without the query and fragment string.
 	Header *v31.HeaderMatcher `protobuf:"bytes,4,opt,name=header,proto3,oneof"`
 }
 
@@ -716,7 +713,8 @@ type Permission_NotRule struct {
 }
 
 type Permission_RequestedServerName struct {
-	// The request server from the client's connection request. This is typically TLS SNI.
+	// The request server from the client's connection request. This is
+	// typically TLS SNI.
 	//
 	// .. attention::
 	//
@@ -733,7 +731,8 @@ type Permission_RequestedServerName struct {
 	//	* A :ref:`listener filter <arch_overview_listener_filters>` may
 	//	  overwrite a connection's requested server name within Envoy.
 	//
-	// Please refer to :ref:`this FAQ entry <faq_how_to_setup_sni>` to learn how to setup SNI.
+	// Please refer to :ref:`this FAQ entry <faq_how_to_setup_sni>` to learn to
+	// setup SNI.
 	RequestedServerName *v3.StringMatcher `protobuf:"bytes,9,opt,name=requested_server_name,json=requestedServerName,proto3,oneof"`
 }
 
@@ -954,12 +953,14 @@ type isPrincipal_Identifier interface {
 }
 
 type Principal_AndIds struct {
-	// A set of identifiers that all must match in order to define the downstream.
+	// A set of identifiers that all must match in order to define the
+	// downstream.
 	AndIds *Principal_Set `protobuf:"bytes,1,opt,name=and_ids,json=andIds,proto3,oneof"`
 }
 
 type Principal_OrIds struct {
-	// A set of identifiers at least one must match in order to define the downstream.
+	// A set of identifiers at least one must match in order to define the
+	// downstream.
 	OrIds *Principal_Set `protobuf:"bytes,2,opt,name=or_ids,json=orIds,proto3,oneof"`
 }
 
@@ -992,34 +993,28 @@ type Principal_SourceIp struct {
 
 type Principal_DirectRemoteIp struct {
 	// A CIDR block that describes the downstream remote/origin address.
-	//
-	// .. note::
-	//
-	//	This is always the physical peer even if the
-	//	:ref:`remote_ip <envoy_v3_api_field_config.rbac.v3.Principal.remote_ip>` is inferred from the
-	//	x-forwarder-for header, the proxy protocol, etc.
+	// Note: This is always the physical peer even if the
+	// :ref:`remote_ip <envoy_v3_api_field_config.rbac.v3.Principal.remote_ip>` is
+	// inferred from for example the x-forwarder-for header, proxy protocol,
+	// etc.
 	DirectRemoteIp *v32.CidrRange `protobuf:"bytes,10,opt,name=direct_remote_ip,json=directRemoteIp,proto3,oneof"`
 }
 
 type Principal_RemoteIp struct {
 	// A CIDR block that describes the downstream remote/origin address.
-	//
-	// .. note::
-	//
-	//	This may not be the physical peer and could be different from the :ref:`direct_remote_ip
-	//	<envoy_v3_api_field_config.rbac.v3.Principal.direct_remote_ip>`. E.g, if the remote ip is inferred from
-	//	the x-forwarder-for header, the proxy protocol, etc.
+	// Note: This may not be the physical peer and could be different from the
+	// :ref:`direct_remote_ip
+	// <envoy_v3_api_field_config.rbac.v3.Principal.direct_remote_ip>`. E.g, if the
+	// remote ip is inferred from for example the x-forwarder-for header, proxy
+	// protocol, etc.
 	RemoteIp *v32.CidrRange `protobuf:"bytes,11,opt,name=remote_ip,json=remoteIp,proto3,oneof"`
 }
 
 type Principal_Header struct {
-	// A header (or pseudo-header such as “:path“ or “:method“) on the incoming HTTP request. Only available
-	// for HTTP request.
-	//
-	// .. note::
-	//
-	//	The pseudo-header ``:path`` includes the query and fragment string. Use the ``url_path`` field if you
-	//	want to match the URL path without the query and fragment string.
+	// A header (or pseudo-header such as :path or :method) on the incoming HTTP
+	// request. Only available for HTTP request. Note: the pseudo-header :path
+	// includes the query and fragment string. Use the “url_path“ field if you
+	// want to match the URL path without the query and fragment string.
 	Header *v31.HeaderMatcher `protobuf:"bytes,6,opt,name=header,proto3,oneof"`
 }
 
@@ -1099,7 +1094,7 @@ type Action struct {
 	// The action to take if the matcher matches. Every action either allows or denies a request,
 	// and can also carry out action-specific operations.
 	//
-	// **Actions:**
+	// Actions:
 	//
 	//   - “ALLOW“: If the request gets matched on ALLOW, it is permitted.
 	//   - “DENY“: If the request gets matched on DENY, it is not permitted.
@@ -1108,7 +1103,7 @@ type Action struct {
 	//     “envoy.common“ will be set to the value “true“.
 	//   - If the request cannot get matched, it will fallback to “DENY“.
 	//
-	// **Log behavior:**
+	// Log behavior:
 	//
 	//	If the RBAC matcher contains at least one LOG action, the dynamic
 	//	metadata key ``access_log_hint`` will be set based on if the request
diff --git a/envoy/config/rbac/v3/rbac.pb.validate.go b/envoy/config/rbac/v3/rbac.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.pb.validate.go b/envoy/config/resource_monitor/fixed_heap/v2alpha/fixed_heap.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.pb.validate.go b/envoy/config/resource_monitor/injected_resource/v2alpha/injected_resource.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/retry/omit_canary_hosts/v2/omit_canary_hosts.pb.validate.go b/envoy/config/retry/omit_canary_hosts/v2/omit_canary_hosts.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/retry/omit_host_metadata/v2/omit_host_metadata_config.pb.validate.go b/envoy/config/retry/omit_host_metadata/v2/omit_host_metadata_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/retry/previous_hosts/v2/previous_hosts.pb.validate.go b/envoy/config/retry/previous_hosts/v2/previous_hosts.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/retry/previous_priorities/previous_priorities_config.pb.validate.go b/envoy/config/retry/previous_priorities/previous_priorities_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/route/v3/route.pb.validate.go b/envoy/config/route/v3/route.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/route/v3/route_components.pb.go b/envoy/config/route/v3/route_components.pb.go
index 08e3270ec0..bdc2c18745 100755
--- a/envoy/config/route/v3/route_components.pb.go
+++ b/envoy/config/route/v3/route_components.pb.go
@@ -1795,18 +1795,6 @@ type RouteAction struct {
 	RegexRewrite *v32.RegexMatchAndSubstitute `protobuf:"bytes,32,opt,name=regex_rewrite,json=regexRewrite,proto3" json:"regex_rewrite,omitempty"`
 	// [#extension-category: envoy.path.rewrite]
 	PathRewritePolicy *v31.TypedExtensionConfig `protobuf:"bytes,41,opt,name=path_rewrite_policy,json=pathRewritePolicy,proto3" json:"path_rewrite_policy,omitempty"`
-	// If one of the host rewrite specifiers is set and the
-	// :ref:`suppress_envoy_headers
-	// <envoy_v3_api_field_extensions.filters.http.router.v3.Router.suppress_envoy_headers>` flag is not
-	// set to true, the router filter will place the original host header value before
-	// rewriting into the :ref:`x-envoy-original-host
-	// <config_http_filters_router_x-envoy-original-host>` header.
-	//
-	// And if the
-	// :ref:`append_x_forwarded_host <envoy_v3_api_field_config.route.v3.RouteAction.append_x_forwarded_host>`
-	// is set to true, the original host value will also be appended to the
-	// :ref:`config_http_conn_man_headers_x-forwarded-host` header.
-	//
 	// Types that are assignable to HostRewriteSpecifier:
 	//
 	//	*RouteAction_HostRewriteLiteral
@@ -2338,7 +2326,10 @@ type isRouteAction_HostRewriteSpecifier interface {
 
 type RouteAction_HostRewriteLiteral struct {
 	// Indicates that during forwarding, the host header will be swapped with
-	// this value.
+	// this value. Using this option will append the
+	// :ref:`config_http_conn_man_headers_x-forwarded-host` header if
+	// :ref:`append_x_forwarded_host <envoy_v3_api_field_config.route.v3.RouteAction.append_x_forwarded_host>`
+	// is set.
 	HostRewriteLiteral string `protobuf:"bytes,6,opt,name=host_rewrite_literal,json=hostRewriteLiteral,proto3,oneof"`
 }
 
@@ -2349,14 +2340,20 @@ type RouteAction_AutoHostRewrite struct {
 	// type “strict_dns“ or “logical_dns“,
 	// or when :ref:`hostname <envoy_v3_api_field_config.endpoint.v3.Endpoint.hostname>`
 	// field is not empty. Setting this to true with other cluster types
-	// has no effect.
+	// has no effect. Using this option will append the
+	// :ref:`config_http_conn_man_headers_x-forwarded-host` header if
+	// :ref:`append_x_forwarded_host <envoy_v3_api_field_config.route.v3.RouteAction.append_x_forwarded_host>`
+	// is set.
 	AutoHostRewrite *wrapperspb.BoolValue `protobuf:"bytes,7,opt,name=auto_host_rewrite,json=autoHostRewrite,proto3,oneof"`
 }
 
 type RouteAction_HostRewriteHeader struct {
 	// Indicates that during forwarding, the host header will be swapped with the content of given
 	// downstream or :ref:`custom <config_http_conn_man_headers_custom_request_headers>` header.
-	// If header value is empty, host header is left intact.
+	// If header value is empty, host header is left intact. Using this option will append the
+	// :ref:`config_http_conn_man_headers_x-forwarded-host` header if
+	// :ref:`append_x_forwarded_host <envoy_v3_api_field_config.route.v3.RouteAction.append_x_forwarded_host>`
+	// is set.
 	//
 	// .. attention::
 	//
@@ -2373,6 +2370,10 @@ type RouteAction_HostRewritePathRegex struct {
 	// Indicates that during forwarding, the host header will be swapped with
 	// the result of the regex substitution executed on path value with query and fragment removed.
 	// This is useful for transitioning variable content between path segment and subdomain.
+	// Using this option will append the
+	// :ref:`config_http_conn_man_headers_x-forwarded-host` header if
+	// :ref:`append_x_forwarded_host <envoy_v3_api_field_config.route.v3.RouteAction.append_x_forwarded_host>`
+	// is set.
 	//
 	// For example with the following config:
 	//
diff --git a/envoy/config/route/v3/route_components.pb.validate.go b/envoy/config/route/v3/route_components.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/route/v3/scoped_route.pb.validate.go b/envoy/config/route/v3/scoped_route.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/tap/v3/common.pb.validate.go b/envoy/config/tap/v3/common.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v2/datadog.pb.validate.go b/envoy/config/trace/v2/datadog.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v2/dynamic_ot.pb.validate.go b/envoy/config/trace/v2/dynamic_ot.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v2/http_tracer.pb.validate.go b/envoy/config/trace/v2/http_tracer.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v2/lightstep.pb.validate.go b/envoy/config/trace/v2/lightstep.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v2/service.pb.validate.go b/envoy/config/trace/v2/service.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v2/trace.pb.validate.go b/envoy/config/trace/v2/trace.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v2/zipkin.pb.validate.go b/envoy/config/trace/v2/zipkin.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v2alpha/xray.pb.validate.go b/envoy/config/trace/v2alpha/xray.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v3/datadog.pb.validate.go b/envoy/config/trace/v3/datadog.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v3/dynamic_ot.pb.validate.go b/envoy/config/trace/v3/dynamic_ot.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v3/http_tracer.pb.validate.go b/envoy/config/trace/v3/http_tracer.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v3/lightstep.pb.validate.go b/envoy/config/trace/v3/lightstep.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v3/opentelemetry.pb.validate.go b/envoy/config/trace/v3/opentelemetry.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v3/service.pb.validate.go b/envoy/config/trace/v3/service.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v3/skywalking.pb.validate.go b/envoy/config/trace/v3/skywalking.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v3/trace.pb.validate.go b/envoy/config/trace/v3/trace.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v3/xray.pb.validate.go b/envoy/config/trace/v3/xray.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/trace/v3/zipkin.pb.validate.go b/envoy/config/trace/v3/zipkin.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/transport_socket/alts/v2alpha/alts.pb.validate.go b/envoy/config/transport_socket/alts/v2alpha/alts.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/transport_socket/raw_buffer/v2/raw_buffer.pb.validate.go b/envoy/config/transport_socket/raw_buffer/v2/raw_buffer.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/transport_socket/tap/v2alpha/tap.pb.validate.go b/envoy/config/transport_socket/tap/v2alpha/tap.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/config/upstream/local_address_selector/v3/default_local_address_selector.pb.validate.go b/envoy/config/upstream/local_address_selector/v3/default_local_address_selector.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/accesslog/v2/accesslog.pb.validate.go b/envoy/data/accesslog/v2/accesslog.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/accesslog/v3/accesslog.pb.validate.go b/envoy/data/accesslog/v3/accesslog.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/cluster/v2alpha/outlier_detection_event.pb.validate.go b/envoy/data/cluster/v2alpha/outlier_detection_event.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/cluster/v3/outlier_detection_event.pb.validate.go b/envoy/data/cluster/v3/outlier_detection_event.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/core/v2alpha/health_check_event.pb.validate.go b/envoy/data/core/v2alpha/health_check_event.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/core/v3/health_check_event.pb.validate.go b/envoy/data/core/v3/health_check_event.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/core/v3/tlv_metadata.pb.validate.go b/envoy/data/core/v3/tlv_metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/dns/v2alpha/dns_table.pb.validate.go b/envoy/data/dns/v2alpha/dns_table.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/dns/v3/dns_table.pb.validate.go b/envoy/data/dns/v3/dns_table.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/tap/v2alpha/common.pb.validate.go b/envoy/data/tap/v2alpha/common.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/tap/v2alpha/http.pb.validate.go b/envoy/data/tap/v2alpha/http.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/tap/v2alpha/transport.pb.validate.go b/envoy/data/tap/v2alpha/transport.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/tap/v2alpha/wrapper.pb.validate.go b/envoy/data/tap/v2alpha/wrapper.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/tap/v3/common.pb.validate.go b/envoy/data/tap/v3/common.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/tap/v3/http.pb.validate.go b/envoy/data/tap/v3/http.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/tap/v3/transport.pb.validate.go b/envoy/data/tap/v3/transport.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/data/tap/v3/wrapper.pb.validate.go b/envoy/data/tap/v3/wrapper.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/access_loggers/file/v3/file.pb.validate.go b/envoy/extensions/access_loggers/file/v3/file.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/access_loggers/filters/cel/v3/cel.pb.validate.go b/envoy/extensions/access_loggers/filters/cel/v3/cel.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/access_loggers/fluentd/v3/fluentd.pb.validate.go b/envoy/extensions/access_loggers/fluentd/v3/fluentd.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/access_loggers/grpc/v3/als.pb.validate.go b/envoy/extensions/access_loggers/grpc/v3/als.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/access_loggers/open_telemetry/v3/logs_service.pb.validate.go b/envoy/extensions/access_loggers/open_telemetry/v3/logs_service.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/access_loggers/stream/v3/stream.pb.validate.go b/envoy/extensions/access_loggers/stream/v3/stream.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/access_loggers/wasm/v3/wasm.pb.validate.go b/envoy/extensions/access_loggers/wasm/v3/wasm.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/bootstrap/internal_listener/v3/internal_listener.pb.validate.go b/envoy/extensions/bootstrap/internal_listener/v3/internal_listener.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/clusters/aggregate/v3/cluster.pb.go b/envoy/extensions/clusters/aggregate/v3/cluster.pb.go
index 85fc171e9a..cb9cda6bad 100755
--- a/envoy/extensions/clusters/aggregate/v3/cluster.pb.go
+++ b/envoy/extensions/clusters/aggregate/v3/cluster.pb.go
@@ -8,7 +8,6 @@ package aggregatev3
 
 import (
 	_ "github.com/cncf/xds/go/udpa/annotations"
-	v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
@@ -75,70 +74,6 @@ func (x *ClusterConfig) GetClusters() []string {
 	return nil
 }
 
-// Configures an aggregate cluster whose
-// :ref:`ClusterConfig <envoy_v3_api_msg_extensions.clusters.aggregate.v3.ClusterConfig>`
-// is to be fetched from a separate xDS resource.
-// [#extension: envoy.clusters.aggregate_resource]
-// [#not-implemented-hide:]
-type AggregateClusterResource struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Configuration source specifier for the ClusterConfig resource.
-	// Only the aggregated protocol variants are supported; if configured
-	// otherwise, the cluster resource will be NACKed.
-	ConfigSource *v3.ConfigSource `protobuf:"bytes,1,opt,name=config_source,json=configSource,proto3" json:"config_source,omitempty"`
-	// The name of the ClusterConfig resource to subscribe to.
-	ResourceName string `protobuf:"bytes,2,opt,name=resource_name,json=resourceName,proto3" json:"resource_name,omitempty"`
-}
-
-func (x *AggregateClusterResource) Reset() {
-	*x = AggregateClusterResource{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_clusters_aggregate_v3_cluster_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *AggregateClusterResource) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*AggregateClusterResource) ProtoMessage() {}
-
-func (x *AggregateClusterResource) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_clusters_aggregate_v3_cluster_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use AggregateClusterResource.ProtoReflect.Descriptor instead.
-func (*AggregateClusterResource) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_clusters_aggregate_v3_cluster_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *AggregateClusterResource) GetConfigSource() *v3.ConfigSource {
-	if x != nil {
-		return x.ConfigSource
-	}
-	return nil
-}
-
-func (x *AggregateClusterResource) GetResourceName() string {
-	if x != nil {
-		return x.ResourceName
-	}
-	return ""
-}
-
 var File_envoy_extensions_clusters_aggregate_v3_cluster_proto protoreflect.FileDescriptor
 
 var file_envoy_extensions_clusters_aggregate_v3_cluster_proto_rawDesc = []byte{
@@ -147,44 +82,32 @@ var file_envoy_extensions_clusters_aggregate_v3_cluster_proto_rawDesc = []byte{
 	0x65, 0x67, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x26, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
 	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x73, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x1a, 0x28,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72,
-	0x65, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61,
-	0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e,
-	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f,
-	0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69,
-	0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x22, 0x72, 0x0a, 0x0d, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0x24, 0x0a, 0x08, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01,
-	0x52, 0x08, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x3a, 0x3b, 0x9a, 0xc5, 0x88, 0x1e,
-	0x36, 0x0a, 0x34, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74,
-	0x65, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x9b, 0x01, 0x0a, 0x18, 0x41, 0x67, 0x67, 0x72,
-	0x65, 0x67, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x12, 0x51, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
-	0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42,
-	0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x2c, 0x0a, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07,
-	0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0xa9, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
-	0x0a, 0x34, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
-	0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
-	0x61, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x59, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
-	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
-	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61,
-	0x74, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x76,
-	0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x1a, 0x1d,
+	0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x75,
+	0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
+	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64,
+	0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x72, 0x0a, 0x0d, 0x43, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x24, 0x0a, 0x08, 0x63, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42,
+	0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x08, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73,
+	0x3a, 0x3b, 0x9a, 0xc5, 0x88, 0x1e, 0x36, 0x0a, 0x34, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x61, 0x67,
+	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x2e, 0x76, 0x32, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x2e,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xa9, 0x01,
+	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x34, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x73, 0x2e, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x42, 0x0c,
+	0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x59,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73,
+	0x2f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x67,
+	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -199,19 +122,16 @@ func file_envoy_extensions_clusters_aggregate_v3_cluster_proto_rawDescGZIP() []b
 	return file_envoy_extensions_clusters_aggregate_v3_cluster_proto_rawDescData
 }
 
-var file_envoy_extensions_clusters_aggregate_v3_cluster_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_envoy_extensions_clusters_aggregate_v3_cluster_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_envoy_extensions_clusters_aggregate_v3_cluster_proto_goTypes = []interface{}{
-	(*ClusterConfig)(nil),            // 0: envoy.extensions.clusters.aggregate.v3.ClusterConfig
-	(*AggregateClusterResource)(nil), // 1: envoy.extensions.clusters.aggregate.v3.AggregateClusterResource
-	(*v3.ConfigSource)(nil),          // 2: envoy.config.core.v3.ConfigSource
+	(*ClusterConfig)(nil), // 0: envoy.extensions.clusters.aggregate.v3.ClusterConfig
 }
 var file_envoy_extensions_clusters_aggregate_v3_cluster_proto_depIdxs = []int32{
-	2, // 0: envoy.extensions.clusters.aggregate.v3.AggregateClusterResource.config_source:type_name -> envoy.config.core.v3.ConfigSource
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
 }
 
 func init() { file_envoy_extensions_clusters_aggregate_v3_cluster_proto_init() }
@@ -232,18 +152,6 @@ func file_envoy_extensions_clusters_aggregate_v3_cluster_proto_init() {
 				return nil
 			}
 		}
-		file_envoy_extensions_clusters_aggregate_v3_cluster_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*AggregateClusterResource); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -251,7 +159,7 @@ func file_envoy_extensions_clusters_aggregate_v3_cluster_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_envoy_extensions_clusters_aggregate_v3_cluster_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   2,
+			NumMessages:   1,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/envoy/extensions/clusters/aggregate/v3/cluster.pb.validate.go b/envoy/extensions/clusters/aggregate/v3/cluster.pb.validate.go
old mode 100755
new mode 100644
index cc40b752e6..44fb2c71f1
--- a/envoy/extensions/clusters/aggregate/v3/cluster.pb.validate.go
+++ b/envoy/extensions/clusters/aggregate/v3/cluster.pb.validate.go
@@ -146,156 +146,3 @@ var _ interface {
 	Cause() error
 	ErrorName() string
 } = ClusterConfigValidationError{}
-
-// Validate checks the field values on AggregateClusterResource with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, the first error encountered is returned, or nil if there are no violations.
-func (m *AggregateClusterResource) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on AggregateClusterResource with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, the result is a list of violation errors wrapped in
-// AggregateClusterResourceMultiError, or nil if none found.
-func (m *AggregateClusterResource) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *AggregateClusterResource) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if m.GetConfigSource() == nil {
-		err := AggregateClusterResourceValidationError{
-			field:  "ConfigSource",
-			reason: "value is required",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	if all {
-		switch v := interface{}(m.GetConfigSource()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, AggregateClusterResourceValidationError{
-					field:  "ConfigSource",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, AggregateClusterResourceValidationError{
-					field:  "ConfigSource",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetConfigSource()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return AggregateClusterResourceValidationError{
-				field:  "ConfigSource",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if utf8.RuneCountInString(m.GetResourceName()) < 1 {
-		err := AggregateClusterResourceValidationError{
-			field:  "ResourceName",
-			reason: "value length must be at least 1 runes",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	if len(errors) > 0 {
-		return AggregateClusterResourceMultiError(errors)
-	}
-
-	return nil
-}
-
-// AggregateClusterResourceMultiError is an error wrapping multiple validation
-// errors returned by AggregateClusterResource.ValidateAll() if the designated
-// constraints aren't met.
-type AggregateClusterResourceMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m AggregateClusterResourceMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m AggregateClusterResourceMultiError) AllErrors() []error { return m }
-
-// AggregateClusterResourceValidationError is the validation error returned by
-// AggregateClusterResource.Validate if the designated constraints aren't met.
-type AggregateClusterResourceValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e AggregateClusterResourceValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e AggregateClusterResourceValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e AggregateClusterResourceValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e AggregateClusterResourceValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e AggregateClusterResourceValidationError) ErrorName() string {
-	return "AggregateClusterResourceValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e AggregateClusterResourceValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sAggregateClusterResource.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = AggregateClusterResourceValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = AggregateClusterResourceValidationError{}
diff --git a/envoy/extensions/clusters/aggregate/v3/cluster_vtproto.pb.go b/envoy/extensions/clusters/aggregate/v3/cluster_vtproto.pb.go
index 1012f17265..a3f22bf130 100755
--- a/envoy/extensions/clusters/aggregate/v3/cluster_vtproto.pb.go
+++ b/envoy/extensions/clusters/aggregate/v3/cluster_vtproto.pb.go
@@ -8,7 +8,6 @@ package aggregatev3
 
 import (
 	protohelpers "github.com/planetscale/vtprotobuf/protohelpers"
-	proto "google.golang.org/protobuf/proto"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
 
@@ -61,68 +60,6 @@ func (m *ClusterConfig) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
-func (m *AggregateClusterResource) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *AggregateClusterResource) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *AggregateClusterResource) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	if len(m.ResourceName) > 0 {
-		i -= len(m.ResourceName)
-		copy(dAtA[i:], m.ResourceName)
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.ResourceName)))
-		i--
-		dAtA[i] = 0x12
-	}
-	if m.ConfigSource != nil {
-		if vtmsg, ok := interface{}(m.ConfigSource).(interface {
-			MarshalToSizedBufferVTStrict([]byte) (int, error)
-		}); ok {
-			size, err := vtmsg.MarshalToSizedBufferVTStrict(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		} else {
-			encoded, err := proto.Marshal(m.ConfigSource)
-			if err != nil {
-				return 0, err
-			}
-			i -= len(encoded)
-			copy(dAtA[i:], encoded)
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(len(encoded)))
-		}
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
 func (m *ClusterConfig) SizeVT() (n int) {
 	if m == nil {
 		return 0
@@ -138,27 +75,3 @@ func (m *ClusterConfig) SizeVT() (n int) {
 	n += len(m.unknownFields)
 	return n
 }
-
-func (m *AggregateClusterResource) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.ConfigSource != nil {
-		if size, ok := interface{}(m.ConfigSource).(interface {
-			SizeVT() int
-		}); ok {
-			l = size.SizeVT()
-		} else {
-			l = proto.Size(m.ConfigSource)
-		}
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	l = len(m.ResourceName)
-	if l > 0 {
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	n += len(m.unknownFields)
-	return n
-}
diff --git a/envoy/extensions/clusters/common/dns/v3/dns.pb.validate.go b/envoy/extensions/clusters/common/dns/v3/dns.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/clusters/dns/v3/dns_cluster.pb.validate.go b/envoy/extensions/clusters/dns/v3/dns_cluster.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.validate.go b/envoy/extensions/clusters/dynamic_forward_proxy/v3/cluster.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/clusters/redis/v3/redis_cluster.pb.validate.go b/envoy/extensions/clusters/redis/v3/redis_cluster.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/common/async_files/v3/async_file_manager.pb.validate.go b/envoy/extensions/common/async_files/v3/async_file_manager.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/common/aws/v3/credential_provider.pb.go b/envoy/extensions/common/aws/v3/credential_provider.pb.go
index 95e2a83b90..89a3b77ee6 100755
--- a/envoy/extensions/common/aws/v3/credential_provider.pb.go
+++ b/envoy/extensions/common/aws/v3/credential_provider.pb.go
@@ -12,7 +12,6 @@ import (
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	durationpb "google.golang.org/protobuf/types/known/durationpb"
 	reflect "reflect"
 	sync "sync"
 )
@@ -27,7 +26,6 @@ const (
 // Configuration for AWS credential provider. This is optional and the credentials are normally
 // retrieved from the environment or AWS configuration files by following the default credential
 // provider chain. However, this configuration can be used to override the default behavior.
-// [#next-free-field: 10]
 type AwsCredentialProvider struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -46,17 +44,6 @@ type AwsCredentialProvider struct {
 	//
 	// This has no effect if inline_credential is provided.
 	CustomCredentialProviderChain bool `protobuf:"varint,4,opt,name=custom_credential_provider_chain,json=customCredentialProviderChain,proto3" json:"custom_credential_provider_chain,omitempty"`
-	// The option to use `IAM Roles Anywhere <https://docs.aws.amazon.com/rolesanywhere/latest/userguide/introduction.html>`_.
-	// [#not-implemented-hide:]
-	IamRolesAnywhereCredentialProvider *IAMRolesAnywhereCredentialProvider `protobuf:"bytes,5,opt,name=iam_roles_anywhere_credential_provider,json=iamRolesAnywhereCredentialProvider,proto3" json:"iam_roles_anywhere_credential_provider,omitempty"`
-	// The option to use credentials sourced from standard 'AWS configuration files <https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html>'_.
-	ConfigCredentialProvider *ConfigCredentialProvider `protobuf:"bytes,6,opt,name=config_credential_provider,json=configCredentialProvider,proto3" json:"config_credential_provider,omitempty"`
-	// The option to use credentials sourced from 'container environment variables <https://docs.aws.amazon.com/sdkref/latest/guide/feature-container-credentials.html>'_.
-	ContainerCredentialProvider *ContainerCredentialProvider `protobuf:"bytes,7,opt,name=container_credential_provider,json=containerCredentialProvider,proto3" json:"container_credential_provider,omitempty"`
-	// The option to use credentials sourced from 'environment variables <https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html>'_.
-	EnvironmentCredentialProvider *EnvironmentCredentialProvider `protobuf:"bytes,8,opt,name=environment_credential_provider,json=environmentCredentialProvider,proto3" json:"environment_credential_provider,omitempty"`
-	// The option to use credentials sourced from an EC2 'Instance Profile <https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html>'_.
-	InstanceProfileCredentialProvider *InstanceProfileCredentialProvider `protobuf:"bytes,9,opt,name=instance_profile_credential_provider,json=instanceProfileCredentialProvider,proto3" json:"instance_profile_credential_provider,omitempty"`
 }
 
 func (x *AwsCredentialProvider) Reset() {
@@ -119,41 +106,6 @@ func (x *AwsCredentialProvider) GetCustomCredentialProviderChain() bool {
 	return false
 }
 
-func (x *AwsCredentialProvider) GetIamRolesAnywhereCredentialProvider() *IAMRolesAnywhereCredentialProvider {
-	if x != nil {
-		return x.IamRolesAnywhereCredentialProvider
-	}
-	return nil
-}
-
-func (x *AwsCredentialProvider) GetConfigCredentialProvider() *ConfigCredentialProvider {
-	if x != nil {
-		return x.ConfigCredentialProvider
-	}
-	return nil
-}
-
-func (x *AwsCredentialProvider) GetContainerCredentialProvider() *ContainerCredentialProvider {
-	if x != nil {
-		return x.ContainerCredentialProvider
-	}
-	return nil
-}
-
-func (x *AwsCredentialProvider) GetEnvironmentCredentialProvider() *EnvironmentCredentialProvider {
-	if x != nil {
-		return x.EnvironmentCredentialProvider
-	}
-	return nil
-}
-
-func (x *AwsCredentialProvider) GetInstanceProfileCredentialProvider() *InstanceProfileCredentialProvider {
-	if x != nil {
-		return x.InstanceProfileCredentialProvider
-	}
-	return nil
-}
-
 // Configuration to use an inline AWS credential. This is an equivalent to setting the well-known
 // environment variables “AWS_ACCESS_KEY_ID“, “AWS_SECRET_ACCESS_KEY“, and the optional “AWS_SESSION_TOKEN“.
 type InlineCredentialProvider struct {
@@ -351,286 +303,6 @@ func (x *CredentialsFileCredentialProvider) GetProfile() string {
 	return ""
 }
 
-// Configuration to use `IAM Roles Anywhere <https://docs.aws.amazon.com/rolesanywhere/latest/userguide/introduction.html>`_
-// to retrieve AWS credentials.
-// [#next-free-field: 9]
-// [#not-implemented-hide:]
-type IAMRolesAnywhereCredentialProvider struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// The ARN of the role to assume via the IAM Roles Anywhere sessions API. See `Configure Roles <https://docs.aws.amazon.com/rolesanywhere/latest/userguide/getting-started.html#getting-started-step2>`_ for more details.
-	RoleArn string `protobuf:"bytes,1,opt,name=role_arn,json=roleArn,proto3" json:"role_arn,omitempty"`
-	// The certificate used for authenticating to the IAM Roles Anywhere service.
-	// This certificate must match one configured in the IAM Roles Anywhere profile. See `Configure Roles <https://docs.aws.amazon.com/rolesanywhere/latest/userguide/getting-started.html#getting-started-step2>`_ for more details.
-	Certificate *v3.DataSource `protobuf:"bytes,2,opt,name=certificate,proto3" json:"certificate,omitempty"`
-	// The optional certificate chain, required when you are using a subordinate certificate authority for certificate issuance.
-	// A certificate chain can contain a maximum of 5 elements, see `The IAM Roles Anywhere authentication process <https://docs.aws.amazon.com/rolesanywhere/latest/userguide/authentication.html>`_ for more details.
-	CertificateChain *v3.DataSource `protobuf:"bytes,3,opt,name=certificate_chain,json=certificateChain,proto3" json:"certificate_chain,omitempty"`
-	// The TLS private key matching the certificate provided.
-	PrivateKey *v3.DataSource `protobuf:"bytes,4,opt,name=private_key,json=privateKey,proto3" json:"private_key,omitempty"`
-	// The arn of the IAM Roles Anywhere trust anchor configured in your AWS account. A trust anchor in IAM Roles anywhere establishes
-	// trust between your certificate authority (CA) and AWS. See `Establish trust <https://docs.aws.amazon.com/rolesanywhere/latest/userguide/getting-started.html#getting-started-step1>`_ for more details.
-	TrustAnchorArn string `protobuf:"bytes,5,opt,name=trust_anchor_arn,json=trustAnchorArn,proto3" json:"trust_anchor_arn,omitempty"`
-	// The IAM Roles Anywhere profile ARN configured in your AWS account.
-	ProfileArn string `protobuf:"bytes,6,opt,name=profile_arn,json=profileArn,proto3" json:"profile_arn,omitempty"`
-	// An optional role session name, used when identifying the role in subsequent AWS API calls.
-	RoleSessionName string `protobuf:"bytes,7,opt,name=role_session_name,json=roleSessionName,proto3" json:"role_session_name,omitempty"`
-	// An optional session duration, used when calculating the maximum time before vended credentials expire. This value cannot exceed the value configured
-	// in the IAM Roles Anywhere profile and the resultant session duration is calculate by the formula `here <https://docs.aws.amazon.com/rolesanywhere/latest/userguide/authentication-create-session.html#credentials-object>`_.
-	// If no session duration is provided here, the session duration is sourced from the IAM Roles Anywhere profile.
-	SessionDuration *durationpb.Duration `protobuf:"bytes,8,opt,name=session_duration,json=sessionDuration,proto3" json:"session_duration,omitempty"`
-}
-
-func (x *IAMRolesAnywhereCredentialProvider) Reset() {
-	*x = IAMRolesAnywhereCredentialProvider{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *IAMRolesAnywhereCredentialProvider) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*IAMRolesAnywhereCredentialProvider) ProtoMessage() {}
-
-func (x *IAMRolesAnywhereCredentialProvider) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use IAMRolesAnywhereCredentialProvider.ProtoReflect.Descriptor instead.
-func (*IAMRolesAnywhereCredentialProvider) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_common_aws_v3_credential_provider_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *IAMRolesAnywhereCredentialProvider) GetRoleArn() string {
-	if x != nil {
-		return x.RoleArn
-	}
-	return ""
-}
-
-func (x *IAMRolesAnywhereCredentialProvider) GetCertificate() *v3.DataSource {
-	if x != nil {
-		return x.Certificate
-	}
-	return nil
-}
-
-func (x *IAMRolesAnywhereCredentialProvider) GetCertificateChain() *v3.DataSource {
-	if x != nil {
-		return x.CertificateChain
-	}
-	return nil
-}
-
-func (x *IAMRolesAnywhereCredentialProvider) GetPrivateKey() *v3.DataSource {
-	if x != nil {
-		return x.PrivateKey
-	}
-	return nil
-}
-
-func (x *IAMRolesAnywhereCredentialProvider) GetTrustAnchorArn() string {
-	if x != nil {
-		return x.TrustAnchorArn
-	}
-	return ""
-}
-
-func (x *IAMRolesAnywhereCredentialProvider) GetProfileArn() string {
-	if x != nil {
-		return x.ProfileArn
-	}
-	return ""
-}
-
-func (x *IAMRolesAnywhereCredentialProvider) GetRoleSessionName() string {
-	if x != nil {
-		return x.RoleSessionName
-	}
-	return ""
-}
-
-func (x *IAMRolesAnywhereCredentialProvider) GetSessionDuration() *durationpb.Duration {
-	if x != nil {
-		return x.SessionDuration
-	}
-	return nil
-}
-
-// The Config Credential Provider has no configurable parameters, but listing it in a custom credential provider chain will enable this
-// credential provider.
-type ConfigCredentialProvider struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *ConfigCredentialProvider) Reset() {
-	*x = ConfigCredentialProvider{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ConfigCredentialProvider) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ConfigCredentialProvider) ProtoMessage() {}
-
-func (x *ConfigCredentialProvider) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ConfigCredentialProvider.ProtoReflect.Descriptor instead.
-func (*ConfigCredentialProvider) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_common_aws_v3_credential_provider_proto_rawDescGZIP(), []int{5}
-}
-
-// The Container Credential Provider has no configurable parameters, but listing it in a custom credential provider chain will enable this
-// credential provider.
-type ContainerCredentialProvider struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *ContainerCredentialProvider) Reset() {
-	*x = ContainerCredentialProvider{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ContainerCredentialProvider) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ContainerCredentialProvider) ProtoMessage() {}
-
-func (x *ContainerCredentialProvider) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ContainerCredentialProvider.ProtoReflect.Descriptor instead.
-func (*ContainerCredentialProvider) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_common_aws_v3_credential_provider_proto_rawDescGZIP(), []int{6}
-}
-
-// The Environment Credential Provider has no configurable parameters, but listing it in a custom credential provider chain will enable this
-// credential provider.
-type EnvironmentCredentialProvider struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *EnvironmentCredentialProvider) Reset() {
-	*x = EnvironmentCredentialProvider{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *EnvironmentCredentialProvider) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EnvironmentCredentialProvider) ProtoMessage() {}
-
-func (x *EnvironmentCredentialProvider) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EnvironmentCredentialProvider.ProtoReflect.Descriptor instead.
-func (*EnvironmentCredentialProvider) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_common_aws_v3_credential_provider_proto_rawDescGZIP(), []int{7}
-}
-
-// The Instance Profile Credential Provider has no configurable parameters, but listing it in a custom credential provider chain will enable this
-// credential provider.
-type InstanceProfileCredentialProvider struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *InstanceProfileCredentialProvider) Reset() {
-	*x = InstanceProfileCredentialProvider{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *InstanceProfileCredentialProvider) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*InstanceProfileCredentialProvider) ProtoMessage() {}
-
-func (x *InstanceProfileCredentialProvider) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use InstanceProfileCredentialProvider.ProtoReflect.Descriptor instead.
-func (*InstanceProfileCredentialProvider) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_common_aws_v3_credential_provider_proto_rawDescGZIP(), []int{8}
-}
-
 var File_envoy_extensions_common_aws_v3_credential_provider_proto protoreflect.FileDescriptor
 
 var file_envoy_extensions_common_aws_v3_credential_provider_proto_rawDesc = []byte{
@@ -641,15 +313,13 @@ var file_envoy_extensions_common_aws_v3_credential_provider_proto_rawDesc = []by
 	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x63, 0x6f, 0x6d,
 	0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x77, 0x73, 0x2e, 0x76, 0x33, 0x1a, 0x1f, 0x65, 0x6e, 0x76, 0x6f,
 	0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33,
-	0x2f, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x75, 0x64, 0x70,
+	0x2f, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x75, 0x64, 0x70,
 	0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x65,
 	0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75,
 	0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
 	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61,
 	0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x96, 0x09, 0x0a, 0x15, 0x41, 0x77, 0x73, 0x43, 0x72, 0x65,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe7, 0x03, 0x0a, 0x15, 0x41, 0x77, 0x73, 0x43, 0x72, 0x65,
 	0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12,
 	0x9e, 0x01, 0x0a, 0x26, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x5f, 0x72, 0x6f, 0x6c, 0x65, 0x5f,
 	0x77, 0x69, 0x74, 0x68, 0x5f, 0x77, 0x65, 0x62, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
@@ -679,139 +349,54 @@ var file_envoy_extensions_common_aws_v3_credential_provider_proto_rawDesc = []by
 	0x5f, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x70, 0x72, 0x6f, 0x76,
 	0x69, 0x64, 0x65, 0x72, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08,
 	0x52, 0x1d, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x12,
-	0x96, 0x01, 0x0a, 0x26, 0x69, 0x61, 0x6d, 0x5f, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x5f, 0x61, 0x6e,
-	0x79, 0x77, 0x68, 0x65, 0x72, 0x65, 0x5f, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61,
-	0x6c, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x42, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x77, 0x73, 0x2e, 0x76,
-	0x33, 0x2e, 0x49, 0x41, 0x4d, 0x52, 0x6f, 0x6c, 0x65, 0x73, 0x41, 0x6e, 0x79, 0x77, 0x68, 0x65,
-	0x72, 0x65, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76,
-	0x69, 0x64, 0x65, 0x72, 0x52, 0x22, 0x69, 0x61, 0x6d, 0x52, 0x6f, 0x6c, 0x65, 0x73, 0x41, 0x6e,
-	0x79, 0x77, 0x68, 0x65, 0x72, 0x65, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c,
-	0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x76, 0x0a, 0x1a, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x5f, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x70, 0x72,
-	0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x77, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x50, 0x72,
-	0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x18, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x43, 0x72,
-	0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72,
-	0x12, 0x7f, 0x0a, 0x1d, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x63, 0x72,
-	0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
-	0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x2e, 0x61, 0x77, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e,
-	0x65, 0x72, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76,
-	0x69, 0x64, 0x65, 0x72, 0x52, 0x1b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x43,
+	0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x22,
+	0xaf, 0x01, 0x0a, 0x18, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e,
+	0x74, 0x69, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x2b, 0x0a, 0x0d,
+	0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x61, 0x63,
+	0x63, 0x65, 0x73, 0x73, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x12, 0x39, 0x0a, 0x11, 0x73, 0x65, 0x63,
+	0x72, 0x65, 0x74, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0xb8, 0xb7, 0x8b,
+	0xa4, 0x02, 0x01, 0x52, 0x0f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x41, 0x63, 0x63, 0x65, 0x73,
+	0x73, 0x4b, 0x65, 0x79, 0x12, 0x2b, 0x0a, 0x0d, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f,
+	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x06, 0xb8, 0xb7, 0x8b,
+	0xa4, 0x02, 0x01, 0x52, 0x0c, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65,
+	0x6e, 0x22, 0xeb, 0x01, 0x0a, 0x2b, 0x41, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x52, 0x6f, 0x6c, 0x65,
+	0x57, 0x69, 0x74, 0x68, 0x57, 0x65, 0x62, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x43,
 	0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65,
-	0x72, 0x12, 0x85, 0x01, 0x0a, 0x1f, 0x65, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e,
-	0x74, 0x5f, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x70, 0x72, 0x6f,
-	0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x63,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x77, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x45, 0x6e, 0x76,
-	0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x1d, 0x65, 0x6e, 0x76, 0x69,
-	0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61,
-	0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x92, 0x01, 0x0a, 0x24, 0x69, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x63,
-	0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64,
-	0x65, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x2e, 0x61, 0x77, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74,
-	0x69, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x52, 0x21, 0x69, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x64,
-	0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x22, 0xaf,
-	0x01, 0x0a, 0x18, 0x49, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74,
-	0x69, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x2b, 0x0a, 0x0d, 0x61,
-	0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x61, 0x63, 0x63,
-	0x65, 0x73, 0x73, 0x4b, 0x65, 0x79, 0x49, 0x64, 0x12, 0x39, 0x0a, 0x11, 0x73, 0x65, 0x63, 0x72,
-	0x65, 0x74, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0xb8, 0xb7, 0x8b, 0xa4,
-	0x02, 0x01, 0x52, 0x0f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73,
-	0x4b, 0x65, 0x79, 0x12, 0x2b, 0x0a, 0x0d, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x74,
-	0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x06, 0xb8, 0xb7, 0x8b, 0xa4,
-	0x02, 0x01, 0x52, 0x0c, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
-	0x22, 0xeb, 0x01, 0x0a, 0x2b, 0x41, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x57,
-	0x69, 0x74, 0x68, 0x57, 0x65, 0x62, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x43, 0x72,
-	0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72,
-	0x12, 0x6c, 0x0a, 0x1e, 0x77, 0x65, 0x62, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
-	0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e,
-	0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x06, 0xb8, 0xb7, 0x8b, 0xa4,
-	0x02, 0x01, 0x52, 0x1a, 0x77, 0x65, 0x62, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x54,
-	0x6f, 0x6b, 0x65, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x22,
-	0x0a, 0x08, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x41,
-	0x72, 0x6e, 0x12, 0x2a, 0x0a, 0x11, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x73, 0x65, 0x73, 0x73, 0x69,
-	0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x72,
-	0x6f, 0x6c, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x9f,
-	0x01, 0x0a, 0x21, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x46, 0x69,
-	0x6c, 0x65, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76,
-	0x69, 0x64, 0x65, 0x72, 0x12, 0x60, 0x0a, 0x17, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69,
-	0x61, 0x6c, 0x73, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74,
-	0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x06, 0xb8, 0xb7, 0x8b, 0xa4, 0x02, 0x01, 0x52,
-	0x15, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x44, 0x61, 0x74, 0x61,
-	0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65,
-	0x22, 0x9a, 0x04, 0x0a, 0x22, 0x49, 0x41, 0x4d, 0x52, 0x6f, 0x6c, 0x65, 0x73, 0x41, 0x6e, 0x79,
-	0x77, 0x68, 0x65, 0x72, 0x65, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x50,
-	0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x22, 0x0a, 0x08, 0x72, 0x6f, 0x6c, 0x65, 0x5f,
-	0x61, 0x72, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02,
-	0x10, 0x01, 0x52, 0x07, 0x72, 0x6f, 0x6c, 0x65, 0x41, 0x72, 0x6e, 0x12, 0x4c, 0x0a, 0x0b, 0x63,
-	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e,
-	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x63, 0x65,
-	0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x4d, 0x0a, 0x11, 0x63, 0x65, 0x72,
-	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61,
-	0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x10, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63,
-	0x61, 0x74, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x51, 0x0a, 0x0b, 0x70, 0x72, 0x69, 0x76,
-	0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42,
-	0x0e, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0xb8, 0xb7, 0x8b, 0xa4, 0x02, 0x01, 0x52,
-	0x0a, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x31, 0x0a, 0x10, 0x74,
-	0x72, 0x75, 0x73, 0x74, 0x5f, 0x61, 0x6e, 0x63, 0x68, 0x6f, 0x72, 0x5f, 0x61, 0x72, 0x6e, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0e,
-	0x74, 0x72, 0x75, 0x73, 0x74, 0x41, 0x6e, 0x63, 0x68, 0x6f, 0x72, 0x41, 0x72, 0x6e, 0x12, 0x28,
-	0x0a, 0x0b, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0a, 0x70, 0x72,
-	0x6f, 0x66, 0x69, 0x6c, 0x65, 0x41, 0x72, 0x6e, 0x12, 0x2a, 0x0a, 0x11, 0x72, 0x6f, 0x6c, 0x65,
-	0x5f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0f, 0x72, 0x6f, 0x6c, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
-	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x57, 0x0a, 0x10, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f,
-	0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x11, 0xfa, 0x42, 0x0e, 0xaa, 0x01,
-	0x0b, 0x22, 0x04, 0x08, 0xc0, 0xd1, 0x02, 0x32, 0x03, 0x08, 0x84, 0x07, 0x52, 0x0f, 0x73, 0x65,
-	0x73, 0x73, 0x69, 0x6f, 0x6e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x1a, 0x0a,
-	0x18, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61,
-	0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x22, 0x1d, 0x0a, 0x1b, 0x43, 0x6f, 0x6e,
-	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c,
-	0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x22, 0x1f, 0x0a, 0x1d, 0x45, 0x6e, 0x76, 0x69,
-	0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61,
-	0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x22, 0x23, 0x0a, 0x21, 0x49, 0x6e, 0x73,
-	0x74, 0x61, 0x6e, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x64,
-	0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x42, 0x9e,
-	0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x2c, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x2e, 0x61, 0x77, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x17, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74,
-	0x69, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x63, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x2f, 0x61, 0x77, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x77, 0x73, 0x76, 0x33, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x12, 0x6c, 0x0a, 0x1e, 0x77, 0x65, 0x62, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
+	0x79, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33,
+	0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x06, 0xb8, 0xb7, 0x8b,
+	0xa4, 0x02, 0x01, 0x52, 0x1a, 0x77, 0x65, 0x62, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
+	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12,
+	0x22, 0x0a, 0x08, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x61, 0x72, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x07, 0x72, 0x6f, 0x6c, 0x65,
+	0x41, 0x72, 0x6e, 0x12, 0x2a, 0x0a, 0x11, 0x72, 0x6f, 0x6c, 0x65, 0x5f, 0x73, 0x65, 0x73, 0x73,
+	0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f,
+	0x72, 0x6f, 0x6c, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x22,
+	0x9f, 0x01, 0x0a, 0x21, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x46,
+	0x69, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x50, 0x72, 0x6f,
+	0x76, 0x69, 0x64, 0x65, 0x72, 0x12, 0x60, 0x0a, 0x17, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74,
+	0x69, 0x61, 0x6c, 0x73, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61,
+	0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x06, 0xb8, 0xb7, 0x8b, 0xa4, 0x02, 0x01,
+	0x52, 0x15, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x44, 0x61, 0x74,
+	0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x66, 0x69,
+	0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c,
+	0x65, 0x42, 0x9e, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x2c, 0x69, 0x6f,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x77, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x17, 0x43, 0x72, 0x65, 0x64,
+	0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x61, 0x77, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x77, 0x73,
+	0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -826,40 +411,25 @@ func file_envoy_extensions_common_aws_v3_credential_provider_proto_rawDescGZIP()
 	return file_envoy_extensions_common_aws_v3_credential_provider_proto_rawDescData
 }
 
-var file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
+var file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_envoy_extensions_common_aws_v3_credential_provider_proto_goTypes = []interface{}{
 	(*AwsCredentialProvider)(nil),                       // 0: envoy.extensions.common.aws.v3.AwsCredentialProvider
 	(*InlineCredentialProvider)(nil),                    // 1: envoy.extensions.common.aws.v3.InlineCredentialProvider
 	(*AssumeRoleWithWebIdentityCredentialProvider)(nil), // 2: envoy.extensions.common.aws.v3.AssumeRoleWithWebIdentityCredentialProvider
 	(*CredentialsFileCredentialProvider)(nil),           // 3: envoy.extensions.common.aws.v3.CredentialsFileCredentialProvider
-	(*IAMRolesAnywhereCredentialProvider)(nil),          // 4: envoy.extensions.common.aws.v3.IAMRolesAnywhereCredentialProvider
-	(*ConfigCredentialProvider)(nil),                    // 5: envoy.extensions.common.aws.v3.ConfigCredentialProvider
-	(*ContainerCredentialProvider)(nil),                 // 6: envoy.extensions.common.aws.v3.ContainerCredentialProvider
-	(*EnvironmentCredentialProvider)(nil),               // 7: envoy.extensions.common.aws.v3.EnvironmentCredentialProvider
-	(*InstanceProfileCredentialProvider)(nil),           // 8: envoy.extensions.common.aws.v3.InstanceProfileCredentialProvider
-	(*v3.DataSource)(nil),                               // 9: envoy.config.core.v3.DataSource
-	(*durationpb.Duration)(nil),                         // 10: google.protobuf.Duration
+	(*v3.DataSource)(nil),                               // 4: envoy.config.core.v3.DataSource
 }
 var file_envoy_extensions_common_aws_v3_credential_provider_proto_depIdxs = []int32{
-	2,  // 0: envoy.extensions.common.aws.v3.AwsCredentialProvider.assume_role_with_web_identity_provider:type_name -> envoy.extensions.common.aws.v3.AssumeRoleWithWebIdentityCredentialProvider
-	1,  // 1: envoy.extensions.common.aws.v3.AwsCredentialProvider.inline_credential:type_name -> envoy.extensions.common.aws.v3.InlineCredentialProvider
-	3,  // 2: envoy.extensions.common.aws.v3.AwsCredentialProvider.credentials_file_provider:type_name -> envoy.extensions.common.aws.v3.CredentialsFileCredentialProvider
-	4,  // 3: envoy.extensions.common.aws.v3.AwsCredentialProvider.iam_roles_anywhere_credential_provider:type_name -> envoy.extensions.common.aws.v3.IAMRolesAnywhereCredentialProvider
-	5,  // 4: envoy.extensions.common.aws.v3.AwsCredentialProvider.config_credential_provider:type_name -> envoy.extensions.common.aws.v3.ConfigCredentialProvider
-	6,  // 5: envoy.extensions.common.aws.v3.AwsCredentialProvider.container_credential_provider:type_name -> envoy.extensions.common.aws.v3.ContainerCredentialProvider
-	7,  // 6: envoy.extensions.common.aws.v3.AwsCredentialProvider.environment_credential_provider:type_name -> envoy.extensions.common.aws.v3.EnvironmentCredentialProvider
-	8,  // 7: envoy.extensions.common.aws.v3.AwsCredentialProvider.instance_profile_credential_provider:type_name -> envoy.extensions.common.aws.v3.InstanceProfileCredentialProvider
-	9,  // 8: envoy.extensions.common.aws.v3.AssumeRoleWithWebIdentityCredentialProvider.web_identity_token_data_source:type_name -> envoy.config.core.v3.DataSource
-	9,  // 9: envoy.extensions.common.aws.v3.CredentialsFileCredentialProvider.credentials_data_source:type_name -> envoy.config.core.v3.DataSource
-	9,  // 10: envoy.extensions.common.aws.v3.IAMRolesAnywhereCredentialProvider.certificate:type_name -> envoy.config.core.v3.DataSource
-	9,  // 11: envoy.extensions.common.aws.v3.IAMRolesAnywhereCredentialProvider.certificate_chain:type_name -> envoy.config.core.v3.DataSource
-	9,  // 12: envoy.extensions.common.aws.v3.IAMRolesAnywhereCredentialProvider.private_key:type_name -> envoy.config.core.v3.DataSource
-	10, // 13: envoy.extensions.common.aws.v3.IAMRolesAnywhereCredentialProvider.session_duration:type_name -> google.protobuf.Duration
-	14, // [14:14] is the sub-list for method output_type
-	14, // [14:14] is the sub-list for method input_type
-	14, // [14:14] is the sub-list for extension type_name
-	14, // [14:14] is the sub-list for extension extendee
-	0,  // [0:14] is the sub-list for field type_name
+	2, // 0: envoy.extensions.common.aws.v3.AwsCredentialProvider.assume_role_with_web_identity_provider:type_name -> envoy.extensions.common.aws.v3.AssumeRoleWithWebIdentityCredentialProvider
+	1, // 1: envoy.extensions.common.aws.v3.AwsCredentialProvider.inline_credential:type_name -> envoy.extensions.common.aws.v3.InlineCredentialProvider
+	3, // 2: envoy.extensions.common.aws.v3.AwsCredentialProvider.credentials_file_provider:type_name -> envoy.extensions.common.aws.v3.CredentialsFileCredentialProvider
+	4, // 3: envoy.extensions.common.aws.v3.AssumeRoleWithWebIdentityCredentialProvider.web_identity_token_data_source:type_name -> envoy.config.core.v3.DataSource
+	4, // 4: envoy.extensions.common.aws.v3.CredentialsFileCredentialProvider.credentials_data_source:type_name -> envoy.config.core.v3.DataSource
+	5, // [5:5] is the sub-list for method output_type
+	5, // [5:5] is the sub-list for method input_type
+	5, // [5:5] is the sub-list for extension type_name
+	5, // [5:5] is the sub-list for extension extendee
+	0, // [0:5] is the sub-list for field type_name
 }
 
 func init() { file_envoy_extensions_common_aws_v3_credential_provider_proto_init() }
@@ -916,66 +486,6 @@ func file_envoy_extensions_common_aws_v3_credential_provider_proto_init() {
 				return nil
 			}
 		}
-		file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*IAMRolesAnywhereCredentialProvider); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ConfigCredentialProvider); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ContainerCredentialProvider); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EnvironmentCredentialProvider); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_envoy_extensions_common_aws_v3_credential_provider_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*InstanceProfileCredentialProvider); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -983,7 +493,7 @@ func file_envoy_extensions_common_aws_v3_credential_provider_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_envoy_extensions_common_aws_v3_credential_provider_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   9,
+			NumMessages:   4,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/envoy/extensions/common/aws/v3/credential_provider.pb.validate.go b/envoy/extensions/common/aws/v3/credential_provider.pb.validate.go
old mode 100755
new mode 100644
index 8ac51a3af2..af5c8d76ea
--- a/envoy/extensions/common/aws/v3/credential_provider.pb.validate.go
+++ b/envoy/extensions/common/aws/v3/credential_provider.pb.validate.go
@@ -147,151 +147,6 @@ func (m *AwsCredentialProvider) validate(all bool) error {
 
 	// no validation rules for CustomCredentialProviderChain
 
-	if all {
-		switch v := interface{}(m.GetIamRolesAnywhereCredentialProvider()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, AwsCredentialProviderValidationError{
-					field:  "IamRolesAnywhereCredentialProvider",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, AwsCredentialProviderValidationError{
-					field:  "IamRolesAnywhereCredentialProvider",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetIamRolesAnywhereCredentialProvider()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return AwsCredentialProviderValidationError{
-				field:  "IamRolesAnywhereCredentialProvider",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if all {
-		switch v := interface{}(m.GetConfigCredentialProvider()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, AwsCredentialProviderValidationError{
-					field:  "ConfigCredentialProvider",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, AwsCredentialProviderValidationError{
-					field:  "ConfigCredentialProvider",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetConfigCredentialProvider()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return AwsCredentialProviderValidationError{
-				field:  "ConfigCredentialProvider",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if all {
-		switch v := interface{}(m.GetContainerCredentialProvider()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, AwsCredentialProviderValidationError{
-					field:  "ContainerCredentialProvider",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, AwsCredentialProviderValidationError{
-					field:  "ContainerCredentialProvider",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetContainerCredentialProvider()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return AwsCredentialProviderValidationError{
-				field:  "ContainerCredentialProvider",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if all {
-		switch v := interface{}(m.GetEnvironmentCredentialProvider()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, AwsCredentialProviderValidationError{
-					field:  "EnvironmentCredentialProvider",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, AwsCredentialProviderValidationError{
-					field:  "EnvironmentCredentialProvider",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetEnvironmentCredentialProvider()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return AwsCredentialProviderValidationError{
-				field:  "EnvironmentCredentialProvider",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if all {
-		switch v := interface{}(m.GetInstanceProfileCredentialProvider()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, AwsCredentialProviderValidationError{
-					field:  "InstanceProfileCredentialProvider",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, AwsCredentialProviderValidationError{
-					field:  "InstanceProfileCredentialProvider",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetInstanceProfileCredentialProvider()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return AwsCredentialProviderValidationError{
-				field:  "InstanceProfileCredentialProvider",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
 	if len(errors) > 0 {
 		return AwsCredentialProviderMultiError(errors)
 	}
@@ -781,696 +636,3 @@ var _ interface {
 	Cause() error
 	ErrorName() string
 } = CredentialsFileCredentialProviderValidationError{}
-
-// Validate checks the field values on IAMRolesAnywhereCredentialProvider with
-// the rules defined in the proto definition for this message. If any rules
-// are violated, the first error encountered is returned, or nil if there are
-// no violations.
-func (m *IAMRolesAnywhereCredentialProvider) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on IAMRolesAnywhereCredentialProvider
-// with the rules defined in the proto definition for this message. If any
-// rules are violated, the result is a list of violation errors wrapped in
-// IAMRolesAnywhereCredentialProviderMultiError, or nil if none found.
-func (m *IAMRolesAnywhereCredentialProvider) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *IAMRolesAnywhereCredentialProvider) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if utf8.RuneCountInString(m.GetRoleArn()) < 1 {
-		err := IAMRolesAnywhereCredentialProviderValidationError{
-			field:  "RoleArn",
-			reason: "value length must be at least 1 runes",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	if m.GetCertificate() == nil {
-		err := IAMRolesAnywhereCredentialProviderValidationError{
-			field:  "Certificate",
-			reason: "value is required",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	if all {
-		switch v := interface{}(m.GetCertificate()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, IAMRolesAnywhereCredentialProviderValidationError{
-					field:  "Certificate",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, IAMRolesAnywhereCredentialProviderValidationError{
-					field:  "Certificate",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetCertificate()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return IAMRolesAnywhereCredentialProviderValidationError{
-				field:  "Certificate",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if all {
-		switch v := interface{}(m.GetCertificateChain()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, IAMRolesAnywhereCredentialProviderValidationError{
-					field:  "CertificateChain",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, IAMRolesAnywhereCredentialProviderValidationError{
-					field:  "CertificateChain",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetCertificateChain()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return IAMRolesAnywhereCredentialProviderValidationError{
-				field:  "CertificateChain",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if m.GetPrivateKey() == nil {
-		err := IAMRolesAnywhereCredentialProviderValidationError{
-			field:  "PrivateKey",
-			reason: "value is required",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	if all {
-		switch v := interface{}(m.GetPrivateKey()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, IAMRolesAnywhereCredentialProviderValidationError{
-					field:  "PrivateKey",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, IAMRolesAnywhereCredentialProviderValidationError{
-					field:  "PrivateKey",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetPrivateKey()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return IAMRolesAnywhereCredentialProviderValidationError{
-				field:  "PrivateKey",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if utf8.RuneCountInString(m.GetTrustAnchorArn()) < 1 {
-		err := IAMRolesAnywhereCredentialProviderValidationError{
-			field:  "TrustAnchorArn",
-			reason: "value length must be at least 1 runes",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	if utf8.RuneCountInString(m.GetProfileArn()) < 1 {
-		err := IAMRolesAnywhereCredentialProviderValidationError{
-			field:  "ProfileArn",
-			reason: "value length must be at least 1 runes",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	// no validation rules for RoleSessionName
-
-	if d := m.GetSessionDuration(); d != nil {
-		dur, err := d.AsDuration(), d.CheckValid()
-		if err != nil {
-			err = IAMRolesAnywhereCredentialProviderValidationError{
-				field:  "SessionDuration",
-				reason: "value is not a valid duration",
-				cause:  err,
-			}
-			if !all {
-				return err
-			}
-			errors = append(errors, err)
-		} else {
-
-			lte := time.Duration(43200*time.Second + 0*time.Nanosecond)
-			gte := time.Duration(900*time.Second + 0*time.Nanosecond)
-
-			if dur < gte || dur > lte {
-				err := IAMRolesAnywhereCredentialProviderValidationError{
-					field:  "SessionDuration",
-					reason: "value must be inside range [15m0s, 12h0m0s]",
-				}
-				if !all {
-					return err
-				}
-				errors = append(errors, err)
-			}
-
-		}
-	}
-
-	if len(errors) > 0 {
-		return IAMRolesAnywhereCredentialProviderMultiError(errors)
-	}
-
-	return nil
-}
-
-// IAMRolesAnywhereCredentialProviderMultiError is an error wrapping multiple
-// validation errors returned by
-// IAMRolesAnywhereCredentialProvider.ValidateAll() if the designated
-// constraints aren't met.
-type IAMRolesAnywhereCredentialProviderMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m IAMRolesAnywhereCredentialProviderMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m IAMRolesAnywhereCredentialProviderMultiError) AllErrors() []error { return m }
-
-// IAMRolesAnywhereCredentialProviderValidationError is the validation error
-// returned by IAMRolesAnywhereCredentialProvider.Validate if the designated
-// constraints aren't met.
-type IAMRolesAnywhereCredentialProviderValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e IAMRolesAnywhereCredentialProviderValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e IAMRolesAnywhereCredentialProviderValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e IAMRolesAnywhereCredentialProviderValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e IAMRolesAnywhereCredentialProviderValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e IAMRolesAnywhereCredentialProviderValidationError) ErrorName() string {
-	return "IAMRolesAnywhereCredentialProviderValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e IAMRolesAnywhereCredentialProviderValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sIAMRolesAnywhereCredentialProvider.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = IAMRolesAnywhereCredentialProviderValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = IAMRolesAnywhereCredentialProviderValidationError{}
-
-// Validate checks the field values on ConfigCredentialProvider with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, the first error encountered is returned, or nil if there are no violations.
-func (m *ConfigCredentialProvider) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on ConfigCredentialProvider with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, the result is a list of violation errors wrapped in
-// ConfigCredentialProviderMultiError, or nil if none found.
-func (m *ConfigCredentialProvider) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *ConfigCredentialProvider) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if len(errors) > 0 {
-		return ConfigCredentialProviderMultiError(errors)
-	}
-
-	return nil
-}
-
-// ConfigCredentialProviderMultiError is an error wrapping multiple validation
-// errors returned by ConfigCredentialProvider.ValidateAll() if the designated
-// constraints aren't met.
-type ConfigCredentialProviderMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m ConfigCredentialProviderMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m ConfigCredentialProviderMultiError) AllErrors() []error { return m }
-
-// ConfigCredentialProviderValidationError is the validation error returned by
-// ConfigCredentialProvider.Validate if the designated constraints aren't met.
-type ConfigCredentialProviderValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ConfigCredentialProviderValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ConfigCredentialProviderValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ConfigCredentialProviderValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ConfigCredentialProviderValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ConfigCredentialProviderValidationError) ErrorName() string {
-	return "ConfigCredentialProviderValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e ConfigCredentialProviderValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sConfigCredentialProvider.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ConfigCredentialProviderValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ConfigCredentialProviderValidationError{}
-
-// Validate checks the field values on ContainerCredentialProvider with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, the first error encountered is returned, or nil if there are no violations.
-func (m *ContainerCredentialProvider) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on ContainerCredentialProvider with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, the result is a list of violation errors wrapped in
-// ContainerCredentialProviderMultiError, or nil if none found.
-func (m *ContainerCredentialProvider) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *ContainerCredentialProvider) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if len(errors) > 0 {
-		return ContainerCredentialProviderMultiError(errors)
-	}
-
-	return nil
-}
-
-// ContainerCredentialProviderMultiError is an error wrapping multiple
-// validation errors returned by ContainerCredentialProvider.ValidateAll() if
-// the designated constraints aren't met.
-type ContainerCredentialProviderMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m ContainerCredentialProviderMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m ContainerCredentialProviderMultiError) AllErrors() []error { return m }
-
-// ContainerCredentialProviderValidationError is the validation error returned
-// by ContainerCredentialProvider.Validate if the designated constraints
-// aren't met.
-type ContainerCredentialProviderValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ContainerCredentialProviderValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ContainerCredentialProviderValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ContainerCredentialProviderValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ContainerCredentialProviderValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ContainerCredentialProviderValidationError) ErrorName() string {
-	return "ContainerCredentialProviderValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e ContainerCredentialProviderValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sContainerCredentialProvider.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ContainerCredentialProviderValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ContainerCredentialProviderValidationError{}
-
-// Validate checks the field values on EnvironmentCredentialProvider with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, the first error encountered is returned, or nil if there are no violations.
-func (m *EnvironmentCredentialProvider) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on EnvironmentCredentialProvider with
-// the rules defined in the proto definition for this message. If any rules
-// are violated, the result is a list of violation errors wrapped in
-// EnvironmentCredentialProviderMultiError, or nil if none found.
-func (m *EnvironmentCredentialProvider) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *EnvironmentCredentialProvider) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if len(errors) > 0 {
-		return EnvironmentCredentialProviderMultiError(errors)
-	}
-
-	return nil
-}
-
-// EnvironmentCredentialProviderMultiError is an error wrapping multiple
-// validation errors returned by EnvironmentCredentialProvider.ValidateAll()
-// if the designated constraints aren't met.
-type EnvironmentCredentialProviderMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m EnvironmentCredentialProviderMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m EnvironmentCredentialProviderMultiError) AllErrors() []error { return m }
-
-// EnvironmentCredentialProviderValidationError is the validation error
-// returned by EnvironmentCredentialProvider.Validate if the designated
-// constraints aren't met.
-type EnvironmentCredentialProviderValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e EnvironmentCredentialProviderValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e EnvironmentCredentialProviderValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e EnvironmentCredentialProviderValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e EnvironmentCredentialProviderValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e EnvironmentCredentialProviderValidationError) ErrorName() string {
-	return "EnvironmentCredentialProviderValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e EnvironmentCredentialProviderValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sEnvironmentCredentialProvider.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = EnvironmentCredentialProviderValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = EnvironmentCredentialProviderValidationError{}
-
-// Validate checks the field values on InstanceProfileCredentialProvider with
-// the rules defined in the proto definition for this message. If any rules
-// are violated, the first error encountered is returned, or nil if there are
-// no violations.
-func (m *InstanceProfileCredentialProvider) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on InstanceProfileCredentialProvider
-// with the rules defined in the proto definition for this message. If any
-// rules are violated, the result is a list of violation errors wrapped in
-// InstanceProfileCredentialProviderMultiError, or nil if none found.
-func (m *InstanceProfileCredentialProvider) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *InstanceProfileCredentialProvider) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if len(errors) > 0 {
-		return InstanceProfileCredentialProviderMultiError(errors)
-	}
-
-	return nil
-}
-
-// InstanceProfileCredentialProviderMultiError is an error wrapping multiple
-// validation errors returned by
-// InstanceProfileCredentialProvider.ValidateAll() if the designated
-// constraints aren't met.
-type InstanceProfileCredentialProviderMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m InstanceProfileCredentialProviderMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m InstanceProfileCredentialProviderMultiError) AllErrors() []error { return m }
-
-// InstanceProfileCredentialProviderValidationError is the validation error
-// returned by InstanceProfileCredentialProvider.Validate if the designated
-// constraints aren't met.
-type InstanceProfileCredentialProviderValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e InstanceProfileCredentialProviderValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e InstanceProfileCredentialProviderValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e InstanceProfileCredentialProviderValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e InstanceProfileCredentialProviderValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e InstanceProfileCredentialProviderValidationError) ErrorName() string {
-	return "InstanceProfileCredentialProviderValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e InstanceProfileCredentialProviderValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sInstanceProfileCredentialProvider.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = InstanceProfileCredentialProviderValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = InstanceProfileCredentialProviderValidationError{}
diff --git a/envoy/extensions/common/aws/v3/credential_provider_vtproto.pb.go b/envoy/extensions/common/aws/v3/credential_provider_vtproto.pb.go
index c4cad22b65..e34e0e8e21 100755
--- a/envoy/extensions/common/aws/v3/credential_provider_vtproto.pb.go
+++ b/envoy/extensions/common/aws/v3/credential_provider_vtproto.pb.go
@@ -8,7 +8,6 @@ package awsv3
 
 import (
 	protohelpers "github.com/planetscale/vtprotobuf/protohelpers"
-	durationpb "github.com/planetscale/vtprotobuf/types/known/durationpb"
 	proto "google.golang.org/protobuf/proto"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
@@ -50,56 +49,6 @@ func (m *AwsCredentialProvider) MarshalToSizedBufferVTStrict(dAtA []byte) (int,
 		i -= len(m.unknownFields)
 		copy(dAtA[i:], m.unknownFields)
 	}
-	if m.InstanceProfileCredentialProvider != nil {
-		size, err := m.InstanceProfileCredentialProvider.MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0x4a
-	}
-	if m.EnvironmentCredentialProvider != nil {
-		size, err := m.EnvironmentCredentialProvider.MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0x42
-	}
-	if m.ContainerCredentialProvider != nil {
-		size, err := m.ContainerCredentialProvider.MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0x3a
-	}
-	if m.ConfigCredentialProvider != nil {
-		size, err := m.ConfigCredentialProvider.MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0x32
-	}
-	if m.IamRolesAnywhereCredentialProvider != nil {
-		size, err := m.IamRolesAnywhereCredentialProvider.MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0x2a
-	}
 	if m.CustomCredentialProviderChain {
 		i--
 		if m.CustomCredentialProviderChain {
@@ -328,275 +277,6 @@ func (m *CredentialsFileCredentialProvider) MarshalToSizedBufferVTStrict(dAtA []
 	return len(dAtA) - i, nil
 }
 
-func (m *IAMRolesAnywhereCredentialProvider) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *IAMRolesAnywhereCredentialProvider) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *IAMRolesAnywhereCredentialProvider) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	if m.SessionDuration != nil {
-		size, err := (*durationpb.Duration)(m.SessionDuration).MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0x42
-	}
-	if len(m.RoleSessionName) > 0 {
-		i -= len(m.RoleSessionName)
-		copy(dAtA[i:], m.RoleSessionName)
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.RoleSessionName)))
-		i--
-		dAtA[i] = 0x3a
-	}
-	if len(m.ProfileArn) > 0 {
-		i -= len(m.ProfileArn)
-		copy(dAtA[i:], m.ProfileArn)
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.ProfileArn)))
-		i--
-		dAtA[i] = 0x32
-	}
-	if len(m.TrustAnchorArn) > 0 {
-		i -= len(m.TrustAnchorArn)
-		copy(dAtA[i:], m.TrustAnchorArn)
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.TrustAnchorArn)))
-		i--
-		dAtA[i] = 0x2a
-	}
-	if m.PrivateKey != nil {
-		if vtmsg, ok := interface{}(m.PrivateKey).(interface {
-			MarshalToSizedBufferVTStrict([]byte) (int, error)
-		}); ok {
-			size, err := vtmsg.MarshalToSizedBufferVTStrict(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		} else {
-			encoded, err := proto.Marshal(m.PrivateKey)
-			if err != nil {
-				return 0, err
-			}
-			i -= len(encoded)
-			copy(dAtA[i:], encoded)
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(len(encoded)))
-		}
-		i--
-		dAtA[i] = 0x22
-	}
-	if m.CertificateChain != nil {
-		if vtmsg, ok := interface{}(m.CertificateChain).(interface {
-			MarshalToSizedBufferVTStrict([]byte) (int, error)
-		}); ok {
-			size, err := vtmsg.MarshalToSizedBufferVTStrict(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		} else {
-			encoded, err := proto.Marshal(m.CertificateChain)
-			if err != nil {
-				return 0, err
-			}
-			i -= len(encoded)
-			copy(dAtA[i:], encoded)
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(len(encoded)))
-		}
-		i--
-		dAtA[i] = 0x1a
-	}
-	if m.Certificate != nil {
-		if vtmsg, ok := interface{}(m.Certificate).(interface {
-			MarshalToSizedBufferVTStrict([]byte) (int, error)
-		}); ok {
-			size, err := vtmsg.MarshalToSizedBufferVTStrict(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		} else {
-			encoded, err := proto.Marshal(m.Certificate)
-			if err != nil {
-				return 0, err
-			}
-			i -= len(encoded)
-			copy(dAtA[i:], encoded)
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(len(encoded)))
-		}
-		i--
-		dAtA[i] = 0x12
-	}
-	if len(m.RoleArn) > 0 {
-		i -= len(m.RoleArn)
-		copy(dAtA[i:], m.RoleArn)
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.RoleArn)))
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *ConfigCredentialProvider) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *ConfigCredentialProvider) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *ConfigCredentialProvider) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *ContainerCredentialProvider) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *ContainerCredentialProvider) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *ContainerCredentialProvider) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *EnvironmentCredentialProvider) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *EnvironmentCredentialProvider) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *EnvironmentCredentialProvider) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *InstanceProfileCredentialProvider) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *InstanceProfileCredentialProvider) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *InstanceProfileCredentialProvider) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	return len(dAtA) - i, nil
-}
-
 func (m *AwsCredentialProvider) SizeVT() (n int) {
 	if m == nil {
 		return 0
@@ -618,26 +298,6 @@ func (m *AwsCredentialProvider) SizeVT() (n int) {
 	if m.CustomCredentialProviderChain {
 		n += 2
 	}
-	if m.IamRolesAnywhereCredentialProvider != nil {
-		l = m.IamRolesAnywhereCredentialProvider.SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	if m.ConfigCredentialProvider != nil {
-		l = m.ConfigCredentialProvider.SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	if m.ContainerCredentialProvider != nil {
-		l = m.ContainerCredentialProvider.SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	if m.EnvironmentCredentialProvider != nil {
-		l = m.EnvironmentCredentialProvider.SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	if m.InstanceProfileCredentialProvider != nil {
-		l = m.InstanceProfileCredentialProvider.SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
 	n += len(m.unknownFields)
 	return n
 }
@@ -715,103 +375,3 @@ func (m *CredentialsFileCredentialProvider) SizeVT() (n int) {
 	n += len(m.unknownFields)
 	return n
 }
-
-func (m *IAMRolesAnywhereCredentialProvider) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = len(m.RoleArn)
-	if l > 0 {
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	if m.Certificate != nil {
-		if size, ok := interface{}(m.Certificate).(interface {
-			SizeVT() int
-		}); ok {
-			l = size.SizeVT()
-		} else {
-			l = proto.Size(m.Certificate)
-		}
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	if m.CertificateChain != nil {
-		if size, ok := interface{}(m.CertificateChain).(interface {
-			SizeVT() int
-		}); ok {
-			l = size.SizeVT()
-		} else {
-			l = proto.Size(m.CertificateChain)
-		}
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	if m.PrivateKey != nil {
-		if size, ok := interface{}(m.PrivateKey).(interface {
-			SizeVT() int
-		}); ok {
-			l = size.SizeVT()
-		} else {
-			l = proto.Size(m.PrivateKey)
-		}
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	l = len(m.TrustAnchorArn)
-	if l > 0 {
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	l = len(m.ProfileArn)
-	if l > 0 {
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	l = len(m.RoleSessionName)
-	if l > 0 {
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	if m.SessionDuration != nil {
-		l = (*durationpb.Duration)(m.SessionDuration).SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	n += len(m.unknownFields)
-	return n
-}
-
-func (m *ConfigCredentialProvider) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	n += len(m.unknownFields)
-	return n
-}
-
-func (m *ContainerCredentialProvider) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	n += len(m.unknownFields)
-	return n
-}
-
-func (m *EnvironmentCredentialProvider) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	n += len(m.unknownFields)
-	return n
-}
-
-func (m *InstanceProfileCredentialProvider) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	n += len(m.unknownFields)
-	return n
-}
diff --git a/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.validate.go b/envoy/extensions/common/dynamic_forward_proxy/v3/dns_cache.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/common/matching/v3/extension_matcher.pb.validate.go b/envoy/extensions/common/matching/v3/extension_matcher.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/common/ratelimit/v3/ratelimit.pb.validate.go b/envoy/extensions/common/ratelimit/v3/ratelimit.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/common/tap/v3/common.pb.validate.go b/envoy/extensions/common/tap/v3/common.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/compression/brotli/compressor/v3/brotli.pb.validate.go b/envoy/extensions/compression/brotli/compressor/v3/brotli.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/compression/brotli/decompressor/v3/brotli.pb.validate.go b/envoy/extensions/compression/brotli/decompressor/v3/brotli.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/compression/gzip/compressor/v3/gzip.pb.validate.go b/envoy/extensions/compression/gzip/compressor/v3/gzip.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.validate.go b/envoy/extensions/compression/gzip/decompressor/v3/gzip.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/compression/zstd/compressor/v3/zstd.pb.validate.go b/envoy/extensions/compression/zstd/compressor/v3/zstd.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/compression/zstd/decompressor/v3/zstd.pb.validate.go b/envoy/extensions/compression/zstd/decompressor/v3/zstd.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/config/validators/minimum_clusters/v3/minimum_clusters.pb.validate.go b/envoy/extensions/config/validators/minimum_clusters/v3/minimum_clusters.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/dynamic_modules/v3/dynamic_modules.pb.validate.go b/envoy/extensions/dynamic_modules/v3/dynamic_modules.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/early_data/v3/default_early_data_policy.pb.validate.go b/envoy/extensions/early_data/v3/default_early_data_policy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/common/dependency/v3/dependency.pb.validate.go b/envoy/extensions/filters/common/dependency/v3/dependency.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/common/fault/v3/fault.pb.validate.go b/envoy/extensions/filters/common/fault/v3/fault.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/common/matcher/action/v3/skip_action.pb.validate.go b/envoy/extensions/filters/common/matcher/action/v3/skip_action.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/common/set_filter_state/v3/value.pb.validate.go b/envoy/extensions/filters/common/set_filter_state/v3/value.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.validate.go b/envoy/extensions/filters/http/adaptive_concurrency/v3/adaptive_concurrency.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/admission_control/v3/admission_control.pb.validate.go b/envoy/extensions/filters/http/admission_control/v3/admission_control.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/alternate_protocols_cache/v3/alternate_protocols_cache.pb.validate.go b/envoy/extensions/filters/http/alternate_protocols_cache/v3/alternate_protocols_cache.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/api_key_auth/v3/api_key_auth.pb.go b/envoy/extensions/filters/http/api_key_auth/v3/api_key_auth.pb.go
index a431c876e6..f88aeee3b4 100755
--- a/envoy/extensions/filters/http/api_key_auth/v3/api_key_auth.pb.go
+++ b/envoy/extensions/filters/http/api_key_auth/v3/api_key_auth.pb.go
@@ -27,8 +27,7 @@ const (
 //
 // For example, the following configuration configures the filter to authenticate the clients using
 // the API key from the header “X-API-KEY“. And only the clients with the key “real-key“ are
-// considered as authenticated. The client information is configured to be forwarded
-// in the header “x-client-id“.
+// considered as authenticated.
 //
 // .. code-block:: yaml
 //
@@ -37,9 +36,6 @@ const (
 //	  client: user
 //	key_sources:
 //	 - header: "X-API-KEY"
-//	forwarding:
-//	  header: "x-client-id"
-//	  hide_credentials: false
 type ApiKeyAuth struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -49,8 +45,6 @@ type ApiKeyAuth struct {
 	Credentials []*Credential `protobuf:"bytes,1,rep,name=credentials,proto3" json:"credentials,omitempty"`
 	// The key sources to fetch the key from the coming request.
 	KeySources []*KeySource `protobuf:"bytes,2,rep,name=key_sources,json=keySources,proto3" json:"key_sources,omitempty"`
-	// Optional configuration to control what information should be propagated to upstream services.
-	Forwarding *Forwarding `protobuf:"bytes,3,opt,name=forwarding,proto3" json:"forwarding,omitempty"`
 }
 
 func (x *ApiKeyAuth) Reset() {
@@ -99,13 +93,6 @@ func (x *ApiKeyAuth) GetKeySources() []*KeySource {
 	return nil
 }
 
-func (x *ApiKeyAuth) GetForwarding() *Forwarding {
-	if x != nil {
-		return x.Forwarding
-	}
-	return nil
-}
-
 // API key auth configuration of per route or per virtual host or per route configuration.
 type ApiKeyAuthPerRoute struct {
 	state         protoimpl.MessageState
@@ -134,10 +121,6 @@ type ApiKeyAuthPerRoute struct {
 	//	credentials list across multiple routes but still use different allowed clients for each
 	//	route.
 	AllowedClients []string `protobuf:"bytes,3,rep,name=allowed_clients,json=allowedClients,proto3" json:"allowed_clients,omitempty"`
-	// Optional configuration to control what information should be propagated to upstream services.
-	// If this field is non-empty, then the forwarding information in the filter level configuration
-	// will be ignored and the forwarding in this configuration will be used.
-	Forwarding *Forwarding `protobuf:"bytes,4,opt,name=forwarding,proto3" json:"forwarding,omitempty"`
 }
 
 func (x *ApiKeyAuthPerRoute) Reset() {
@@ -193,13 +176,6 @@ func (x *ApiKeyAuthPerRoute) GetAllowedClients() []string {
 	return nil
 }
 
-func (x *ApiKeyAuthPerRoute) GetForwarding() *Forwarding {
-	if x != nil {
-		return x.Forwarding
-	}
-	return nil
-}
-
 // Single credential entry that contains the API key and the related client id.
 type Credential struct {
 	state         protoimpl.MessageState
@@ -333,67 +309,6 @@ func (x *KeySource) GetCookie() string {
 	return ""
 }
 
-type Forwarding struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// The header name in which to store the client information. If this field is non-empty,
-	// the client string associated with the matched credential will be injected into
-	// the request before forwarding upstream.
-	Header string `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"`
-	// If true, remove the API key from the request before forwarding upstream.
-	//
-	// This applies to all configured key sources: “header“, “query“, and “cookie“.
-	HideCredentials bool `protobuf:"varint,2,opt,name=hide_credentials,json=hideCredentials,proto3" json:"hide_credentials,omitempty"`
-}
-
-func (x *Forwarding) Reset() {
-	*x = Forwarding{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Forwarding) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Forwarding) ProtoMessage() {}
-
-func (x *Forwarding) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Forwarding.ProtoReflect.Descriptor instead.
-func (*Forwarding) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *Forwarding) GetHeader() string {
-	if x != nil {
-		return x.Header
-	}
-	return ""
-}
-
-func (x *Forwarding) GetHideCredentials() bool {
-	if x != nil {
-		return x.HideCredentials
-	}
-	return false
-}
-
 var File_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto protoreflect.FileDescriptor
 
 var file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_rawDesc = []byte{
@@ -411,7 +326,7 @@ var file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_rawDes
 	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74,
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61,
-	0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa7, 0x02, 0x0a,
+	0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcc, 0x01, 0x0a,
 	0x0a, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x41, 0x75, 0x74, 0x68, 0x12, 0x63, 0x0a, 0x0b, 0x63,
 	0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
 	0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
@@ -424,66 +339,49 @@ var file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_rawDes
 	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73,
 	0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x61, 0x70, 0x69, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x61, 0x75,
 	0x74, 0x68, 0x2e, 0x76, 0x33, 0x2e, 0x4b, 0x65, 0x79, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52,
-	0x0a, 0x6b, 0x65, 0x79, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x59, 0x0a, 0x0a, 0x66,
-	0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e,
-	0x61, 0x70, 0x69, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x33, 0x2e,
-	0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x0a, 0x66, 0x6f, 0x72, 0x77,
-	0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x22, 0xd8, 0x02, 0x0a, 0x12, 0x41, 0x70, 0x69, 0x4b, 0x65,
-	0x79, 0x41, 0x75, 0x74, 0x68, 0x50, 0x65, 0x72, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x63, 0x0a,
-	0x0b, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74,
-	0x74, 0x70, 0x2e, 0x61, 0x70, 0x69, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x2e,
-	0x76, 0x33, 0x2e, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x42, 0x06, 0xb8,
-	0xb7, 0x8b, 0xa4, 0x02, 0x01, 0x52, 0x0b, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61,
-	0x6c, 0x73, 0x12, 0x59, 0x0a, 0x0b, 0x6b, 0x65, 0x79, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x0a, 0x6b, 0x65, 0x79, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0xfd, 0x01, 0x0a, 0x12,
+	0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x41, 0x75, 0x74, 0x68, 0x50, 0x65, 0x72, 0x52, 0x6f, 0x75,
+	0x74, 0x65, 0x12, 0x63, 0x0a, 0x0b, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
 	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65,
 	0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x61, 0x70, 0x69, 0x5f, 0x6b, 0x65, 0x79, 0x5f,
-	0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x33, 0x2e, 0x4b, 0x65, 0x79, 0x53, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x52, 0x0a, 0x6b, 0x65, 0x79, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x27, 0x0a,
-	0x0f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x43,
-	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x59, 0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72,
-	0x64, 0x69, 0x6e, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x61, 0x70, 0x69, 0x5f, 0x6b,
-	0x65, 0x79, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x6f, 0x72, 0x77, 0x61,
-	0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x0a, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e,
-	0x67, 0x22, 0x48, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x12,
-	0x19, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42,
-	0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x06, 0x63, 0x6c,
-	0x69, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72,
-	0x02, 0x10, 0x01, 0x52, 0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x22, 0x81, 0x01, 0x0a, 0x09,
-	0x4b, 0x65, 0x79, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x29, 0x0a, 0x06, 0x68, 0x65, 0x61,
-	0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x11, 0xfa, 0x42, 0x0e, 0x72, 0x0c,
-	0x18, 0x80, 0x08, 0xc8, 0x01, 0x00, 0xd0, 0x01, 0x01, 0xc0, 0x01, 0x01, 0x52, 0x06, 0x68, 0x65,
-	0x61, 0x64, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x72, 0x03, 0x18, 0x80, 0x08, 0x52, 0x05, 0x71,
-	0x75, 0x65, 0x72, 0x79, 0x12, 0x29, 0x0a, 0x06, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x42, 0x11, 0xfa, 0x42, 0x0e, 0x72, 0x0c, 0x18, 0x80, 0x08, 0xc8, 0x01,
-	0x00, 0xd0, 0x01, 0x01, 0xc0, 0x01, 0x01, 0x52, 0x06, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x22,
-	0x5f, 0x0a, 0x0a, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x26, 0x0a,
-	0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0e, 0xfa,
-	0x42, 0x0b, 0x72, 0x09, 0x18, 0x80, 0x08, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x06, 0x68,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x29, 0x0a, 0x10, 0x68, 0x69, 0x64, 0x65, 0x5f, 0x63, 0x72,
-	0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x0f, 0x68, 0x69, 0x64, 0x65, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73,
-	0x42, 0xc5, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0xd2, 0xc6, 0xa4, 0xe1, 0x06,
-	0x02, 0x08, 0x01, 0x0a, 0x3b, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70,
-	0x2e, 0x61, 0x70, 0x69, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x33,
-	0x42, 0x0f, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x41, 0x75, 0x74, 0x68, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x50, 0x01, 0x5a, 0x63, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
-	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x61, 0x70, 0x69, 0x5f, 0x6b, 0x65,
-	0x79, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x3b, 0x61, 0x70, 0x69, 0x5f, 0x6b, 0x65,
-	0x79, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69,
+	0x61, 0x6c, 0x42, 0x06, 0xb8, 0xb7, 0x8b, 0xa4, 0x02, 0x01, 0x52, 0x0b, 0x63, 0x72, 0x65, 0x64,
+	0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x12, 0x59, 0x0a, 0x0b, 0x6b, 0x65, 0x79, 0x5f, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
+	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x61, 0x70, 0x69,
+	0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x33, 0x2e, 0x4b, 0x65, 0x79,
+	0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x0a, 0x6b, 0x65, 0x79, 0x53, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x5f, 0x63, 0x6c,
+	0x69, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x61, 0x6c, 0x6c,
+	0x6f, 0x77, 0x65, 0x64, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x48, 0x0a, 0x0a, 0x43,
+	0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x12, 0x19, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52,
+	0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x06, 0x63,
+	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x22, 0x81, 0x01, 0x0a, 0x09, 0x4b, 0x65, 0x79, 0x53, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x12, 0x29, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x42, 0x11, 0xfa, 0x42, 0x0e, 0x72, 0x0c, 0x18, 0x80, 0x08, 0xc8, 0x01, 0x00,
+	0xd0, 0x01, 0x01, 0xc0, 0x01, 0x01, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x1e,
+	0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x08, 0xfa,
+	0x42, 0x05, 0x72, 0x03, 0x18, 0x80, 0x08, 0x52, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x12, 0x29,
+	0x0a, 0x06, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x11,
+	0xfa, 0x42, 0x0e, 0x72, 0x0c, 0x18, 0x80, 0x08, 0xc8, 0x01, 0x00, 0xd0, 0x01, 0x01, 0xc0, 0x01,
+	0x01, 0x52, 0x06, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x42, 0xc5, 0x01, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x02, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x0a, 0x3b, 0x69, 0x6f,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x61, 0x70, 0x69, 0x5f, 0x6b, 0x65,
+	0x79, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x41, 0x70, 0x69, 0x4b, 0x65,
+	0x79, 0x41, 0x75, 0x74, 0x68, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x63, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74,
+	0x74, 0x70, 0x2f, 0x61, 0x70, 0x69, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x2f,
+	0x76, 0x33, 0x3b, 0x61, 0x70, 0x69, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x76,
+	0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -498,26 +396,23 @@ func file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_rawDe
 	return file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_rawDescData
 }
 
-var file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_goTypes = []interface{}{
 	(*ApiKeyAuth)(nil),         // 0: envoy.extensions.filters.http.api_key_auth.v3.ApiKeyAuth
 	(*ApiKeyAuthPerRoute)(nil), // 1: envoy.extensions.filters.http.api_key_auth.v3.ApiKeyAuthPerRoute
 	(*Credential)(nil),         // 2: envoy.extensions.filters.http.api_key_auth.v3.Credential
 	(*KeySource)(nil),          // 3: envoy.extensions.filters.http.api_key_auth.v3.KeySource
-	(*Forwarding)(nil),         // 4: envoy.extensions.filters.http.api_key_auth.v3.Forwarding
 }
 var file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_depIdxs = []int32{
 	2, // 0: envoy.extensions.filters.http.api_key_auth.v3.ApiKeyAuth.credentials:type_name -> envoy.extensions.filters.http.api_key_auth.v3.Credential
 	3, // 1: envoy.extensions.filters.http.api_key_auth.v3.ApiKeyAuth.key_sources:type_name -> envoy.extensions.filters.http.api_key_auth.v3.KeySource
-	4, // 2: envoy.extensions.filters.http.api_key_auth.v3.ApiKeyAuth.forwarding:type_name -> envoy.extensions.filters.http.api_key_auth.v3.Forwarding
-	2, // 3: envoy.extensions.filters.http.api_key_auth.v3.ApiKeyAuthPerRoute.credentials:type_name -> envoy.extensions.filters.http.api_key_auth.v3.Credential
-	3, // 4: envoy.extensions.filters.http.api_key_auth.v3.ApiKeyAuthPerRoute.key_sources:type_name -> envoy.extensions.filters.http.api_key_auth.v3.KeySource
-	4, // 5: envoy.extensions.filters.http.api_key_auth.v3.ApiKeyAuthPerRoute.forwarding:type_name -> envoy.extensions.filters.http.api_key_auth.v3.Forwarding
-	6, // [6:6] is the sub-list for method output_type
-	6, // [6:6] is the sub-list for method input_type
-	6, // [6:6] is the sub-list for extension type_name
-	6, // [6:6] is the sub-list for extension extendee
-	0, // [0:6] is the sub-list for field type_name
+	2, // 2: envoy.extensions.filters.http.api_key_auth.v3.ApiKeyAuthPerRoute.credentials:type_name -> envoy.extensions.filters.http.api_key_auth.v3.Credential
+	3, // 3: envoy.extensions.filters.http.api_key_auth.v3.ApiKeyAuthPerRoute.key_sources:type_name -> envoy.extensions.filters.http.api_key_auth.v3.KeySource
+	4, // [4:4] is the sub-list for method output_type
+	4, // [4:4] is the sub-list for method input_type
+	4, // [4:4] is the sub-list for extension type_name
+	4, // [4:4] is the sub-list for extension extendee
+	0, // [0:4] is the sub-list for field type_name
 }
 
 func init() { file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_init() }
@@ -574,18 +469,6 @@ func file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_init(
 				return nil
 			}
 		}
-		file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Forwarding); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -593,7 +476,7 @@ func file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_init(
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_envoy_extensions_filters_http_api_key_auth_v3_api_key_auth_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   5,
+			NumMessages:   4,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/envoy/extensions/filters/http/api_key_auth/v3/api_key_auth.pb.validate.go b/envoy/extensions/filters/http/api_key_auth/v3/api_key_auth.pb.validate.go
old mode 100755
new mode 100644
index f3940c60c6..3a5aab17f5
--- a/envoy/extensions/filters/http/api_key_auth/v3/api_key_auth.pb.validate.go
+++ b/envoy/extensions/filters/http/api_key_auth/v3/api_key_auth.pb.validate.go
@@ -126,35 +126,6 @@ func (m *ApiKeyAuth) validate(all bool) error {
 
 	}
 
-	if all {
-		switch v := interface{}(m.GetForwarding()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, ApiKeyAuthValidationError{
-					field:  "Forwarding",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, ApiKeyAuthValidationError{
-					field:  "Forwarding",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetForwarding()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ApiKeyAuthValidationError{
-				field:  "Forwarding",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
 	if len(errors) > 0 {
 		return ApiKeyAuthMultiError(errors)
 	}
@@ -322,35 +293,6 @@ func (m *ApiKeyAuthPerRoute) validate(all bool) error {
 
 	}
 
-	if all {
-		switch v := interface{}(m.GetForwarding()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, ApiKeyAuthPerRouteValidationError{
-					field:  "Forwarding",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, ApiKeyAuthPerRouteValidationError{
-					field:  "Forwarding",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetForwarding()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ApiKeyAuthPerRouteValidationError{
-				field:  "Forwarding",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
 	if len(errors) > 0 {
 		return ApiKeyAuthPerRouteMultiError(errors)
 	}
@@ -717,128 +659,3 @@ var _ interface {
 var _KeySource_Header_Pattern = regexp.MustCompile("^[^\x00\n\r]*$")
 
 var _KeySource_Cookie_Pattern = regexp.MustCompile("^[^\x00\n\r]*$")
-
-// Validate checks the field values on Forwarding with the rules defined in the
-// proto definition for this message. If any rules are violated, the first
-// error encountered is returned, or nil if there are no violations.
-func (m *Forwarding) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on Forwarding with the rules defined in
-// the proto definition for this message. If any rules are violated, the
-// result is a list of violation errors wrapped in ForwardingMultiError, or
-// nil if none found.
-func (m *Forwarding) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *Forwarding) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if utf8.RuneCountInString(m.GetHeader()) > 1024 {
-		err := ForwardingValidationError{
-			field:  "Header",
-			reason: "value length must be at most 1024 runes",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	if !_Forwarding_Header_Pattern.MatchString(m.GetHeader()) {
-		err := ForwardingValidationError{
-			field:  "Header",
-			reason: "value does not match regex pattern \"^[^\\x00\\n\\r]*$\"",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	// no validation rules for HideCredentials
-
-	if len(errors) > 0 {
-		return ForwardingMultiError(errors)
-	}
-
-	return nil
-}
-
-// ForwardingMultiError is an error wrapping multiple validation errors
-// returned by Forwarding.ValidateAll() if the designated constraints aren't met.
-type ForwardingMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m ForwardingMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m ForwardingMultiError) AllErrors() []error { return m }
-
-// ForwardingValidationError is the validation error returned by
-// Forwarding.Validate if the designated constraints aren't met.
-type ForwardingValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ForwardingValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ForwardingValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ForwardingValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ForwardingValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ForwardingValidationError) ErrorName() string { return "ForwardingValidationError" }
-
-// Error satisfies the builtin error interface
-func (e ForwardingValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sForwarding.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ForwardingValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ForwardingValidationError{}
-
-var _Forwarding_Header_Pattern = regexp.MustCompile("^[^\x00\n\r]*$")
diff --git a/envoy/extensions/filters/http/api_key_auth/v3/api_key_auth_vtproto.pb.go b/envoy/extensions/filters/http/api_key_auth/v3/api_key_auth_vtproto.pb.go
index 929cea1abd..c1a0055441 100755
--- a/envoy/extensions/filters/http/api_key_auth/v3/api_key_auth_vtproto.pb.go
+++ b/envoy/extensions/filters/http/api_key_auth/v3/api_key_auth_vtproto.pb.go
@@ -48,16 +48,6 @@ func (m *ApiKeyAuth) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
 		i -= len(m.unknownFields)
 		copy(dAtA[i:], m.unknownFields)
 	}
-	if m.Forwarding != nil {
-		size, err := m.Forwarding.MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0x1a
-	}
 	if len(m.KeySources) > 0 {
 		for iNdEx := len(m.KeySources) - 1; iNdEx >= 0; iNdEx-- {
 			size, err := m.KeySources[iNdEx].MarshalToSizedBufferVTStrict(dAtA[:i])
@@ -115,16 +105,6 @@ func (m *ApiKeyAuthPerRoute) MarshalToSizedBufferVTStrict(dAtA []byte) (int, err
 		i -= len(m.unknownFields)
 		copy(dAtA[i:], m.unknownFields)
 	}
-	if m.Forwarding != nil {
-		size, err := m.Forwarding.MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0x22
-	}
 	if len(m.AllowedClients) > 0 {
 		for iNdEx := len(m.AllowedClients) - 1; iNdEx >= 0; iNdEx-- {
 			i -= len(m.AllowedClients[iNdEx])
@@ -262,56 +242,6 @@ func (m *KeySource) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
-func (m *Forwarding) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *Forwarding) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *Forwarding) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	if m.HideCredentials {
-		i--
-		if m.HideCredentials {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i--
-		dAtA[i] = 0x10
-	}
-	if len(m.Header) > 0 {
-		i -= len(m.Header)
-		copy(dAtA[i:], m.Header)
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.Header)))
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
 func (m *ApiKeyAuth) SizeVT() (n int) {
 	if m == nil {
 		return 0
@@ -330,10 +260,6 @@ func (m *ApiKeyAuth) SizeVT() (n int) {
 			n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
 		}
 	}
-	if m.Forwarding != nil {
-		l = m.Forwarding.SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
 	n += len(m.unknownFields)
 	return n
 }
@@ -362,10 +288,6 @@ func (m *ApiKeyAuthPerRoute) SizeVT() (n int) {
 			n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
 		}
 	}
-	if m.Forwarding != nil {
-		l = m.Forwarding.SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
 	n += len(m.unknownFields)
 	return n
 }
@@ -409,20 +331,3 @@ func (m *KeySource) SizeVT() (n int) {
 	n += len(m.unknownFields)
 	return n
 }
-
-func (m *Forwarding) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = len(m.Header)
-	if l > 0 {
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	if m.HideCredentials {
-		n += 2
-	}
-	n += len(m.unknownFields)
-	return n
-}
diff --git a/envoy/extensions/filters/http/aws_lambda/v3/aws_lambda.pb.validate.go b/envoy/extensions/filters/http/aws_lambda/v3/aws_lambda.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.go b/envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.go
index 325118492d..541840d96e 100755
--- a/envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.go
+++ b/envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.go
@@ -137,7 +137,7 @@ type AwsRequestSigning struct {
 	// query_string: {}
 	QueryString *AwsRequestSigning_QueryString `protobuf:"bytes,7,opt,name=query_string,json=queryString,proto3" json:"query_string,omitempty"`
 	// The credential provider for signing the request. This is optional and if not set,
-	// it will be retrieved using the procedure described in :ref:`config_http_filters_aws_request_signing`.
+	// it will be retrieved from the procedure described in :ref:`config_http_filters_aws_request_signing`.
 	CredentialProvider *v31.AwsCredentialProvider `protobuf:"bytes,8,opt,name=credential_provider,json=credentialProvider,proto3" json:"credential_provider,omitempty"`
 }
 
diff --git a/envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.validate.go b/envoy/extensions/filters/http/aws_request_signing/v3/aws_request_signing.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/bandwidth_limit/v3/bandwidth_limit.pb.validate.go b/envoy/extensions/filters/http/bandwidth_limit/v3/bandwidth_limit.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/basic_auth/v3/basic_auth.pb.validate.go b/envoy/extensions/filters/http/basic_auth/v3/basic_auth.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/buffer/v3/buffer.pb.validate.go b/envoy/extensions/filters/http/buffer/v3/buffer.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/cache/v3/cache.pb.validate.go b/envoy/extensions/filters/http/cache/v3/cache.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/cdn_loop/v3/cdn_loop.pb.validate.go b/envoy/extensions/filters/http/cdn_loop/v3/cdn_loop.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/composite/v3/composite.pb.validate.go b/envoy/extensions/filters/http/composite/v3/composite.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/compressor/v3/compressor.pb.validate.go b/envoy/extensions/filters/http/compressor/v3/compressor.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/connect_grpc_bridge/v3/config.pb.validate.go b/envoy/extensions/filters/http/connect_grpc_bridge/v3/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/cors/v3/cors.pb.validate.go b/envoy/extensions/filters/http/cors/v3/cors.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/credential_injector/v3/credential_injector.pb.validate.go b/envoy/extensions/filters/http/credential_injector/v3/credential_injector.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/csrf/v3/csrf.pb.validate.go b/envoy/extensions/filters/http/csrf/v3/csrf.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/custom_response/v3/custom_response.pb.validate.go b/envoy/extensions/filters/http/custom_response/v3/custom_response.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/decompressor/v3/decompressor.pb.validate.go b/envoy/extensions/filters/http/decompressor/v3/decompressor.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.go b/envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.go
index d9d1095b15..3e8e2929d6 100755
--- a/envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.go
+++ b/envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.go
@@ -200,12 +200,11 @@ type PerRouteConfig_HostRewriteLiteral struct {
 	// this value. If not set or empty, the original host header value
 	// will be used and no rewrite will happen.
 	//
-	// .. note::
-	//
-	//	This rewrite affects both DNS lookup and host header forwarding. However, this option shouldn't be used with
-	//	:ref:`HCM host rewrite header <envoy_v3_api_field_config.route.v3.RouteAction.auto_host_rewrite>` given that
-	//	the value set here would be used for DNS lookups whereas the value set in the HCM would be used for host
-	//	header forwarding which might not be the desired outcome.
+	// Note: this rewrite affects both DNS lookup and host header forwarding. However, this
+	// option shouldn't be used with
+	// :ref:`HCM host rewrite <envoy_v3_api_field_config.route.v3.RouteAction.host_rewrite_literal>` given that the
+	// value set here would be used for DNS lookups whereas the value set in the HCM would be used
+	// for host header forwarding which is not the desired outcome.
 	HostRewriteLiteral string `protobuf:"bytes,1,opt,name=host_rewrite_literal,json=hostRewriteLiteral,proto3,oneof"`
 }
 
@@ -214,12 +213,11 @@ type PerRouteConfig_HostRewriteHeader struct {
 	// the value of this header. If not set or empty, the original host header
 	// value will be used and no rewrite will happen.
 	//
-	// .. note::
-	//
-	//	This rewrite affects both DNS lookup and host header forwarding. However, this option shouldn't be used with
-	//	:ref:`HCM host rewrite header <envoy_v3_api_field_config.route.v3.RouteAction.auto_host_rewrite>` given that
-	//	the value set here would be used for DNS lookups whereas the value set in the HCM would be used for host
-	//	header forwarding which might not be the desired outcome.
+	// Note: this rewrite affects both DNS lookup and host header forwarding. However, this
+	// option shouldn't be used with
+	// :ref:`HCM host rewrite header <envoy_v3_api_field_config.route.v3.RouteAction.auto_host_rewrite>`
+	// given that the value set here would be used for DNS lookups whereas the value set in the HCM
+	// would be used for host header forwarding which is not the desired outcome.
 	//
 	// .. note::
 	//
@@ -236,7 +234,7 @@ type SubClusterConfig struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// The timeout used for sub cluster initialization. Defaults to **5s** if not set.
+	// The timeout used for sub cluster initialization. Defaults to 5s if not set.
 	ClusterInitTimeout *durationpb.Duration `protobuf:"bytes,3,opt,name=cluster_init_timeout,json=clusterInitTimeout,proto3" json:"cluster_init_timeout,omitempty"`
 }
 
diff --git a/envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.validate.go b/envoy/extensions/filters/http/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/dynamic_modules/v3/dynamic_modules.pb.go b/envoy/extensions/filters/http/dynamic_modules/v3/dynamic_modules.pb.go
index 25458be667..9a1ea7cf23 100755
--- a/envoy/extensions/filters/http/dynamic_modules/v3/dynamic_modules.pb.go
+++ b/envoy/extensions/filters/http/dynamic_modules/v3/dynamic_modules.pb.go
@@ -120,100 +120,6 @@ func (x *DynamicModuleFilter) GetFilterConfig() *anypb.Any {
 	return nil
 }
 
-// Configuration of the HTTP per-route filter for dynamic modules. This filter allows loading shared object files
-// that can be loaded via dlopen by the HTTP filter.
-type DynamicModuleFilterPerRoute struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Specifies the shared-object level configuration.
-	DynamicModuleConfig *v3.DynamicModuleConfig `protobuf:"bytes,1,opt,name=dynamic_module_config,json=dynamicModuleConfig,proto3" json:"dynamic_module_config,omitempty"`
-	// The name for this filter configuration. This can be used to distinguish between different filter implementations
-	// inside a dynamic module. For example, a module can have completely different filter implementations.
-	// When Envoy receives this configuration, it passes the filter_name to the dynamic module's HTTP per-route filter config init function
-	// together with the filter_config.
-	// That way a module can decide which in-module filter implementation to use based on the name at load time.
-	PerRouteConfigName string `protobuf:"bytes,2,opt,name=per_route_config_name,json=perRouteConfigName,proto3" json:"per_route_config_name,omitempty"`
-	// The configuration for the filter chosen by filter_name. This is passed to the module's HTTP per-route filter initialization function.
-	// Together with the filter_name, the module can decide which in-module filter implementation to use and
-	// fine-tune the behavior of the filter on a specific route.
-	//
-	// For example, if a module has two filter implementations, one for logging and one for header manipulation,
-	// filter_name is used to choose either logging or header manipulation. The filter_config can be used to
-	// configure the logging level or the header manipulation behavior.
-	//
-	// “google.protobuf.Struct“ is serialized as JSON before
-	// passing it to the plugin. “google.protobuf.BytesValue“ and
-	// “google.protobuf.StringValue“ are passed directly without the wrapper.
-	//
-	// .. code-block:: yaml
-	//
-	//	# Passing in a string
-	//	filter_config:
-	//	  "@type": "type.googleapis.com/google.protobuf.StringValue"
-	//	  value: hello
-	//
-	//	# Passing in raw bytes
-	//	filter_config:
-	//	  "@type": "type.googleapis.com/google.protobuf.BytesValue"
-	//	  value: aGVsbG8= # echo -n "hello" | base64
-	FilterConfig *anypb.Any `protobuf:"bytes,3,opt,name=filter_config,json=filterConfig,proto3" json:"filter_config,omitempty"`
-}
-
-func (x *DynamicModuleFilterPerRoute) Reset() {
-	*x = DynamicModuleFilterPerRoute{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DynamicModuleFilterPerRoute) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DynamicModuleFilterPerRoute) ProtoMessage() {}
-
-func (x *DynamicModuleFilterPerRoute) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DynamicModuleFilterPerRoute.ProtoReflect.Descriptor instead.
-func (*DynamicModuleFilterPerRoute) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *DynamicModuleFilterPerRoute) GetDynamicModuleConfig() *v3.DynamicModuleConfig {
-	if x != nil {
-		return x.DynamicModuleConfig
-	}
-	return nil
-}
-
-func (x *DynamicModuleFilterPerRoute) GetPerRouteConfigName() string {
-	if x != nil {
-		return x.PerRouteConfigName
-	}
-	return ""
-}
-
-func (x *DynamicModuleFilterPerRoute) GetFilterConfig() *anypb.Any {
-	if x != nil {
-		return x.FilterConfig
-	}
-	return nil
-}
-
 var File_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto protoreflect.FileDescriptor
 
 var file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto_rawDesc = []byte{
@@ -246,36 +152,20 @@ var file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto_
 	0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e,
 	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
 	0x41, 0x6e, 0x79, 0x52, 0x0c, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x22, 0xf9, 0x01, 0x0a, 0x1b, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x6f, 0x64,
-	0x75, 0x6c, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x50, 0x65, 0x72, 0x52, 0x6f, 0x75, 0x74,
-	0x65, 0x12, 0x6c, 0x0a, 0x15, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, 0x6d, 0x6f, 0x64,
-	0x75, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x38, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x2e, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, 0x6d, 0x6f, 0x64, 0x75,
-	0x6c, 0x65, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x6f,
-	0x64, 0x75, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x13, 0x64, 0x79, 0x6e, 0x61,
-	0x6d, 0x69, 0x63, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
-	0x31, 0x0a, 0x15, 0x70, 0x65, 0x72, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x5f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12,
-	0x70, 0x65, 0x72, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x4e, 0x61,
-	0x6d, 0x65, 0x12, 0x39, 0x0a, 0x0d, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52,
-	0x0c, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xca, 0x01,
-	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x3e, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73,
-	0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, 0x6d, 0x6f,
-	0x64, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x13, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69,
-	0x63, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x69, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-	0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73,
-	0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, 0x6d, 0x6f,
-	0x64, 0x75, 0x6c, 0x65, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63,
-	0x5f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x67, 0x42, 0xca, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x3e, 0x69, 0x6f,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69,
+	0x63, 0x5f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x13, 0x44, 0x79,
+	0x6e, 0x61, 0x6d, 0x69, 0x63, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x69, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f,
+	0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69,
+	0x63, 0x5f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x64, 0x79, 0x6e,
+	0x61, 0x6d, 0x69, 0x63, 0x5f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x76, 0x33, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -290,23 +180,20 @@ func file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto
 	return file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto_rawDescData
 }
 
-var file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto_goTypes = []interface{}{
-	(*DynamicModuleFilter)(nil),         // 0: envoy.extensions.filters.http.dynamic_modules.v3.DynamicModuleFilter
-	(*DynamicModuleFilterPerRoute)(nil), // 1: envoy.extensions.filters.http.dynamic_modules.v3.DynamicModuleFilterPerRoute
-	(*v3.DynamicModuleConfig)(nil),      // 2: envoy.extensions.dynamic_modules.v3.DynamicModuleConfig
-	(*anypb.Any)(nil),                   // 3: google.protobuf.Any
+	(*DynamicModuleFilter)(nil),    // 0: envoy.extensions.filters.http.dynamic_modules.v3.DynamicModuleFilter
+	(*v3.DynamicModuleConfig)(nil), // 1: envoy.extensions.dynamic_modules.v3.DynamicModuleConfig
+	(*anypb.Any)(nil),              // 2: google.protobuf.Any
 }
 var file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto_depIdxs = []int32{
-	2, // 0: envoy.extensions.filters.http.dynamic_modules.v3.DynamicModuleFilter.dynamic_module_config:type_name -> envoy.extensions.dynamic_modules.v3.DynamicModuleConfig
-	3, // 1: envoy.extensions.filters.http.dynamic_modules.v3.DynamicModuleFilter.filter_config:type_name -> google.protobuf.Any
-	2, // 2: envoy.extensions.filters.http.dynamic_modules.v3.DynamicModuleFilterPerRoute.dynamic_module_config:type_name -> envoy.extensions.dynamic_modules.v3.DynamicModuleConfig
-	3, // 3: envoy.extensions.filters.http.dynamic_modules.v3.DynamicModuleFilterPerRoute.filter_config:type_name -> google.protobuf.Any
-	4, // [4:4] is the sub-list for method output_type
-	4, // [4:4] is the sub-list for method input_type
-	4, // [4:4] is the sub-list for extension type_name
-	4, // [4:4] is the sub-list for extension extendee
-	0, // [0:4] is the sub-list for field type_name
+	1, // 0: envoy.extensions.filters.http.dynamic_modules.v3.DynamicModuleFilter.dynamic_module_config:type_name -> envoy.extensions.dynamic_modules.v3.DynamicModuleConfig
+	2, // 1: envoy.extensions.filters.http.dynamic_modules.v3.DynamicModuleFilter.filter_config:type_name -> google.protobuf.Any
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
 }
 
 func init() { file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto_init() }
@@ -327,18 +214,6 @@ func file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto
 				return nil
 			}
 		}
-		file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DynamicModuleFilterPerRoute); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -346,7 +221,7 @@ func file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_envoy_extensions_filters_http_dynamic_modules_v3_dynamic_modules_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   2,
+			NumMessages:   1,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/envoy/extensions/filters/http/dynamic_modules/v3/dynamic_modules.pb.validate.go b/envoy/extensions/filters/http/dynamic_modules/v3/dynamic_modules.pb.validate.go
old mode 100755
new mode 100644
index 8c3221ae0a..ee1147cafa
--- a/envoy/extensions/filters/http/dynamic_modules/v3/dynamic_modules.pb.validate.go
+++ b/envoy/extensions/filters/http/dynamic_modules/v3/dynamic_modules.pb.validate.go
@@ -197,166 +197,3 @@ var _ interface {
 	Cause() error
 	ErrorName() string
 } = DynamicModuleFilterValidationError{}
-
-// Validate checks the field values on DynamicModuleFilterPerRoute with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, the first error encountered is returned, or nil if there are no violations.
-func (m *DynamicModuleFilterPerRoute) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on DynamicModuleFilterPerRoute with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, the result is a list of violation errors wrapped in
-// DynamicModuleFilterPerRouteMultiError, or nil if none found.
-func (m *DynamicModuleFilterPerRoute) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *DynamicModuleFilterPerRoute) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if all {
-		switch v := interface{}(m.GetDynamicModuleConfig()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, DynamicModuleFilterPerRouteValidationError{
-					field:  "DynamicModuleConfig",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, DynamicModuleFilterPerRouteValidationError{
-					field:  "DynamicModuleConfig",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetDynamicModuleConfig()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return DynamicModuleFilterPerRouteValidationError{
-				field:  "DynamicModuleConfig",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	// no validation rules for PerRouteConfigName
-
-	if all {
-		switch v := interface{}(m.GetFilterConfig()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, DynamicModuleFilterPerRouteValidationError{
-					field:  "FilterConfig",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, DynamicModuleFilterPerRouteValidationError{
-					field:  "FilterConfig",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetFilterConfig()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return DynamicModuleFilterPerRouteValidationError{
-				field:  "FilterConfig",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if len(errors) > 0 {
-		return DynamicModuleFilterPerRouteMultiError(errors)
-	}
-
-	return nil
-}
-
-// DynamicModuleFilterPerRouteMultiError is an error wrapping multiple
-// validation errors returned by DynamicModuleFilterPerRoute.ValidateAll() if
-// the designated constraints aren't met.
-type DynamicModuleFilterPerRouteMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m DynamicModuleFilterPerRouteMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m DynamicModuleFilterPerRouteMultiError) AllErrors() []error { return m }
-
-// DynamicModuleFilterPerRouteValidationError is the validation error returned
-// by DynamicModuleFilterPerRoute.Validate if the designated constraints
-// aren't met.
-type DynamicModuleFilterPerRouteValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e DynamicModuleFilterPerRouteValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e DynamicModuleFilterPerRouteValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e DynamicModuleFilterPerRouteValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e DynamicModuleFilterPerRouteValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e DynamicModuleFilterPerRouteValidationError) ErrorName() string {
-	return "DynamicModuleFilterPerRouteValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e DynamicModuleFilterPerRouteValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sDynamicModuleFilterPerRoute.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = DynamicModuleFilterPerRouteValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = DynamicModuleFilterPerRouteValidationError{}
diff --git a/envoy/extensions/filters/http/dynamic_modules/v3/dynamic_modules_vtproto.pb.go b/envoy/extensions/filters/http/dynamic_modules/v3/dynamic_modules_vtproto.pb.go
index de5f66b649..8429c61f39 100755
--- a/envoy/extensions/filters/http/dynamic_modules/v3/dynamic_modules_vtproto.pb.go
+++ b/envoy/extensions/filters/http/dynamic_modules/v3/dynamic_modules_vtproto.pb.go
@@ -92,78 +92,6 @@ func (m *DynamicModuleFilter) MarshalToSizedBufferVTStrict(dAtA []byte) (int, er
 	return len(dAtA) - i, nil
 }
 
-func (m *DynamicModuleFilterPerRoute) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *DynamicModuleFilterPerRoute) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *DynamicModuleFilterPerRoute) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	if m.FilterConfig != nil {
-		size, err := (*anypb.Any)(m.FilterConfig).MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0x1a
-	}
-	if len(m.PerRouteConfigName) > 0 {
-		i -= len(m.PerRouteConfigName)
-		copy(dAtA[i:], m.PerRouteConfigName)
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.PerRouteConfigName)))
-		i--
-		dAtA[i] = 0x12
-	}
-	if m.DynamicModuleConfig != nil {
-		if vtmsg, ok := interface{}(m.DynamicModuleConfig).(interface {
-			MarshalToSizedBufferVTStrict([]byte) (int, error)
-		}); ok {
-			size, err := vtmsg.MarshalToSizedBufferVTStrict(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		} else {
-			encoded, err := proto.Marshal(m.DynamicModuleConfig)
-			if err != nil {
-				return 0, err
-			}
-			i -= len(encoded)
-			copy(dAtA[i:], encoded)
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(len(encoded)))
-		}
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
 func (m *DynamicModuleFilter) SizeVT() (n int) {
 	if m == nil {
 		return 0
@@ -191,31 +119,3 @@ func (m *DynamicModuleFilter) SizeVT() (n int) {
 	n += len(m.unknownFields)
 	return n
 }
-
-func (m *DynamicModuleFilterPerRoute) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.DynamicModuleConfig != nil {
-		if size, ok := interface{}(m.DynamicModuleConfig).(interface {
-			SizeVT() int
-		}); ok {
-			l = size.SizeVT()
-		} else {
-			l = proto.Size(m.DynamicModuleConfig)
-		}
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	l = len(m.PerRouteConfigName)
-	if l > 0 {
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	if m.FilterConfig != nil {
-		l = (*anypb.Any)(m.FilterConfig).SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	n += len(m.unknownFields)
-	return n
-}
diff --git a/envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.validate.go b/envoy/extensions/filters/http/ext_authz/v3/ext_authz.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/ext_proc/v3/ext_proc.pb.go b/envoy/extensions/filters/http/ext_proc/v3/ext_proc.pb.go
index 6bb940454d..6a9ed52af0 100755
--- a/envoy/extensions/filters/http/ext_proc/v3/ext_proc.pb.go
+++ b/envoy/extensions/filters/http/ext_proc/v3/ext_proc.pb.go
@@ -37,11 +37,11 @@ const (
 	// :ref:`clear_route_cache <envoy_v3_api_field_service.ext_proc.v3.CommonResponse.clear_route_cache>`
 	// field is set in an external processor response.
 	ExternalProcessor_DEFAULT ExternalProcessor_RouteCacheAction = 0
-	// Always clear the route cache irrespective of the “clear_route_cache“ bit in
+	// Always clear the route cache irrespective of the clear_route_cache bit in
 	// the external processor response.
 	ExternalProcessor_CLEAR ExternalProcessor_RouteCacheAction = 1
-	// Do not clear the route cache irrespective of the “clear_route_cache“ bit in
-	// the external processor response. Setting to “RETAIN“ is equivalent to setting the
+	// Do not clear the route cache irrespective of the clear_route_cache bit in
+	// the external processor response. Setting to RETAIN is equivalent to set the
 	// :ref:`disable_clear_route_cache <envoy_v3_api_field_extensions.filters.http.ext_proc.v3.ExternalProcessor.disable_clear_route_cache>`
 	// to true.
 	ExternalProcessor_RETAIN ExternalProcessor_RouteCacheAction = 2
@@ -91,10 +91,10 @@ func (ExternalProcessor_RouteCacheAction) EnumDescriptor() ([]byte, []int) {
 // The filter communicates with an external gRPC service called an "external processor"
 // that can do a variety of things with the request and response:
 //
-// * Access and modify the HTTP headers on the request, response, or both.
-// * Access and modify the HTTP request and response bodies.
-// * Access and modify the dynamic stream metadata.
-// * Immediately send an HTTP response downstream and terminate other processing.
+// * Access and modify the HTTP headers on the request, response, or both
+// * Access and modify the HTTP request and response bodies
+// * Access and modify the dynamic stream metadata
+// * Immediately send an HTTP response downstream and terminate other processing
 //
 // The filter communicates with the server using a gRPC bidirectional stream. After the initial
 // request, the external server is in control over what additional data is sent to it
@@ -102,11 +102,11 @@ func (ExternalProcessor_RouteCacheAction) EnumDescriptor() ([]byte, []int) {
 //
 // By implementing the protocol specified by the stream, the external server can choose:
 //
-//   - Whether it receives the response message at all.
-//   - Whether it receives the message body at all, in separate chunks, or as a single buffer.
+//   - Whether it receives the response message at all
+//   - Whether it receives the message body at all, in separate chunks, or as a single buffer
 //   - Whether subsequent HTTP requests are transmitted synchronously or whether they are
 //     sent asynchronously.
-//   - To modify request or response trailers if they already exist.
+//   - To modify request or response trailers if they already exist
 //
 // The filter supports up to six different processing steps. Each is represented by
 // a gRPC stream message that is sent to the external processor. For each message, the
@@ -114,10 +114,10 @@ func (ExternalProcessor_RouteCacheAction) EnumDescriptor() ([]byte, []int) {
 //
 //   - Request headers: Contains the headers from the original HTTP request.
 //   - Request body: Delivered if they are present and sent in a single message if
-//     the “BUFFERED“ or “BUFFERED_PARTIAL“ mode is chosen, in multiple messages if the
-//     “STREAMED“ mode is chosen, and not at all otherwise.
+//     the BUFFERED or BUFFERED_PARTIAL mode is chosen, in multiple messages if the
+//     STREAMED mode is chosen, and not at all otherwise.
 //   - Request trailers: Delivered if they are present and if the trailer mode is set
-//     to “SEND“.
+//     to SEND.
 //   - Response headers: Contains the headers from the HTTP response. Keep in mind
 //     that if the upstream system sends them before processing the request body that
 //     this message may arrive before the complete body.
@@ -126,9 +126,9 @@ func (ExternalProcessor_RouteCacheAction) EnumDescriptor() ([]byte, []int) {
 //     request trailers.
 //
 // By default, the processor sends only the request and response headers messages.
-// This may be changed to include any of the six steps by changing the “processing_mode“
-// setting of the filter configuration, or by setting the “mode_override“ of any response
-// from the external processor. The latter is only enabled if “allow_mode_override“ is
+// This may be changed to include any of the six steps by changing the processing_mode
+// setting of the filter configuration, or by setting the mode_override of any response
+// from the external processor. The latter is only enabled if allow_mode_override is
 // set to true. This way, a processor may, for example, use information
 // in the request header to determine whether the message body must be examined, or whether
 // the proxy should simply stream it straight through.
@@ -167,12 +167,12 @@ type ExternalProcessor struct {
 	GrpcService *v3.GrpcService `protobuf:"bytes,1,opt,name=grpc_service,json=grpcService,proto3" json:"grpc_service,omitempty"`
 	// Configuration for the HTTP service that the filter will communicate with.
 	// Only one of “http_service“ or
-	// :ref:`grpc_service <envoy_v3_api_field_extensions.filters.http.ext_proc.v3.ExternalProcessor.grpc_service>`
+	// :ref:`grpc_service <envoy_v3_api_field_extensions.filters.http.ext_proc.v3.ExternalProcessor.grpc_service>`.
 	// can be set. It is required that one of them must be set.
 	//
 	// If “http_service“ is set, the
 	// :ref:`processing_mode <envoy_v3_api_field_extensions.filters.http.ext_proc.v3.ExternalProcessor.processing_mode>`
-	// cannot be configured to send any body or trailers. i.e., “http_service“ only supports
+	// can not be configured to send any body or trailers. i.e, http_service only supports
 	// sending request or response headers to the side stream server.
 	//
 	// With this configuration, Envoy behavior:
@@ -182,7 +182,7 @@ type ExternalProcessor struct {
 	//
 	// 2. This proto message is then transcoded into a JSON text.
 	//
-	// 3. Envoy then sends an HTTP POST message with content-type as "application/json",
+	// 3. Envoy then sends a HTTP POST message with content-type as "application/json",
 	// and this JSON text as body to the side stream server.
 	//
 	// After the side-stream receives this HTTP request message, it is expected to do as follows:
@@ -193,16 +193,12 @@ type ExternalProcessor struct {
 	// 2. It then sets the mutated headers into a new proto message
 	// :ref:`ProcessingResponse <envoy_v3_api_msg_service.ext_proc.v3.ProcessingResponse>`.
 	//
-	// 3. It converts the “ProcessingResponse“ proto message into a JSON text.
+	// 3. It converts “ProcessingResponse“ proto message into a JSON text.
 	//
-	// 4. It then sends an HTTP response back to Envoy with status code as “"200"“,
-	// “content-type“ as “"application/json"“ and sets the JSON text as the body.
+	// 4. It then sends a HTTP response back to Envoy with status code as "200",
+	// content-type as "application/json" and sets the JSON text as the body.
 	HttpService *ExtProcHttpService `protobuf:"bytes,20,opt,name=http_service,json=httpService,proto3" json:"http_service,omitempty"`
-	// If the “BodySendMode“ in the
-	// :ref:`processing_mode <envoy_v3_api_field_extensions.filters.http.ext_proc.v3.ExternalProcessor.processing_mode>`
-	// is set to “FULL_DUPLEX_STREAMED“, “failure_mode_allow“ can not be set to true.
-	//
-	// Otherwise, by default, if the gRPC stream cannot be established, or if it is closed
+	// By default, if the gRPC stream cannot be established, or if it is closed
 	// prematurely with an error, the filter will fail. Specifically, if the
 	// response headers have not yet been delivered, then it will return a 500
 	// error downstream. If they have been delivered, then instead the HTTP stream to the
@@ -211,17 +207,17 @@ type ExternalProcessor struct {
 	// or could not be opened, processing continues without error.
 	FailureModeAllow bool `protobuf:"varint,2,opt,name=failure_mode_allow,json=failureModeAllow,proto3" json:"failure_mode_allow,omitempty"`
 	// Specifies default options for how HTTP headers, trailers, and bodies are
-	// sent. See “ProcessingMode“ for details.
+	// sent. See ProcessingMode for details.
 	ProcessingMode *ProcessingMode `protobuf:"bytes,3,opt,name=processing_mode,json=processingMode,proto3" json:"processing_mode,omitempty"`
 	// Envoy provides a number of :ref:`attributes <arch_overview_attributes>`
 	// for expressive policies. Each attribute name provided in this field will be
-	// matched against that list and populated in the “request_headers“ message.
+	// matched against that list and populated in the request_headers message.
 	// See the :ref:`attribute documentation <arch_overview_request_attributes>`
 	// for the list of supported attributes and their types.
 	RequestAttributes []string `protobuf:"bytes,5,rep,name=request_attributes,json=requestAttributes,proto3" json:"request_attributes,omitempty"`
 	// Envoy provides a number of :ref:`attributes <arch_overview_attributes>`
 	// for expressive policies. Each attribute name provided in this field will be
-	// matched against that list and populated in the “response_headers“ message.
+	// matched against that list and populated in the response_headers message.
 	// See the :ref:`attribute documentation <arch_overview_attributes>`
 	// for the list of supported attributes and their types.
 	ResponseAttributes []string `protobuf:"bytes,6,rep,name=response_attributes,json=responseAttributes,proto3" json:"response_attributes,omitempty"`
@@ -235,7 +231,7 @@ type ExternalProcessor struct {
 	// configured, default is 200 milliseconds.
 	MessageTimeout *durationpb.Duration `protobuf:"bytes,7,opt,name=message_timeout,json=messageTimeout,proto3" json:"message_timeout,omitempty"`
 	// Optional additional prefix to use when emitting statistics. This allows to distinguish
-	// emitted statistics between configured “ext_proc“ filters in an HTTP filter chain.
+	// emitted statistics between configured *ext_proc* filters in an HTTP filter chain.
 	StatPrefix string `protobuf:"bytes,8,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"`
 	// Rules that determine what modifications an external processing server may
 	// make to message headers. If not set, all headers may be modified except
@@ -274,12 +270,12 @@ type ExternalProcessor struct {
 	DisableImmediateResponse bool `protobuf:"varint,15,opt,name=disable_immediate_response,json=disableImmediateResponse,proto3" json:"disable_immediate_response,omitempty"`
 	// Options related to the sending and receiving of dynamic metadata.
 	MetadataOptions *MetadataOptions `protobuf:"bytes,16,opt,name=metadata_options,json=metadataOptions,proto3" json:"metadata_options,omitempty"`
-	// If true, send each part of the HTTP request or response specified by “ProcessingMode“
+	// If true, send each part of the HTTP request or response specified by ProcessingMode
 	// without pausing on filter chain iteration. It is "Send and Go" mode that can be used
 	// by external processor to observe Envoy data and status. In this mode:
 	//
-	// 1. Only “STREAMED“ body processing mode is supported and any other body processing modes will be
-	// ignored. “NONE“ mode (i.e., skip body processing) will still work as expected.
+	// 1. Only STREAMED body processing mode is supported and any other body processing modes will be
+	// ignored. NONE mode(i.e., skip body processing) will still work as expected.
 	//
 	// 2. External processor should not send back processing response, as any responses will be ignored.
 	// This also means that
@@ -290,7 +286,7 @@ type ExternalProcessor struct {
 	//
 	// .. warning::
 	//
-	//	Flow control is a necessary mechanism to prevent the fast sender (either downstream client or upstream server)
+	//	Flow control is necessary mechanism to prevent the fast sender (either downstream client or upstream server)
 	//	from overwhelming the external processor when its processing speed is slower.
 	//	This protective measure is being explored and developed but has not been ready yet, so please use your own
 	//	discretion when enabling this feature.
@@ -303,7 +299,7 @@ type ExternalProcessor struct {
 	// It is recommended to set “route_cache_action“ which supersedes “disable_clear_route_cache“.
 	DisableClearRouteCache bool `protobuf:"varint,11,opt,name=disable_clear_route_cache,json=disableClearRouteCache,proto3" json:"disable_clear_route_cache,omitempty"`
 	// Specifies the action to be taken when an external processor response is
-	// received in response to request headers. It is recommended to set this field rather than set
+	// received in response to request headers. It is recommended to set this field than set
 	// :ref:`disable_clear_route_cache <envoy_v3_api_field_extensions.filters.http.ext_proc.v3.ExternalProcessor.disable_clear_route_cache>`.
 	// Only one of “disable_clear_route_cache“ or “route_cache_action“ can be set.
 	RouteCacheAction ExternalProcessor_RouteCacheAction `protobuf:"varint,18,opt,name=route_cache_action,json=routeCacheAction,proto3,enum=envoy.extensions.filters.http.ext_proc.v3.ExternalProcessor_RouteCacheAction" json:"route_cache_action,omitempty"`
@@ -314,7 +310,7 @@ type ExternalProcessor struct {
 	// The default value is 5000 milliseconds (5 seconds) if not specified.
 	DeferredCloseTimeout *durationpb.Duration `protobuf:"bytes,19,opt,name=deferred_close_timeout,json=deferredCloseTimeout,proto3" json:"deferred_close_timeout,omitempty"`
 	// Send body to the side stream server once it arrives without waiting for the header response from that server.
-	// It only works for “STREAMED“ body processing mode. For any other body processing modes, it is ignored.
+	// It only works for STREAMED body processing mode. For any other body processing modes, it is ignored.
 	// The server has two options upon receiving a header request:
 	//
 	// 1. Instant Response: send the header response as soon as the header request is received.
@@ -335,7 +331,7 @@ type ExternalProcessor struct {
 	// can only be overridden by the response message from the external processing server iff the
 	// :ref:`mode_override <envoy_v3_api_field_service.ext_proc.v3.ProcessingResponse.mode_override>` is allowed by
 	// the “allowed_override_modes“ allow-list below.
-	// Since “request_header_mode“ is not applicable in any way, it's ignored in comparison.
+	// Since request_header_mode is not applicable in any way, it's ignored in comparison.
 	AllowedOverrideModes []*ProcessingMode `protobuf:"bytes,22,rep,name=allowed_override_modes,json=allowedOverrideModes,proto3" json:"allowed_override_modes,omitempty"`
 	// Decorator to introduce custom logic that runs after a message received from
 	// the External Processor is processed, but before continuing filter chain iteration.
@@ -833,7 +829,7 @@ type ExtProcOverrides struct {
 	// config used. It is the prerogative of the control plane to ensure this
 	// most-specific config contains the correct final overrides.
 	MetadataOptions *MetadataOptions `protobuf:"bytes,6,opt,name=metadata_options,json=metadataOptions,proto3" json:"metadata_options,omitempty"`
-	// Additional metadata to include into streams initiated to the “ext_proc“ gRPC
+	// Additional metadata to include into streams initiated to the ext_proc gRPC
 	// service. This can be used for scenarios in which additional ad hoc
 	// authorization headers (e.g. “x-foo-bar: baz-key“) are to be injected or
 	// when a route needs to partially override inherited metadata.
@@ -927,10 +923,10 @@ type MetadataOptions_MetadataNamespaces struct {
 	unknownFields protoimpl.UnknownFields
 
 	// Specifies a list of metadata namespaces whose values, if present,
-	// will be passed to the “ext_proc“ service as an opaque “protobuf::Struct“.
+	// will be passed to the ext_proc service as an opaque *protobuf::Struct*.
 	Untyped []string `protobuf:"bytes,1,rep,name=untyped,proto3" json:"untyped,omitempty"`
 	// Specifies a list of metadata namespaces whose values, if present,
-	// will be passed to the “ext_proc“ service as a “protobuf::Any“. This allows
+	// will be passed to the ext_proc service as a *protobuf::Any*. This allows
 	// envoy and the external processing server to share the protobuf message
 	// definition for safe parsing.
 	Typed []string `protobuf:"bytes,2,rep,name=typed,proto3" json:"typed,omitempty"`
diff --git a/envoy/extensions/filters/http/ext_proc/v3/ext_proc.pb.validate.go b/envoy/extensions/filters/http/ext_proc/v3/ext_proc.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/ext_proc/v3/processing_mode.pb.validate.go b/envoy/extensions/filters/http/ext_proc/v3/processing_mode.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/fault/v3/fault.pb.validate.go b/envoy/extensions/filters/http/fault/v3/fault.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/file_system_buffer/v3/file_system_buffer.pb.validate.go b/envoy/extensions/filters/http/file_system_buffer/v3/file_system_buffer.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.pb.validate.go b/envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/geoip/v3/geoip.pb.validate.go b/envoy/extensions/filters/http/geoip/v3/geoip.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/grpc_field_extraction/v3/config.pb.validate.go b/envoy/extensions/filters/http/grpc_field_extraction/v3/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/grpc_http1_bridge/v3/config.pb.validate.go b/envoy/extensions/filters/http/grpc_http1_bridge/v3/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.validate.go b/envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/grpc_json_reverse_transcoder/v3/transcoder.pb.validate.go b/envoy/extensions/filters/http/grpc_json_reverse_transcoder/v3/transcoder.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.go b/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.go
index a2cc37761a..e929bf1fcc 100755
--- a/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.go
+++ b/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.go
@@ -487,7 +487,7 @@ func (x *UnknownQueryParams) GetKey() map[string]*UnknownQueryParams_Values {
 	return nil
 }
 
-// [#next-free-field: 7]
+// [#next-free-field: 6]
 type GrpcJsonTranscoder_PrintOptions struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -511,10 +511,6 @@ type GrpcJsonTranscoder_PrintOptions struct {
 	PreserveProtoFieldNames bool `protobuf:"varint,4,opt,name=preserve_proto_field_names,json=preserveProtoFieldNames,proto3" json:"preserve_proto_field_names,omitempty"`
 	// If true, return all streams as newline-delimited JSON messages instead of as a comma-separated array
 	StreamNewlineDelimited bool `protobuf:"varint,5,opt,name=stream_newline_delimited,json=streamNewlineDelimited,proto3" json:"stream_newline_delimited,omitempty"`
-	// If true, enforces Server-Sent Events (SSE) message framing (“data:
-	// <message>\n\n“) and, “stream_newline_delimited“ is ignored. If false,
-	// message framing is determined by “stream_newline_delimited“.
-	StreamSseStyleDelimited bool `protobuf:"varint,6,opt,name=stream_sse_style_delimited,json=streamSseStyleDelimited,proto3" json:"stream_sse_style_delimited,omitempty"`
 }
 
 func (x *GrpcJsonTranscoder_PrintOptions) Reset() {
@@ -584,13 +580,6 @@ func (x *GrpcJsonTranscoder_PrintOptions) GetStreamNewlineDelimited() bool {
 	return false
 }
 
-func (x *GrpcJsonTranscoder_PrintOptions) GetStreamSseStyleDelimited() bool {
-	if x != nil {
-		return x.StreamSseStyleDelimited
-	}
-	return false
-}
-
 type GrpcJsonTranscoder_RequestValidationOptions struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -737,7 +726,7 @@ var file_envoy_extensions_filters_http_grpc_json_transcoder_v3_transcoder_proto_
 	0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
 	0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69,
-	0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x81, 0x11, 0x0a, 0x12, 0x47,
+	0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc4, 0x10, 0x0a, 0x12, 0x47,
 	0x72, 0x70, 0x63, 0x4a, 0x73, 0x6f, 0x6e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x63, 0x6f, 0x64, 0x65,
 	0x72, 0x12, 0x2b, 0x0a, 0x10, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72,
 	0x69, 0x70, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0f, 0x70,
@@ -819,7 +808,7 @@ var file_envoy_extensions_filters_http_grpc_json_transcoder_v3_transcoder_proto_
 	0x6e, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65,
 	0x72, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1d, 0x63, 0x61, 0x70, 0x74, 0x75, 0x72,
 	0x65, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72,
-	0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x1a, 0xb7, 0x03, 0x0a, 0x0c, 0x50, 0x72, 0x69, 0x6e,
+	0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x1a, 0xfa, 0x02, 0x0a, 0x0c, 0x50, 0x72, 0x69, 0x6e,
 	0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x61, 0x64, 0x64, 0x5f,
 	0x77, 0x68, 0x69, 0x74, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
 	0x52, 0x0d, 0x61, 0x64, 0x64, 0x57, 0x68, 0x69, 0x74, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12,
@@ -838,75 +827,71 @@ var file_envoy_extensions_filters_http_grpc_json_transcoder_v3_transcoder_proto_
 	0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f, 0x6e, 0x65, 0x77, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x64, 0x65,
 	0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x16, 0x73,
 	0x74, 0x72, 0x65, 0x61, 0x6d, 0x4e, 0x65, 0x77, 0x6c, 0x69, 0x6e, 0x65, 0x44, 0x65, 0x6c, 0x69,
-	0x6d, 0x69, 0x74, 0x65, 0x64, 0x12, 0x3b, 0x0a, 0x1a, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x5f,
-	0x73, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x5f, 0x64, 0x65, 0x6c, 0x69, 0x6d, 0x69,
-	0x74, 0x65, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x73, 0x74, 0x72, 0x65, 0x61,
-	0x6d, 0x53, 0x73, 0x65, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x44, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74,
-	0x65, 0x64, 0x3a, 0x4d, 0x9a, 0xc5, 0x88, 0x1e, 0x48, 0x0a, 0x46, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x68,
-	0x74, 0x74, 0x70, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e, 0x76,
-	0x32, 0x2e, 0x47, 0x72, 0x70, 0x63, 0x4a, 0x73, 0x6f, 0x6e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x63,
-	0x6f, 0x64, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x69, 0x6e, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x1a, 0xe5, 0x01, 0x0a, 0x18, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x56, 0x61, 0x6c,
-	0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x32,
-	0x0a, 0x15, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e,
-	0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x72,
-	0x65, 0x6a, 0x65, 0x63, 0x74, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x4d, 0x65, 0x74, 0x68,
-	0x6f, 0x64, 0x12, 0x45, 0x0a, 0x1f, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x75, 0x6e, 0x6b,
-	0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d,
-	0x65, 0x74, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1c, 0x72, 0x65, 0x6a,
-	0x65, 0x63, 0x74, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50,
-	0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x12, 0x4e, 0x0a, 0x24, 0x72, 0x65, 0x6a,
-	0x65, 0x63, 0x74, 0x5f, 0x62, 0x69, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x6f, 0x64, 0x79,
-	0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6c, 0x69, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x20, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x42,
-	0x69, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x64, 0x79, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x43,
-	0x6f, 0x6c, 0x6c, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x6a, 0x0a, 0x0f, 0x55, 0x72, 0x6c,
-	0x55, 0x6e, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x53, 0x70, 0x65, 0x63, 0x12, 0x22, 0x0a, 0x1e,
-	0x41, 0x4c, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x53, 0x5f, 0x45,
-	0x58, 0x43, 0x45, 0x50, 0x54, 0x5f, 0x52, 0x45, 0x53, 0x45, 0x52, 0x56, 0x45, 0x44, 0x10, 0x00,
-	0x12, 0x1f, 0x0a, 0x1b, 0x41, 0x4c, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45,
-	0x52, 0x53, 0x5f, 0x45, 0x58, 0x43, 0x45, 0x50, 0x54, 0x5f, 0x53, 0x4c, 0x41, 0x53, 0x48, 0x10,
-	0x01, 0x12, 0x12, 0x0a, 0x0e, 0x41, 0x4c, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54,
-	0x45, 0x52, 0x53, 0x10, 0x02, 0x3a, 0x40, 0x9a, 0xc5, 0x88, 0x1e, 0x3b, 0x0a, 0x39, 0x65, 0x6e,
+	0x6d, 0x69, 0x74, 0x65, 0x64, 0x3a, 0x4d, 0x9a, 0xc5, 0x88, 0x1e, 0x48, 0x0a, 0x46, 0x65, 0x6e,
 	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65,
 	0x72, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x63, 0x6f, 0x64, 0x65,
 	0x72, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x72, 0x70, 0x63, 0x4a, 0x73, 0x6f, 0x6e, 0x54, 0x72, 0x61,
-	0x6e, 0x73, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x42, 0x15, 0x0a, 0x0e, 0x64, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x73, 0x65, 0x74, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xa7,
-	0x02, 0x0a, 0x12, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50,
-	0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x64, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x52, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74,
-	0x74, 0x70, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x74, 0x72, 0x61,
-	0x6e, 0x73, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x6e, 0x6b, 0x6e, 0x6f,
-	0x77, 0x6e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x4b, 0x65,
-	0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x1a, 0x20, 0x0a, 0x06, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x1a, 0x88, 0x01,
-	0x0a, 0x08, 0x4b, 0x65, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
-	0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x66, 0x0a, 0x05,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x50, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66,
-	0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x63, 0x6f, 0x64, 0x65, 0x72,
-	0x2e, 0x76, 0x33, 0x2e, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x51, 0x75, 0x65, 0x72, 0x79,
-	0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x52, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0xd5, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06,
-	0x02, 0x10, 0x02, 0x0a, 0x43, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73,
-	0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x63,
-	0x6f, 0x64, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x73, 0x67, 0x69, 0x74,
-	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74,
-	0x70, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x74, 0x72, 0x61, 0x6e,
-	0x73, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x6a,
-	0x73, 0x6f, 0x6e, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x76, 0x33,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x73, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e, 0x50, 0x72, 0x69, 0x6e, 0x74, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x1a, 0xe5, 0x01, 0x0a, 0x18, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x12, 0x32, 0x0a, 0x15, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x75, 0x6e, 0x6b, 0x6e,
+	0x6f, 0x77, 0x6e, 0x5f, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x13, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x4d,
+	0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x45, 0x0a, 0x1f, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x5f,
+	0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x5f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5f, 0x70, 0x61,
+	0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1c,
+	0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x51, 0x75, 0x65,
+	0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x12, 0x4e, 0x0a, 0x24,
+	0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x62, 0x69, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x62,
+	0x6f, 0x64, 0x79, 0x5f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x6c, 0x69, 0x73,
+	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x20, 0x72, 0x65, 0x6a, 0x65,
+	0x63, 0x74, 0x42, 0x69, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x64, 0x79, 0x46, 0x69, 0x65,
+	0x6c, 0x64, 0x43, 0x6f, 0x6c, 0x6c, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x6a, 0x0a, 0x0f,
+	0x55, 0x72, 0x6c, 0x55, 0x6e, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x53, 0x70, 0x65, 0x63, 0x12,
+	0x22, 0x0a, 0x1e, 0x41, 0x4c, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52,
+	0x53, 0x5f, 0x45, 0x58, 0x43, 0x45, 0x50, 0x54, 0x5f, 0x52, 0x45, 0x53, 0x45, 0x52, 0x56, 0x45,
+	0x44, 0x10, 0x00, 0x12, 0x1f, 0x0a, 0x1b, 0x41, 0x4c, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41,
+	0x43, 0x54, 0x45, 0x52, 0x53, 0x5f, 0x45, 0x58, 0x43, 0x45, 0x50, 0x54, 0x5f, 0x53, 0x4c, 0x41,
+	0x53, 0x48, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x41, 0x4c, 0x4c, 0x5f, 0x43, 0x48, 0x41, 0x52,
+	0x41, 0x43, 0x54, 0x45, 0x52, 0x53, 0x10, 0x02, 0x3a, 0x40, 0x9a, 0xc5, 0x88, 0x1e, 0x3b, 0x0a,
+	0x39, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69,
+	0x6c, 0x74, 0x65, 0x72, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x63,
+	0x6f, 0x64, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x47, 0x72, 0x70, 0x63, 0x4a, 0x73, 0x6f, 0x6e,
+	0x54, 0x72, 0x61, 0x6e, 0x73, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x42, 0x15, 0x0a, 0x0e, 0x64, 0x65,
+	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x5f, 0x73, 0x65, 0x74, 0x12, 0x03, 0xf8, 0x42,
+	0x01, 0x22, 0xa7, 0x02, 0x0a, 0x12, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x51, 0x75, 0x65,
+	0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x64, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x52, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73,
+	0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x6e,
+	0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73,
+	0x2e, 0x4b, 0x65, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x1a, 0x20,
+	0x0a, 0x06, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73,
+	0x1a, 0x88, 0x01, 0x0a, 0x08, 0x4b, 0x65, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x66, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x50,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x63, 0x6f,
+	0x64, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x51, 0x75,
+	0x65, 0x72, 0x79, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0xd5, 0x01, 0xba, 0x80,
+	0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x43, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65,
+	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68,
+	0x74, 0x74, 0x70, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x74, 0x72,
+	0x61, 0x6e, 0x73, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0f, 0x54, 0x72, 0x61,
+	0x6e, 0x73, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x73,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+	0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74,
+	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f,
+	0x68, 0x74, 0x74, 0x70, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x67, 0x72, 0x70,
+	0x63, 0x5f, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x63, 0x6f, 0x64, 0x65,
+	0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.validate.go b/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.validate.go
old mode 100755
new mode 100644
index 307c36e481..22c9aa872c
--- a/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.validate.go
+++ b/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder.pb.validate.go
@@ -475,8 +475,6 @@ func (m *GrpcJsonTranscoder_PrintOptions) validate(all bool) error {
 
 	// no validation rules for StreamNewlineDelimited
 
-	// no validation rules for StreamSseStyleDelimited
-
 	if len(errors) > 0 {
 		return GrpcJsonTranscoder_PrintOptionsMultiError(errors)
 	}
diff --git a/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder_vtproto.pb.go b/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder_vtproto.pb.go
index efea155987..92d2bbb603 100755
--- a/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder_vtproto.pb.go
+++ b/envoy/extensions/filters/http/grpc_json_transcoder/v3/transcoder_vtproto.pb.go
@@ -49,16 +49,6 @@ func (m *GrpcJsonTranscoder_PrintOptions) MarshalToSizedBufferVTStrict(dAtA []by
 		i -= len(m.unknownFields)
 		copy(dAtA[i:], m.unknownFields)
 	}
-	if m.StreamSseStyleDelimited {
-		i--
-		if m.StreamSseStyleDelimited {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i--
-		dAtA[i] = 0x30
-	}
 	if m.StreamNewlineDelimited {
 		i--
 		if m.StreamNewlineDelimited {
@@ -515,9 +505,6 @@ func (m *GrpcJsonTranscoder_PrintOptions) SizeVT() (n int) {
 	if m.StreamNewlineDelimited {
 		n += 2
 	}
-	if m.StreamSseStyleDelimited {
-		n += 2
-	}
 	n += len(m.unknownFields)
 	return n
 }
diff --git a/envoy/extensions/filters/http/grpc_stats/v3/config.pb.validate.go b/envoy/extensions/filters/http/grpc_stats/v3/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/grpc_web/v3/grpc_web.pb.validate.go b/envoy/extensions/filters/http/grpc_web/v3/grpc_web.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/gzip/v3/gzip.pb.validate.go b/envoy/extensions/filters/http/gzip/v3/gzip.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/header_mutation/v3/header_mutation.pb.go b/envoy/extensions/filters/http/header_mutation/v3/header_mutation.pb.go
index 5b2289f60e..46c860ee38 100755
--- a/envoy/extensions/filters/http/header_mutation/v3/header_mutation.pb.go
+++ b/envoy/extensions/filters/http/header_mutation/v3/header_mutation.pb.go
@@ -23,7 +23,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// [#next-free-field: 6]
 type Mutations struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -36,10 +35,6 @@ type Mutations struct {
 	QueryParameterMutations []*v31.KeyValueMutation `protobuf:"bytes,3,rep,name=query_parameter_mutations,json=queryParameterMutations,proto3" json:"query_parameter_mutations,omitempty"`
 	// The response mutations are applied before the response is sent to the downstream client.
 	ResponseMutations []*v3.HeaderMutation `protobuf:"bytes,2,rep,name=response_mutations,json=responseMutations,proto3" json:"response_mutations,omitempty"`
-	// The response trailer mutations are applied before the response is sent to the downstream client.
-	ResponseTrailersMutations []*v3.HeaderMutation `protobuf:"bytes,4,rep,name=response_trailers_mutations,json=responseTrailersMutations,proto3" json:"response_trailers_mutations,omitempty"`
-	// The request trailer mutations are applied before the request is sent to the upstream cluster.
-	RequestTrailersMutations []*v3.HeaderMutation `protobuf:"bytes,5,rep,name=request_trailers_mutations,json=requestTrailersMutations,proto3" json:"request_trailers_mutations,omitempty"`
 }
 
 func (x *Mutations) Reset() {
@@ -95,20 +90,6 @@ func (x *Mutations) GetResponseMutations() []*v3.HeaderMutation {
 	return nil
 }
 
-func (x *Mutations) GetResponseTrailersMutations() []*v3.HeaderMutation {
-	if x != nil {
-		return x.ResponseTrailersMutations
-	}
-	return nil
-}
-
-func (x *Mutations) GetRequestTrailersMutations() []*v3.HeaderMutation {
-	if x != nil {
-		return x.RequestTrailersMutations
-	}
-	return nil
-}
-
 // Per route configuration for the header mutation filter.
 type HeaderMutationPerRoute struct {
 	state         protoimpl.MessageState
@@ -238,7 +219,7 @@ var file_envoy_extensions_filters_http_header_mutation_v3_header_mutation_proto_
 	0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x62, 0x61, 0x73,
 	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e,
 	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa5, 0x04, 0x0a, 0x09, 0x4d, 0x75, 0x74, 0x61, 0x74,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb9, 0x02, 0x0a, 0x09, 0x4d, 0x75, 0x74, 0x61, 0x74,
 	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x62, 0x0a, 0x11, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f,
 	0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
 	0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
@@ -258,54 +239,39 @@ var file_envoy_extensions_filters_http_header_mutation_v3_header_mutation_proto_
 	0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x76, 0x33,
 	0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
 	0x11, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x12, 0x75, 0x0a, 0x1b, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 0x74,
-	0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x75,
-	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x76, 0x33, 0x2e,
-	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x19,
-	0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x54, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73,
-	0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x73, 0x0a, 0x1a, 0x72, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x65, 0x72, 0x73, 0x5f, 0x6d, 0x75,
-	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x35, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x75, 0x6c,
-	0x65, 0x73, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x75, 0x74, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x18, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x72, 0x61,
-	0x69, 0x6c, 0x65, 0x72, 0x73, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x73,
-	0x0a, 0x16, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x50, 0x65, 0x72, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x59, 0x0a, 0x09, 0x6d, 0x75, 0x74, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x65, 0x6e,
+	0x6e, 0x73, 0x22, 0x73, 0x0a, 0x16, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x75, 0x74, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x50, 0x65, 0x72, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x12, 0x59, 0x0a, 0x09,
+	0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x3b, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e,
+	0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
+	0x76, 0x33, 0x2e, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x09, 0x6d, 0x75,
+	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0xb9, 0x01, 0x0a, 0x0e, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x59, 0x0a, 0x09, 0x6d, 0x75,
+	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
+	0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x68, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x33,
+	0x2e, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x09, 0x6d, 0x75, 0x74, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x4c, 0x0a, 0x23, 0x6d, 0x6f, 0x73, 0x74, 0x5f, 0x73, 0x70,
+	0x65, 0x63, 0x69, 0x66, 0x69, 0x63, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x75,
+	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x77, 0x69, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x1f, 0x6d, 0x6f, 0x73, 0x74, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x63,
+	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x57,
+	0x69, 0x6e, 0x73, 0x42, 0xca, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x3e,
+	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
 	0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66,
 	0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x5f, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4d,
-	0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x09, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x22, 0xb9, 0x01, 0x0a, 0x0e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x75,
-	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x59, 0x0a, 0x09, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x5f, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x75, 0x74,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x09, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x4c, 0x0a, 0x23, 0x6d, 0x6f, 0x73, 0x74, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66,
-	0x69, 0x63, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x5f, 0x77, 0x69, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1f,
-	0x6d, 0x6f, 0x73, 0x74, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x63, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x57, 0x69, 0x6e, 0x73, 0x42,
-	0xca, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x3e, 0x69, 0x6f, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d,
-	0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x13, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x69, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d,
-	0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x68, 0x65, 0x61, 0x64, 0x65,
-	0x72, 0x5f, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x72, 0x5f, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x42, 0x13,
+	0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x69, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
+	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66,
+	0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x68, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x5f, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x68,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x6d, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x76, 0x33,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -332,15 +298,13 @@ var file_envoy_extensions_filters_http_header_mutation_v3_header_mutation_proto_
 	3, // 0: envoy.extensions.filters.http.header_mutation.v3.Mutations.request_mutations:type_name -> envoy.config.common.mutation_rules.v3.HeaderMutation
 	4, // 1: envoy.extensions.filters.http.header_mutation.v3.Mutations.query_parameter_mutations:type_name -> envoy.config.core.v3.KeyValueMutation
 	3, // 2: envoy.extensions.filters.http.header_mutation.v3.Mutations.response_mutations:type_name -> envoy.config.common.mutation_rules.v3.HeaderMutation
-	3, // 3: envoy.extensions.filters.http.header_mutation.v3.Mutations.response_trailers_mutations:type_name -> envoy.config.common.mutation_rules.v3.HeaderMutation
-	3, // 4: envoy.extensions.filters.http.header_mutation.v3.Mutations.request_trailers_mutations:type_name -> envoy.config.common.mutation_rules.v3.HeaderMutation
-	0, // 5: envoy.extensions.filters.http.header_mutation.v3.HeaderMutationPerRoute.mutations:type_name -> envoy.extensions.filters.http.header_mutation.v3.Mutations
-	0, // 6: envoy.extensions.filters.http.header_mutation.v3.HeaderMutation.mutations:type_name -> envoy.extensions.filters.http.header_mutation.v3.Mutations
-	7, // [7:7] is the sub-list for method output_type
-	7, // [7:7] is the sub-list for method input_type
-	7, // [7:7] is the sub-list for extension type_name
-	7, // [7:7] is the sub-list for extension extendee
-	0, // [0:7] is the sub-list for field type_name
+	0, // 3: envoy.extensions.filters.http.header_mutation.v3.HeaderMutationPerRoute.mutations:type_name -> envoy.extensions.filters.http.header_mutation.v3.Mutations
+	0, // 4: envoy.extensions.filters.http.header_mutation.v3.HeaderMutation.mutations:type_name -> envoy.extensions.filters.http.header_mutation.v3.Mutations
+	5, // [5:5] is the sub-list for method output_type
+	5, // [5:5] is the sub-list for method input_type
+	5, // [5:5] is the sub-list for extension type_name
+	5, // [5:5] is the sub-list for extension extendee
+	0, // [0:5] is the sub-list for field type_name
 }
 
 func init() { file_envoy_extensions_filters_http_header_mutation_v3_header_mutation_proto_init() }
diff --git a/envoy/extensions/filters/http/header_mutation/v3/header_mutation.pb.validate.go b/envoy/extensions/filters/http/header_mutation/v3/header_mutation.pb.validate.go
old mode 100755
new mode 100644
index 08e358a42a..b42c16176c
--- a/envoy/extensions/filters/http/header_mutation/v3/header_mutation.pb.validate.go
+++ b/envoy/extensions/filters/http/header_mutation/v3/header_mutation.pb.validate.go
@@ -160,74 +160,6 @@ func (m *Mutations) validate(all bool) error {
 
 	}
 
-	for idx, item := range m.GetResponseTrailersMutations() {
-		_, _ = idx, item
-
-		if all {
-			switch v := interface{}(item).(type) {
-			case interface{ ValidateAll() error }:
-				if err := v.ValidateAll(); err != nil {
-					errors = append(errors, MutationsValidationError{
-						field:  fmt.Sprintf("ResponseTrailersMutations[%v]", idx),
-						reason: "embedded message failed validation",
-						cause:  err,
-					})
-				}
-			case interface{ Validate() error }:
-				if err := v.Validate(); err != nil {
-					errors = append(errors, MutationsValidationError{
-						field:  fmt.Sprintf("ResponseTrailersMutations[%v]", idx),
-						reason: "embedded message failed validation",
-						cause:  err,
-					})
-				}
-			}
-		} else if v, ok := interface{}(item).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return MutationsValidationError{
-					field:  fmt.Sprintf("ResponseTrailersMutations[%v]", idx),
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	for idx, item := range m.GetRequestTrailersMutations() {
-		_, _ = idx, item
-
-		if all {
-			switch v := interface{}(item).(type) {
-			case interface{ ValidateAll() error }:
-				if err := v.ValidateAll(); err != nil {
-					errors = append(errors, MutationsValidationError{
-						field:  fmt.Sprintf("RequestTrailersMutations[%v]", idx),
-						reason: "embedded message failed validation",
-						cause:  err,
-					})
-				}
-			case interface{ Validate() error }:
-				if err := v.Validate(); err != nil {
-					errors = append(errors, MutationsValidationError{
-						field:  fmt.Sprintf("RequestTrailersMutations[%v]", idx),
-						reason: "embedded message failed validation",
-						cause:  err,
-					})
-				}
-			}
-		} else if v, ok := interface{}(item).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return MutationsValidationError{
-					field:  fmt.Sprintf("RequestTrailersMutations[%v]", idx),
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
 	if len(errors) > 0 {
 		return MutationsMultiError(errors)
 	}
diff --git a/envoy/extensions/filters/http/header_mutation/v3/header_mutation_vtproto.pb.go b/envoy/extensions/filters/http/header_mutation/v3/header_mutation_vtproto.pb.go
index 7fcfc37f2e..e61a305e5c 100755
--- a/envoy/extensions/filters/http/header_mutation/v3/header_mutation_vtproto.pb.go
+++ b/envoy/extensions/filters/http/header_mutation/v3/header_mutation_vtproto.pb.go
@@ -49,54 +49,6 @@ func (m *Mutations) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
 		i -= len(m.unknownFields)
 		copy(dAtA[i:], m.unknownFields)
 	}
-	if len(m.RequestTrailersMutations) > 0 {
-		for iNdEx := len(m.RequestTrailersMutations) - 1; iNdEx >= 0; iNdEx-- {
-			if vtmsg, ok := interface{}(m.RequestTrailersMutations[iNdEx]).(interface {
-				MarshalToSizedBufferVTStrict([]byte) (int, error)
-			}); ok {
-				size, err := vtmsg.MarshalToSizedBufferVTStrict(dAtA[:i])
-				if err != nil {
-					return 0, err
-				}
-				i -= size
-				i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-			} else {
-				encoded, err := proto.Marshal(m.RequestTrailersMutations[iNdEx])
-				if err != nil {
-					return 0, err
-				}
-				i -= len(encoded)
-				copy(dAtA[i:], encoded)
-				i = protohelpers.EncodeVarint(dAtA, i, uint64(len(encoded)))
-			}
-			i--
-			dAtA[i] = 0x2a
-		}
-	}
-	if len(m.ResponseTrailersMutations) > 0 {
-		for iNdEx := len(m.ResponseTrailersMutations) - 1; iNdEx >= 0; iNdEx-- {
-			if vtmsg, ok := interface{}(m.ResponseTrailersMutations[iNdEx]).(interface {
-				MarshalToSizedBufferVTStrict([]byte) (int, error)
-			}); ok {
-				size, err := vtmsg.MarshalToSizedBufferVTStrict(dAtA[:i])
-				if err != nil {
-					return 0, err
-				}
-				i -= size
-				i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-			} else {
-				encoded, err := proto.Marshal(m.ResponseTrailersMutations[iNdEx])
-				if err != nil {
-					return 0, err
-				}
-				i -= len(encoded)
-				copy(dAtA[i:], encoded)
-				i = protohelpers.EncodeVarint(dAtA, i, uint64(len(encoded)))
-			}
-			i--
-			dAtA[i] = 0x22
-		}
-	}
 	if len(m.QueryParameterMutations) > 0 {
 		for iNdEx := len(m.QueryParameterMutations) - 1; iNdEx >= 0; iNdEx-- {
 			if vtmsg, ok := interface{}(m.QueryParameterMutations[iNdEx]).(interface {
@@ -310,30 +262,6 @@ func (m *Mutations) SizeVT() (n int) {
 			n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
 		}
 	}
-	if len(m.ResponseTrailersMutations) > 0 {
-		for _, e := range m.ResponseTrailersMutations {
-			if size, ok := interface{}(e).(interface {
-				SizeVT() int
-			}); ok {
-				l = size.SizeVT()
-			} else {
-				l = proto.Size(e)
-			}
-			n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-		}
-	}
-	if len(m.RequestTrailersMutations) > 0 {
-		for _, e := range m.RequestTrailersMutations {
-			if size, ok := interface{}(e).(interface {
-				SizeVT() int
-			}); ok {
-				l = size.SizeVT()
-			} else {
-				l = proto.Size(e)
-			}
-			n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-		}
-	}
 	n += len(m.unknownFields)
 	return n
 }
diff --git a/envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.validate.go b/envoy/extensions/filters/http/header_to_metadata/v3/header_to_metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/health_check/v3/health_check.pb.validate.go b/envoy/extensions/filters/http/health_check/v3/health_check.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.go b/envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.go
index 607bdc4470..fe251e16a8 100755
--- a/envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.go
+++ b/envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.go
@@ -12,6 +12,7 @@ import (
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
 	reflect "reflect"
 	sync "sync"
 )
@@ -133,10 +134,10 @@ func (x IPTagging_IpTagHeader_HeaderAction) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use IPTagging_IpTagHeader_HeaderAction.Descriptor instead.
 func (IPTagging_IpTagHeader_HeaderAction) EnumDescriptor() ([]byte, []int) {
-	return file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_rawDescGZIP(), []int{0, 1, 0}
+	return file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_rawDescGZIP(), []int{0, 2, 0}
 }
 
-// [#next-free-field: 6]
+// [#next-free-field: 7]
 type IPTagging struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -144,14 +145,16 @@ type IPTagging struct {
 
 	// The type of request the filter should apply to.
 	RequestType IPTagging_RequestType `protobuf:"varint,1,opt,name=request_type,json=requestType,proto3,enum=envoy.extensions.filters.http.ip_tagging.v3.IPTagging_RequestType" json:"request_type,omitempty"`
-	// [#comment:TODO(ccaraman): Extend functionality to load IP tags from file system.
-	// Tracked by issue https://github.com/envoyproxy/envoy/issues/2695]
 	// The set of IP tags for the filter.
+	// Only one of :ref:`ip_tags <envoy_v3_api_field_extensions.filters.http.ip_tagging.v3.IPTagging.ip_tags>`
+	// or :ref:`ip_tags_datasource <envoy_v3_api_field_extensions.filters.http.ip_tagging.v3.IPTagging.ip_tags_file_provider.ip_tags_datasource>`
+	// can be set for the Ip Tagging filter.
 	IpTags []*IPTagging_IPTag `protobuf:"bytes,4,rep,name=ip_tags,json=ipTags,proto3" json:"ip_tags,omitempty"`
 	// Specify to which header the tags will be written.
 	//
 	// If left unspecified, the tags will be appended to the “x-envoy-ip-tags“ header.
-	IpTagHeader *IPTagging_IpTagHeader `protobuf:"bytes,5,opt,name=ip_tag_header,json=ipTagHeader,proto3" json:"ip_tag_header,omitempty"`
+	IpTagHeader        *IPTagging_IpTagHeader        `protobuf:"bytes,5,opt,name=ip_tag_header,json=ipTagHeader,proto3" json:"ip_tag_header,omitempty"`
+	IpTagsFileProvider *IPTagging_IpTagsFileProvider `protobuf:"bytes,6,opt,name=ip_tags_file_provider,json=ipTagsFileProvider,proto3" json:"ip_tags_file_provider,omitempty"`
 }
 
 func (x *IPTagging) Reset() {
@@ -207,6 +210,13 @@ func (x *IPTagging) GetIpTagHeader() *IPTagging_IpTagHeader {
 	return nil
 }
 
+func (x *IPTagging) GetIpTagsFileProvider() *IPTagging_IpTagsFileProvider {
+	if x != nil {
+		return x.IpTagsFileProvider
+	}
+	return nil
+}
+
 // Supplies the IP tag name and the IP address subnets.
 type IPTagging_IPTag struct {
 	state         protoimpl.MessageState
@@ -266,6 +276,55 @@ func (x *IPTagging_IPTag) GetIpList() []*v3.CidrRange {
 	return nil
 }
 
+// Specifies the content of the IP tag file.
+// Allow the file to be created with no IP tags.
+type IPTagging_IPTagFile struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	IpTags []*IPTagging_IPTag `protobuf:"bytes,1,rep,name=ip_tags,json=ipTags,proto3" json:"ip_tags,omitempty"`
+}
+
+func (x *IPTagging_IPTagFile) Reset() {
+	*x = IPTagging_IPTagFile{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *IPTagging_IPTagFile) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*IPTagging_IPTagFile) ProtoMessage() {}
+
+func (x *IPTagging_IPTagFile) ProtoReflect() protoreflect.Message {
+	mi := &file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use IPTagging_IPTagFile.ProtoReflect.Descriptor instead.
+func (*IPTagging_IPTagFile) Descriptor() ([]byte, []int) {
+	return file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_rawDescGZIP(), []int{0, 1}
+}
+
+func (x *IPTagging_IPTagFile) GetIpTags() []*IPTagging_IPTag {
+	if x != nil {
+		return x.IpTags
+	}
+	return nil
+}
+
 // Specify to which header the tags will be written.
 type IPTagging_IpTagHeader struct {
 	state         protoimpl.MessageState
@@ -288,7 +347,7 @@ type IPTagging_IpTagHeader struct {
 func (x *IPTagging_IpTagHeader) Reset() {
 	*x = IPTagging_IpTagHeader{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_msgTypes[2]
+		mi := &file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -301,7 +360,7 @@ func (x *IPTagging_IpTagHeader) String() string {
 func (*IPTagging_IpTagHeader) ProtoMessage() {}
 
 func (x *IPTagging_IpTagHeader) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_msgTypes[2]
+	mi := &file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -314,7 +373,7 @@ func (x *IPTagging_IpTagHeader) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use IPTagging_IpTagHeader.ProtoReflect.Descriptor instead.
 func (*IPTagging_IpTagHeader) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_rawDescGZIP(), []int{0, 1}
+	return file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_rawDescGZIP(), []int{0, 2}
 }
 
 func (x *IPTagging_IpTagHeader) GetHeader() string {
@@ -331,6 +390,69 @@ func (x *IPTagging_IpTagHeader) GetAction() IPTagging_IpTagHeader_HeaderAction {
 	return IPTagging_IpTagHeader_SANITIZE
 }
 
+// Common configuration for file based ip tags.
+type IPTagging_IpTagsFileProvider struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Data source from which to retrieve ip tags.
+	// Only filename based data source is currently supported for ip tags.
+	// When using this data source, if a “watched_directory“ is provided, the ip tags file will be re-read when a file move is detected.
+	// See :ref:`watched_directory <envoy_v3_api_msg_config.core.v3.DataSource>` for more information about the “watched_directory“ field.
+	IpTagsDatasource *v3.DataSource `protobuf:"bytes,1,opt,name=ip_tags_datasource,json=ipTagsDatasource,proto3" json:"ip_tags_datasource,omitempty"`
+	// When :ref:`ip_tags <envoy_v3_api_field_extensions.filters.http.ip_tagging.v3.IPTagging.ip_tags_file_provider.ip_tags_datasource>` is configured
+	// the ip tags will be reloaded from file every “ip_tags_refresh_rate“ milliseconds.
+	// Defaults to 0, in this case no refresh will be attempted.
+	IpTagsRefreshRate *durationpb.Duration `protobuf:"bytes,2,opt,name=ip_tags_refresh_rate,json=ipTagsRefreshRate,proto3" json:"ip_tags_refresh_rate,omitempty"`
+}
+
+func (x *IPTagging_IpTagsFileProvider) Reset() {
+	*x = IPTagging_IpTagsFileProvider{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *IPTagging_IpTagsFileProvider) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*IPTagging_IpTagsFileProvider) ProtoMessage() {}
+
+func (x *IPTagging_IpTagsFileProvider) ProtoReflect() protoreflect.Message {
+	mi := &file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use IPTagging_IpTagsFileProvider.ProtoReflect.Descriptor instead.
+func (*IPTagging_IpTagsFileProvider) Descriptor() ([]byte, []int) {
+	return file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_rawDescGZIP(), []int{0, 3}
+}
+
+func (x *IPTagging_IpTagsFileProvider) GetIpTagsDatasource() *v3.DataSource {
+	if x != nil {
+		return x.IpTagsDatasource
+	}
+	return nil
+}
+
+func (x *IPTagging_IpTagsFileProvider) GetIpTagsRefreshRate() *durationpb.Duration {
+	if x != nil {
+		return x.IpTagsRefreshRate
+	}
+	return nil
+}
+
 var File_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto protoreflect.FileDescriptor
 
 var file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_rawDesc = []byte{
@@ -343,75 +465,105 @@ var file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_rawDesc =
 	0x5f, 0x74, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x33, 0x1a, 0x22, 0x65, 0x6e, 0x76,
 	0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76,
 	0x33, 0x2f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
-	0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21,
-	0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69,
-	0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb1, 0x06, 0x0a, 0x09, 0x49,
-	0x50, 0x54, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x12, 0x6f, 0x0a, 0x0c, 0x72, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x42,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x69,
-	0x70, 0x5f, 0x74, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x50, 0x54,
-	0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x79,
-	0x70, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x72, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x5f, 0x0a, 0x07, 0x69, 0x70, 0x5f,
-	0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x69, 0x70, 0x5f, 0x74, 0x61,
-	0x67, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x50, 0x54, 0x61, 0x67, 0x67, 0x69,
-	0x6e, 0x67, 0x2e, 0x49, 0x50, 0x54, 0x61, 0x67, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x92, 0x01, 0x02,
-	0x08, 0x01, 0x52, 0x06, 0x69, 0x70, 0x54, 0x61, 0x67, 0x73, 0x12, 0x66, 0x0a, 0x0d, 0x69, 0x70,
-	0x5f, 0x74, 0x61, 0x67, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x42, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74,
-	0x70, 0x2e, 0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x33, 0x2e,
-	0x49, 0x50, 0x54, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x49, 0x70, 0x54, 0x61, 0x67, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x0b, 0x69, 0x70, 0x54, 0x61, 0x67, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x1a, 0xa0, 0x01, 0x0a, 0x05, 0x49, 0x50, 0x54, 0x61, 0x67, 0x12, 0x1e, 0x0a, 0x0b,
-	0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x69, 0x70, 0x54, 0x61, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x38, 0x0a, 0x07,
-	0x69, 0x70, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x69, 0x64, 0x72, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x06,
-	0x69, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x3a, 0x3d, 0x9a, 0xc5, 0x88, 0x1e, 0x38, 0x0a, 0x36, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x67, 0x69,
-	0x6e, 0x67, 0x2e, 0x76, 0x32, 0x2e, 0x49, 0x50, 0x54, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2e,
-	0x49, 0x50, 0x54, 0x61, 0x67, 0x1a, 0xd8, 0x01, 0x0a, 0x0b, 0x49, 0x70, 0x54, 0x61, 0x67, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x25, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01,
-	0x00, 0xc0, 0x01, 0x01, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x67, 0x0a, 0x06,
-	0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x4f, 0x2e, 0x65,
+	0x1f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6f,
+	0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
+	0x21, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x2f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c,
+	0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc6, 0x09, 0x0a, 0x09,
+	0x49, 0x50, 0x54, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x12, 0x6f, 0x0a, 0x0c, 0x72, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
+	0x42, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e,
+	0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x50,
+	0x54, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54,
+	0x79, 0x70, 0x65, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x72,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x55, 0x0a, 0x07, 0x69, 0x70,
+	0x5f, 0x74, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66,
+	0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x69, 0x70, 0x5f, 0x74,
+	0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x50, 0x54, 0x61, 0x67, 0x67,
+	0x69, 0x6e, 0x67, 0x2e, 0x49, 0x50, 0x54, 0x61, 0x67, 0x52, 0x06, 0x69, 0x70, 0x54, 0x61, 0x67,
+	0x73, 0x12, 0x66, 0x0a, 0x0d, 0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x5f, 0x68, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x67,
+	0x69, 0x6e, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x50, 0x54, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67,
+	0x2e, 0x49, 0x70, 0x54, 0x61, 0x67, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x0b, 0x69, 0x70,
+	0x54, 0x61, 0x67, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x7c, 0x0a, 0x15, 0x69, 0x70, 0x5f,
+	0x74, 0x61, 0x67, 0x73, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64,
+	0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x49, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x67,
+	0x69, 0x6e, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x50, 0x54, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67,
+	0x2e, 0x49, 0x70, 0x54, 0x61, 0x67, 0x73, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69,
+	0x64, 0x65, 0x72, 0x52, 0x12, 0x69, 0x70, 0x54, 0x61, 0x67, 0x73, 0x46, 0x69, 0x6c, 0x65, 0x50,
+	0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x1a, 0xa0, 0x01, 0x0a, 0x05, 0x49, 0x50, 0x54, 0x61,
+	0x67, 0x12, 0x1e, 0x0a, 0x0b, 0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x70, 0x54, 0x61, 0x67, 0x4e, 0x61, 0x6d,
+	0x65, 0x12, 0x38, 0x0a, 0x07, 0x69, 0x70, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x69, 0x64, 0x72, 0x52, 0x61,
+	0x6e, 0x67, 0x65, 0x52, 0x06, 0x69, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x3a, 0x3d, 0x9a, 0xc5, 0x88,
+	0x1e, 0x38, 0x0a, 0x36, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x69, 0x70, 0x5f,
+	0x74, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x32, 0x2e, 0x49, 0x50, 0x54, 0x61, 0x67,
+	0x67, 0x69, 0x6e, 0x67, 0x2e, 0x49, 0x50, 0x54, 0x61, 0x67, 0x1a, 0x62, 0x0a, 0x09, 0x49, 0x50,
+	0x54, 0x61, 0x67, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x55, 0x0a, 0x07, 0x69, 0x70, 0x5f, 0x74, 0x61,
+	0x67, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
+	0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x67,
+	0x69, 0x6e, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x50, 0x54, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67,
+	0x2e, 0x49, 0x50, 0x54, 0x61, 0x67, 0x52, 0x06, 0x69, 0x70, 0x54, 0x61, 0x67, 0x73, 0x1a, 0xd8,
+	0x01, 0x0a, 0x0b, 0x49, 0x70, 0x54, 0x61, 0x67, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x25,
+	0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0d,
+	0xfa, 0x42, 0x0a, 0x72, 0x08, 0x10, 0x01, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x01, 0x52, 0x06, 0x68,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x67, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x4f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
+	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73,
+	0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67,
+	0x2e, 0x76, 0x33, 0x2e, 0x49, 0x50, 0x54, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x49, 0x70,
+	0x54, 0x61, 0x67, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x39,
+	0x0a, 0x0c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0c,
+	0x0a, 0x08, 0x53, 0x41, 0x4e, 0x49, 0x54, 0x49, 0x5a, 0x45, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17,
+	0x41, 0x50, 0x50, 0x45, 0x4e, 0x44, 0x5f, 0x49, 0x46, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53,
+	0x5f, 0x4f, 0x52, 0x5f, 0x41, 0x44, 0x44, 0x10, 0x01, 0x1a, 0xba, 0x01, 0x0a, 0x12, 0x49, 0x70,
+	0x54, 0x61, 0x67, 0x73, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72,
+	0x12, 0x4e, 0x0a, 0x12, 0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x5f, 0x64, 0x61, 0x74, 0x61,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72, 0x65,
+	0x2e, 0x76, 0x33, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x10,
+	0x69, 0x70, 0x54, 0x61, 0x67, 0x73, 0x44, 0x61, 0x74, 0x61, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x12, 0x54, 0x0a, 0x14, 0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x73, 0x5f, 0x72, 0x65, 0x66, 0x72,
+	0x65, 0x73, 0x68, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
+	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0xfa, 0x42, 0x05, 0xaa, 0x01,
+	0x02, 0x2a, 0x00, 0x52, 0x11, 0x69, 0x70, 0x54, 0x61, 0x67, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65,
+	0x73, 0x68, 0x52, 0x61, 0x74, 0x65, 0x22, 0x33, 0x0a, 0x0b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x42, 0x4f, 0x54, 0x48, 0x10, 0x00, 0x12,
+	0x0c, 0x0a, 0x08, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x10, 0x01, 0x12, 0x0c, 0x0a,
+	0x08, 0x45, 0x58, 0x54, 0x45, 0x52, 0x4e, 0x41, 0x4c, 0x10, 0x02, 0x3a, 0x37, 0x9a, 0xc5, 0x88,
+	0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x69, 0x70, 0x5f,
+	0x74, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x32, 0x2e, 0x49, 0x50, 0x54, 0x61, 0x67,
+	0x67, 0x69, 0x6e, 0x67, 0x42, 0xb6, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a,
+	0x39, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
 	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
 	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x69, 0x70, 0x5f,
-	0x74, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x33, 0x2e, 0x49, 0x50, 0x54, 0x61, 0x67,
-	0x67, 0x69, 0x6e, 0x67, 0x2e, 0x49, 0x70, 0x54, 0x61, 0x67, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
-	0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x61,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x39, 0x0a, 0x0c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x41, 0x4e, 0x49, 0x54, 0x49, 0x5a,
-	0x45, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x41, 0x50, 0x50, 0x45, 0x4e, 0x44, 0x5f, 0x49, 0x46,
-	0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x5f, 0x4f, 0x52, 0x5f, 0x41, 0x44, 0x44, 0x10, 0x01,
-	0x22, 0x33, 0x0a, 0x0b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12,
-	0x08, 0x0a, 0x04, 0x42, 0x4f, 0x54, 0x48, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x4e, 0x54,
-	0x45, 0x52, 0x4e, 0x41, 0x4c, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x45, 0x58, 0x54, 0x45, 0x52,
-	0x4e, 0x41, 0x4c, 0x10, 0x02, 0x3a, 0x37, 0x9a, 0xc5, 0x88, 0x1e, 0x32, 0x0a, 0x30, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x67, 0x69, 0x6e,
-	0x67, 0x2e, 0x76, 0x32, 0x2e, 0x49, 0x50, 0x54, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x42, 0xb6,
-	0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x39, 0x69, 0x6f, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x67, 0x69, 0x6e,
-	0x67, 0x2e, 0x76, 0x33, 0x42, 0x0e, 0x49, 0x70, 0x54, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x5f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
-	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
-	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x69, 0x70, 0x5f,
-	0x74, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x33, 0x3b, 0x69, 0x70, 0x5f, 0x74, 0x61,
-	0x67, 0x67, 0x69, 0x6e, 0x67, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x33, 0x42, 0x0e, 0x49, 0x70, 0x54, 0x61,
+	0x67, 0x67, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x5f, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74,
+	0x74, 0x70, 0x2f, 0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x33,
+	0x3b, 0x69, 0x70, 0x5f, 0x74, 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x76, 0x33, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -427,26 +579,34 @@ func file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_rawDescGZ
 }
 
 var file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_goTypes = []interface{}{
 	(IPTagging_RequestType)(0),              // 0: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.RequestType
 	(IPTagging_IpTagHeader_HeaderAction)(0), // 1: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IpTagHeader.HeaderAction
 	(*IPTagging)(nil),                       // 2: envoy.extensions.filters.http.ip_tagging.v3.IPTagging
 	(*IPTagging_IPTag)(nil),                 // 3: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IPTag
-	(*IPTagging_IpTagHeader)(nil),           // 4: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IpTagHeader
-	(*v3.CidrRange)(nil),                    // 5: envoy.config.core.v3.CidrRange
+	(*IPTagging_IPTagFile)(nil),             // 4: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IPTagFile
+	(*IPTagging_IpTagHeader)(nil),           // 5: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IpTagHeader
+	(*IPTagging_IpTagsFileProvider)(nil),    // 6: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IpTagsFileProvider
+	(*v3.CidrRange)(nil),                    // 7: envoy.config.core.v3.CidrRange
+	(*v3.DataSource)(nil),                   // 8: envoy.config.core.v3.DataSource
+	(*durationpb.Duration)(nil),             // 9: google.protobuf.Duration
 }
 var file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_depIdxs = []int32{
 	0, // 0: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.request_type:type_name -> envoy.extensions.filters.http.ip_tagging.v3.IPTagging.RequestType
 	3, // 1: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.ip_tags:type_name -> envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IPTag
-	4, // 2: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.ip_tag_header:type_name -> envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IpTagHeader
-	5, // 3: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IPTag.ip_list:type_name -> envoy.config.core.v3.CidrRange
-	1, // 4: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IpTagHeader.action:type_name -> envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IpTagHeader.HeaderAction
-	5, // [5:5] is the sub-list for method output_type
-	5, // [5:5] is the sub-list for method input_type
-	5, // [5:5] is the sub-list for extension type_name
-	5, // [5:5] is the sub-list for extension extendee
-	0, // [0:5] is the sub-list for field type_name
+	5, // 2: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.ip_tag_header:type_name -> envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IpTagHeader
+	6, // 3: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.ip_tags_file_provider:type_name -> envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IpTagsFileProvider
+	7, // 4: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IPTag.ip_list:type_name -> envoy.config.core.v3.CidrRange
+	3, // 5: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IPTagFile.ip_tags:type_name -> envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IPTag
+	1, // 6: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IpTagHeader.action:type_name -> envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IpTagHeader.HeaderAction
+	8, // 7: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IpTagsFileProvider.ip_tags_datasource:type_name -> envoy.config.core.v3.DataSource
+	9, // 8: envoy.extensions.filters.http.ip_tagging.v3.IPTagging.IpTagsFileProvider.ip_tags_refresh_rate:type_name -> google.protobuf.Duration
+	9, // [9:9] is the sub-list for method output_type
+	9, // [9:9] is the sub-list for method input_type
+	9, // [9:9] is the sub-list for extension type_name
+	9, // [9:9] is the sub-list for extension extendee
+	0, // [0:9] is the sub-list for field type_name
 }
 
 func init() { file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_init() }
@@ -480,6 +640,18 @@ func file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_init() {
 			}
 		}
 		file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*IPTagging_IPTagFile); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*IPTagging_IpTagHeader); i {
 			case 0:
 				return &v.state
@@ -491,6 +663,18 @@ func file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_init() {
 				return nil
 			}
 		}
+		file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*IPTagging_IpTagsFileProvider); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -498,7 +682,7 @@ func file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_envoy_extensions_filters_http_ip_tagging_v3_ip_tagging_proto_rawDesc,
 			NumEnums:      2,
-			NumMessages:   3,
+			NumMessages:   5,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.validate.go b/envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.validate.go
old mode 100755
new mode 100644
index be168afabb..9a1ddc3db4
--- a/envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.validate.go
+++ b/envoy/extensions/filters/http/ip_tagging/v3/ip_tagging.pb.validate.go
@@ -69,17 +69,6 @@ func (m *IPTagging) validate(all bool) error {
 		errors = append(errors, err)
 	}
 
-	if len(m.GetIpTags()) < 1 {
-		err := IPTaggingValidationError{
-			field:  "IpTags",
-			reason: "value must contain at least 1 item(s)",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
 	for idx, item := range m.GetIpTags() {
 		_, _ = idx, item
 
@@ -143,6 +132,35 @@ func (m *IPTagging) validate(all bool) error {
 		}
 	}
 
+	if all {
+		switch v := interface{}(m.GetIpTagsFileProvider()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, IPTaggingValidationError{
+					field:  "IpTagsFileProvider",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, IPTaggingValidationError{
+					field:  "IpTagsFileProvider",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetIpTagsFileProvider()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return IPTaggingValidationError{
+				field:  "IpTagsFileProvider",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
 	if len(errors) > 0 {
 		return IPTaggingMultiError(errors)
 	}
@@ -356,6 +374,142 @@ var _ interface {
 	ErrorName() string
 } = IPTagging_IPTagValidationError{}
 
+// Validate checks the field values on IPTagging_IPTagFile with the rules
+// defined in the proto definition for this message. If any rules are
+// violated, the first error encountered is returned, or nil if there are no violations.
+func (m *IPTagging_IPTagFile) Validate() error {
+	return m.validate(false)
+}
+
+// ValidateAll checks the field values on IPTagging_IPTagFile with the rules
+// defined in the proto definition for this message. If any rules are
+// violated, the result is a list of violation errors wrapped in
+// IPTagging_IPTagFileMultiError, or nil if none found.
+func (m *IPTagging_IPTagFile) ValidateAll() error {
+	return m.validate(true)
+}
+
+func (m *IPTagging_IPTagFile) validate(all bool) error {
+	if m == nil {
+		return nil
+	}
+
+	var errors []error
+
+	for idx, item := range m.GetIpTags() {
+		_, _ = idx, item
+
+		if all {
+			switch v := interface{}(item).(type) {
+			case interface{ ValidateAll() error }:
+				if err := v.ValidateAll(); err != nil {
+					errors = append(errors, IPTagging_IPTagFileValidationError{
+						field:  fmt.Sprintf("IpTags[%v]", idx),
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			case interface{ Validate() error }:
+				if err := v.Validate(); err != nil {
+					errors = append(errors, IPTagging_IPTagFileValidationError{
+						field:  fmt.Sprintf("IpTags[%v]", idx),
+						reason: "embedded message failed validation",
+						cause:  err,
+					})
+				}
+			}
+		} else if v, ok := interface{}(item).(interface{ Validate() error }); ok {
+			if err := v.Validate(); err != nil {
+				return IPTagging_IPTagFileValidationError{
+					field:  fmt.Sprintf("IpTags[%v]", idx),
+					reason: "embedded message failed validation",
+					cause:  err,
+				}
+			}
+		}
+
+	}
+
+	if len(errors) > 0 {
+		return IPTagging_IPTagFileMultiError(errors)
+	}
+
+	return nil
+}
+
+// IPTagging_IPTagFileMultiError is an error wrapping multiple validation
+// errors returned by IPTagging_IPTagFile.ValidateAll() if the designated
+// constraints aren't met.
+type IPTagging_IPTagFileMultiError []error
+
+// Error returns a concatenation of all the error messages it wraps.
+func (m IPTagging_IPTagFileMultiError) Error() string {
+	var msgs []string
+	for _, err := range m {
+		msgs = append(msgs, err.Error())
+	}
+	return strings.Join(msgs, "; ")
+}
+
+// AllErrors returns a list of validation violation errors.
+func (m IPTagging_IPTagFileMultiError) AllErrors() []error { return m }
+
+// IPTagging_IPTagFileValidationError is the validation error returned by
+// IPTagging_IPTagFile.Validate if the designated constraints aren't met.
+type IPTagging_IPTagFileValidationError struct {
+	field  string
+	reason string
+	cause  error
+	key    bool
+}
+
+// Field function returns field value.
+func (e IPTagging_IPTagFileValidationError) Field() string { return e.field }
+
+// Reason function returns reason value.
+func (e IPTagging_IPTagFileValidationError) Reason() string { return e.reason }
+
+// Cause function returns cause value.
+func (e IPTagging_IPTagFileValidationError) Cause() error { return e.cause }
+
+// Key function returns key value.
+func (e IPTagging_IPTagFileValidationError) Key() bool { return e.key }
+
+// ErrorName returns error name.
+func (e IPTagging_IPTagFileValidationError) ErrorName() string {
+	return "IPTagging_IPTagFileValidationError"
+}
+
+// Error satisfies the builtin error interface
+func (e IPTagging_IPTagFileValidationError) Error() string {
+	cause := ""
+	if e.cause != nil {
+		cause = fmt.Sprintf(" | caused by: %v", e.cause)
+	}
+
+	key := ""
+	if e.key {
+		key = "key for "
+	}
+
+	return fmt.Sprintf(
+		"invalid %sIPTagging_IPTagFile.%s: %s%s",
+		key,
+		e.field,
+		e.reason,
+		cause)
+}
+
+var _ error = IPTagging_IPTagFileValidationError{}
+
+var _ interface {
+	Field() string
+	Reason() string
+	Key() bool
+	Cause() error
+	ErrorName() string
+} = IPTagging_IPTagFileValidationError{}
+
 // Validate checks the field values on IPTagging_IpTagHeader with the rules
 // defined in the proto definition for this message. If any rules are
 // violated, the first error encountered is returned, or nil if there are no violations.
@@ -483,3 +637,165 @@ var _ interface {
 } = IPTagging_IpTagHeaderValidationError{}
 
 var _IPTagging_IpTagHeader_Header_Pattern = regexp.MustCompile("^[^\x00\n\r]*$")
+
+// Validate checks the field values on IPTagging_IpTagsFileProvider with the
+// rules defined in the proto definition for this message. If any rules are
+// violated, the first error encountered is returned, or nil if there are no violations.
+func (m *IPTagging_IpTagsFileProvider) Validate() error {
+	return m.validate(false)
+}
+
+// ValidateAll checks the field values on IPTagging_IpTagsFileProvider with the
+// rules defined in the proto definition for this message. If any rules are
+// violated, the result is a list of violation errors wrapped in
+// IPTagging_IpTagsFileProviderMultiError, or nil if none found.
+func (m *IPTagging_IpTagsFileProvider) ValidateAll() error {
+	return m.validate(true)
+}
+
+func (m *IPTagging_IpTagsFileProvider) validate(all bool) error {
+	if m == nil {
+		return nil
+	}
+
+	var errors []error
+
+	if all {
+		switch v := interface{}(m.GetIpTagsDatasource()).(type) {
+		case interface{ ValidateAll() error }:
+			if err := v.ValidateAll(); err != nil {
+				errors = append(errors, IPTagging_IpTagsFileProviderValidationError{
+					field:  "IpTagsDatasource",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		case interface{ Validate() error }:
+			if err := v.Validate(); err != nil {
+				errors = append(errors, IPTagging_IpTagsFileProviderValidationError{
+					field:  "IpTagsDatasource",
+					reason: "embedded message failed validation",
+					cause:  err,
+				})
+			}
+		}
+	} else if v, ok := interface{}(m.GetIpTagsDatasource()).(interface{ Validate() error }); ok {
+		if err := v.Validate(); err != nil {
+			return IPTagging_IpTagsFileProviderValidationError{
+				field:  "IpTagsDatasource",
+				reason: "embedded message failed validation",
+				cause:  err,
+			}
+		}
+	}
+
+	if d := m.GetIpTagsRefreshRate(); d != nil {
+		dur, err := d.AsDuration(), d.CheckValid()
+		if err != nil {
+			err = IPTagging_IpTagsFileProviderValidationError{
+				field:  "IpTagsRefreshRate",
+				reason: "value is not a valid duration",
+				cause:  err,
+			}
+			if !all {
+				return err
+			}
+			errors = append(errors, err)
+		} else {
+
+			gt := time.Duration(0*time.Second + 0*time.Nanosecond)
+
+			if dur <= gt {
+				err := IPTagging_IpTagsFileProviderValidationError{
+					field:  "IpTagsRefreshRate",
+					reason: "value must be greater than 0s",
+				}
+				if !all {
+					return err
+				}
+				errors = append(errors, err)
+			}
+
+		}
+	}
+
+	if len(errors) > 0 {
+		return IPTagging_IpTagsFileProviderMultiError(errors)
+	}
+
+	return nil
+}
+
+// IPTagging_IpTagsFileProviderMultiError is an error wrapping multiple
+// validation errors returned by IPTagging_IpTagsFileProvider.ValidateAll() if
+// the designated constraints aren't met.
+type IPTagging_IpTagsFileProviderMultiError []error
+
+// Error returns a concatenation of all the error messages it wraps.
+func (m IPTagging_IpTagsFileProviderMultiError) Error() string {
+	var msgs []string
+	for _, err := range m {
+		msgs = append(msgs, err.Error())
+	}
+	return strings.Join(msgs, "; ")
+}
+
+// AllErrors returns a list of validation violation errors.
+func (m IPTagging_IpTagsFileProviderMultiError) AllErrors() []error { return m }
+
+// IPTagging_IpTagsFileProviderValidationError is the validation error returned
+// by IPTagging_IpTagsFileProvider.Validate if the designated constraints
+// aren't met.
+type IPTagging_IpTagsFileProviderValidationError struct {
+	field  string
+	reason string
+	cause  error
+	key    bool
+}
+
+// Field function returns field value.
+func (e IPTagging_IpTagsFileProviderValidationError) Field() string { return e.field }
+
+// Reason function returns reason value.
+func (e IPTagging_IpTagsFileProviderValidationError) Reason() string { return e.reason }
+
+// Cause function returns cause value.
+func (e IPTagging_IpTagsFileProviderValidationError) Cause() error { return e.cause }
+
+// Key function returns key value.
+func (e IPTagging_IpTagsFileProviderValidationError) Key() bool { return e.key }
+
+// ErrorName returns error name.
+func (e IPTagging_IpTagsFileProviderValidationError) ErrorName() string {
+	return "IPTagging_IpTagsFileProviderValidationError"
+}
+
+// Error satisfies the builtin error interface
+func (e IPTagging_IpTagsFileProviderValidationError) Error() string {
+	cause := ""
+	if e.cause != nil {
+		cause = fmt.Sprintf(" | caused by: %v", e.cause)
+	}
+
+	key := ""
+	if e.key {
+		key = "key for "
+	}
+
+	return fmt.Sprintf(
+		"invalid %sIPTagging_IpTagsFileProvider.%s: %s%s",
+		key,
+		e.field,
+		e.reason,
+		cause)
+}
+
+var _ error = IPTagging_IpTagsFileProviderValidationError{}
+
+var _ interface {
+	Field() string
+	Reason() string
+	Key() bool
+	Cause() error
+	ErrorName() string
+} = IPTagging_IpTagsFileProviderValidationError{}
diff --git a/envoy/extensions/filters/http/ip_tagging/v3/ip_tagging_vtproto.pb.go b/envoy/extensions/filters/http/ip_tagging/v3/ip_tagging_vtproto.pb.go
index e43f689173..37f68956c0 100755
--- a/envoy/extensions/filters/http/ip_tagging/v3/ip_tagging_vtproto.pb.go
+++ b/envoy/extensions/filters/http/ip_tagging/v3/ip_tagging_vtproto.pb.go
@@ -8,6 +8,7 @@ package ip_taggingv3
 
 import (
 	protohelpers "github.com/planetscale/vtprotobuf/protohelpers"
+	durationpb "github.com/planetscale/vtprotobuf/types/known/durationpb"
 	proto "google.golang.org/protobuf/proto"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
@@ -83,6 +84,51 @@ func (m *IPTagging_IPTag) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error)
 	return len(dAtA) - i, nil
 }
 
+func (m *IPTagging_IPTagFile) MarshalVTStrict() (dAtA []byte, err error) {
+	if m == nil {
+		return nil, nil
+	}
+	size := m.SizeVT()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *IPTagging_IPTagFile) MarshalToVTStrict(dAtA []byte) (int, error) {
+	size := m.SizeVT()
+	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
+}
+
+func (m *IPTagging_IPTagFile) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
+	if m == nil {
+		return 0, nil
+	}
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.unknownFields != nil {
+		i -= len(m.unknownFields)
+		copy(dAtA[i:], m.unknownFields)
+	}
+	if len(m.IpTags) > 0 {
+		for iNdEx := len(m.IpTags) - 1; iNdEx >= 0; iNdEx-- {
+			size, err := m.IpTags[iNdEx].MarshalToSizedBufferVTStrict(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
+			i--
+			dAtA[i] = 0xa
+		}
+	}
+	return len(dAtA) - i, nil
+}
+
 func (m *IPTagging_IpTagHeader) MarshalVTStrict() (dAtA []byte, err error) {
 	if m == nil {
 		return nil, nil
@@ -128,6 +174,71 @@ func (m *IPTagging_IpTagHeader) MarshalToSizedBufferVTStrict(dAtA []byte) (int,
 	return len(dAtA) - i, nil
 }
 
+func (m *IPTagging_IpTagsFileProvider) MarshalVTStrict() (dAtA []byte, err error) {
+	if m == nil {
+		return nil, nil
+	}
+	size := m.SizeVT()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *IPTagging_IpTagsFileProvider) MarshalToVTStrict(dAtA []byte) (int, error) {
+	size := m.SizeVT()
+	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
+}
+
+func (m *IPTagging_IpTagsFileProvider) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
+	if m == nil {
+		return 0, nil
+	}
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.unknownFields != nil {
+		i -= len(m.unknownFields)
+		copy(dAtA[i:], m.unknownFields)
+	}
+	if m.IpTagsRefreshRate != nil {
+		size, err := (*durationpb.Duration)(m.IpTagsRefreshRate).MarshalToSizedBufferVTStrict(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
+		i--
+		dAtA[i] = 0x12
+	}
+	if m.IpTagsDatasource != nil {
+		if vtmsg, ok := interface{}(m.IpTagsDatasource).(interface {
+			MarshalToSizedBufferVTStrict([]byte) (int, error)
+		}); ok {
+			size, err := vtmsg.MarshalToSizedBufferVTStrict(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
+		} else {
+			encoded, err := proto.Marshal(m.IpTagsDatasource)
+			if err != nil {
+				return 0, err
+			}
+			i -= len(encoded)
+			copy(dAtA[i:], encoded)
+			i = protohelpers.EncodeVarint(dAtA, i, uint64(len(encoded)))
+		}
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
 func (m *IPTagging) MarshalVTStrict() (dAtA []byte, err error) {
 	if m == nil {
 		return nil, nil
@@ -158,6 +269,16 @@ func (m *IPTagging) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
 		i -= len(m.unknownFields)
 		copy(dAtA[i:], m.unknownFields)
 	}
+	if m.IpTagsFileProvider != nil {
+		size, err := m.IpTagsFileProvider.MarshalToSizedBufferVTStrict(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
+		i--
+		dAtA[i] = 0x32
+	}
 	if m.IpTagHeader != nil {
 		size, err := m.IpTagHeader.MarshalToSizedBufferVTStrict(dAtA[:i])
 		if err != nil {
@@ -214,6 +335,22 @@ func (m *IPTagging_IPTag) SizeVT() (n int) {
 	return n
 }
 
+func (m *IPTagging_IPTagFile) SizeVT() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if len(m.IpTags) > 0 {
+		for _, e := range m.IpTags {
+			l = e.SizeVT()
+			n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
+		}
+	}
+	n += len(m.unknownFields)
+	return n
+}
+
 func (m *IPTagging_IpTagHeader) SizeVT() (n int) {
 	if m == nil {
 		return 0
@@ -231,6 +368,30 @@ func (m *IPTagging_IpTagHeader) SizeVT() (n int) {
 	return n
 }
 
+func (m *IPTagging_IpTagsFileProvider) SizeVT() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.IpTagsDatasource != nil {
+		if size, ok := interface{}(m.IpTagsDatasource).(interface {
+			SizeVT() int
+		}); ok {
+			l = size.SizeVT()
+		} else {
+			l = proto.Size(m.IpTagsDatasource)
+		}
+		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
+	}
+	if m.IpTagsRefreshRate != nil {
+		l = (*durationpb.Duration)(m.IpTagsRefreshRate).SizeVT()
+		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
+	}
+	n += len(m.unknownFields)
+	return n
+}
+
 func (m *IPTagging) SizeVT() (n int) {
 	if m == nil {
 		return 0
@@ -250,6 +411,10 @@ func (m *IPTagging) SizeVT() (n int) {
 		l = m.IpTagHeader.SizeVT()
 		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
 	}
+	if m.IpTagsFileProvider != nil {
+		l = m.IpTagsFileProvider.SizeVT()
+		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
+	}
 	n += len(m.unknownFields)
 	return n
 }
diff --git a/envoy/extensions/filters/http/json_to_metadata/v3/json_to_metadata.pb.validate.go b/envoy/extensions/filters/http/json_to_metadata/v3/json_to_metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/jwt_authn/v3/config.pb.validate.go b/envoy/extensions/filters/http/jwt_authn/v3/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/kill_request/v3/kill_request.pb.validate.go b/envoy/extensions/filters/http/kill_request/v3/kill_request.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.go b/envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.go
index f33fc58722..38ca1c8baa 100755
--- a/envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.go
+++ b/envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.go
@@ -131,20 +131,6 @@ type LocalRateLimit struct {
 	LocalClusterRateLimit *v32.LocalClusterRateLimit `protobuf:"bytes,16,opt,name=local_cluster_rate_limit,json=localClusterRateLimit,proto3" json:"local_cluster_rate_limit,omitempty"`
 	// Defines the standard version to use for X-RateLimit headers emitted by the filter.
 	//
-	//   - “X-RateLimit-Limit“ - indicates the request-quota associated to the
-	//     client in the current time-window followed by the description of the
-	//     quota policy.
-	//   - “X-RateLimit-Remaining“ - indicates the remaining requests in the
-	//     current time-window.
-	//   - “X-RateLimit-Reset“ - indicates the number of seconds until reset of
-	//     the current time-window.
-	//
-	// In case rate limiting policy specifies more then one time window, the values
-	// above represent the window that is closest to reaching its limit.
-	//
-	// For more information about the headers specification see selected version of
-	// the `draft RFC <https://tools.ietf.org/id/draft-polli-ratelimit-headers-03.html>`_.
-	//
 	// Disabled by default.
 	EnableXRatelimitHeaders v32.XRateLimitHeadersRFCVersion `protobuf:"varint,12,opt,name=enable_x_ratelimit_headers,json=enableXRatelimitHeaders,proto3,enum=envoy.extensions.common.ratelimit.v3.XRateLimitHeadersRFCVersion" json:"enable_x_ratelimit_headers,omitempty"`
 	// Specifies if the local rate limit filter should include the virtual host rate limits.
diff --git a/envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.validate.go b/envoy/extensions/filters/http/local_ratelimit/v3/local_rate_limit.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/lua/v3/lua.pb.go b/envoy/extensions/filters/http/lua/v3/lua.pb.go
index 198b6034ba..59d4747c55 100755
--- a/envoy/extensions/filters/http/lua/v3/lua.pb.go
+++ b/envoy/extensions/filters/http/lua/v3/lua.pb.go
@@ -180,6 +180,8 @@ type LuaPerRoute struct {
 	//	  local filter_context_value = filter_context["key"]
 	//	  -- Do something with filter_context_value.
 	//	end
+	//
+	// [#not-implemented-hide:]
 	FilterContext *structpb.Struct `protobuf:"bytes,4,opt,name=filter_context,json=filterContext,proto3" json:"filter_context,omitempty"`
 }
 
@@ -329,7 +331,7 @@ var file_envoy_extensions_filters_http_lua_v3_lua_proto_rawDesc = []byte{
 	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x3a, 0x2a, 0x9a, 0xc5, 0x88, 0x1e, 0x25, 0x0a, 0x23,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c,
 	0x74, 0x65, 0x72, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x6c, 0x75, 0x61, 0x2e, 0x76, 0x32, 0x2e,
-	0x4c, 0x75, 0x61, 0x22, 0xe4, 0x01, 0x0a, 0x0b, 0x4c, 0x75, 0x61, 0x50, 0x65, 0x72, 0x52, 0x6f,
+	0x4c, 0x75, 0x61, 0x22, 0xe9, 0x01, 0x0a, 0x0b, 0x4c, 0x75, 0x61, 0x50, 0x65, 0x72, 0x52, 0x6f,
 	0x75, 0x74, 0x65, 0x12, 0x25, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x08, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x6a, 0x02, 0x08, 0x01, 0x48, 0x00,
 	0x52, 0x08, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x1d, 0x0a, 0x04, 0x6e, 0x61,
@@ -342,18 +344,19 @@ var file_envoy_extensions_filters_http_lua_v3_lua_proto_rawDesc = []byte{
 	0x0a, 0x0e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
 	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52,
-	0x0d, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x42, 0x0a,
-	0x0a, 0x08, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x42, 0x9b, 0x01, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x32, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74,
-	0x74, 0x70, 0x2e, 0x6c, 0x75, 0x61, 0x2e, 0x76, 0x33, 0x42, 0x08, 0x4c, 0x75, 0x61, 0x50, 0x72,
-	0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x51, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
-	0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d,
-	0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66,
-	0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x6c, 0x75, 0x61, 0x2f,
-	0x76, 0x33, 0x3b, 0x6c, 0x75, 0x61, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x0d, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x42, 0x0f,
+	0x0a, 0x08, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x42,
+	0x9b, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x32, 0x69, 0x6f, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65,
+	0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x6c, 0x75, 0x61, 0x2e, 0x76, 0x33, 0x42, 0x08,
+	0x4c, 0x75, 0x61, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x51, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70,
+	0x2f, 0x6c, 0x75, 0x61, 0x2f, 0x76, 0x33, 0x3b, 0x6c, 0x75, 0x61, 0x76, 0x33, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/envoy/extensions/filters/http/lua/v3/lua.pb.validate.go b/envoy/extensions/filters/http/lua/v3/lua.pb.validate.go
old mode 100755
new mode 100644
index 123d6bd73e..aeae82a19d
--- a/envoy/extensions/filters/http/lua/v3/lua.pb.validate.go
+++ b/envoy/extensions/filters/http/lua/v3/lua.pb.validate.go
@@ -293,6 +293,7 @@ func (m *LuaPerRoute) validate(all bool) error {
 		}
 	}
 
+	oneofOverridePresent := false
 	switch v := m.Override.(type) {
 	case *LuaPerRoute_Disabled:
 		if v == nil {
@@ -305,6 +306,7 @@ func (m *LuaPerRoute) validate(all bool) error {
 			}
 			errors = append(errors, err)
 		}
+		oneofOverridePresent = true
 
 		if m.GetDisabled() != true {
 			err := LuaPerRouteValidationError{
@@ -328,6 +330,7 @@ func (m *LuaPerRoute) validate(all bool) error {
 			}
 			errors = append(errors, err)
 		}
+		oneofOverridePresent = true
 
 		if utf8.RuneCountInString(m.GetName()) < 1 {
 			err := LuaPerRouteValidationError{
@@ -351,6 +354,7 @@ func (m *LuaPerRoute) validate(all bool) error {
 			}
 			errors = append(errors, err)
 		}
+		oneofOverridePresent = true
 
 		if all {
 			switch v := interface{}(m.GetSourceCode()).(type) {
@@ -384,6 +388,16 @@ func (m *LuaPerRoute) validate(all bool) error {
 	default:
 		_ = v // ensures v is used
 	}
+	if !oneofOverridePresent {
+		err := LuaPerRouteValidationError{
+			field:  "Override",
+			reason: "value is required",
+		}
+		if !all {
+			return err
+		}
+		errors = append(errors, err)
+	}
 
 	if len(errors) > 0 {
 		return LuaPerRouteMultiError(errors)
diff --git a/envoy/extensions/filters/http/oauth2/v3/oauth.pb.go b/envoy/extensions/filters/http/oauth2/v3/oauth.pb.go
index 4ee454ad30..d7bd242ebd 100755
--- a/envoy/extensions/filters/http/oauth2/v3/oauth.pb.go
+++ b/envoy/extensions/filters/http/oauth2/v3/oauth.pb.go
@@ -391,7 +391,7 @@ func (*OAuth2Credentials_HmacSecret) isOAuth2Credentials_TokenFormation() {}
 
 // OAuth config
 //
-// [#next-free-field: 24]
+// [#next-free-field: 23]
 type OAuth2Config struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -403,13 +403,6 @@ type OAuth2Config struct {
 	RetryPolicy *v31.RetryPolicy `protobuf:"bytes,18,opt,name=retry_policy,json=retryPolicy,proto3" json:"retry_policy,omitempty"`
 	// The endpoint redirect to for authorization in response to unauthorized requests.
 	AuthorizationEndpoint string `protobuf:"bytes,2,opt,name=authorization_endpoint,json=authorizationEndpoint,proto3" json:"authorization_endpoint,omitempty"`
-	// The endpoint at the authorization server to request the user be logged out of the Authorization server.
-	// This field is optional and should be set only if openid is in the auth_scopes and the authorization server
-	// supports the OpenID Connect RP-Initiated Logout specification.
-	// For more information, see https://openid.net/specs/openid-connect-rpinitiated-1_0.html
-	//
-	// If configured, the OAuth2 filter will redirect users to this endpoint when they access the signout_path.
-	EndSessionEndpoint string `protobuf:"bytes,23,opt,name=end_session_endpoint,json=endSessionEndpoint,proto3" json:"end_session_endpoint,omitempty"`
 	// Credentials used for OAuth.
 	Credentials *OAuth2Credentials `protobuf:"bytes,3,opt,name=credentials,proto3" json:"credentials,omitempty"`
 	// The redirect URI passed to the authorization endpoint. Supports header formatting
@@ -534,13 +527,6 @@ func (x *OAuth2Config) GetAuthorizationEndpoint() string {
 	return ""
 }
 
-func (x *OAuth2Config) GetEndSessionEndpoint() string {
-	if x != nil {
-		return x.EndSessionEndpoint
-	}
-	return ""
-}
-
 func (x *OAuth2Config) GetCredentials() *OAuth2Credentials {
 	if x != nil {
 		return x.Credentials
@@ -970,7 +956,7 @@ var file_envoy_extensions_filters_http_oauth2_v3_oauth_proto_rawDesc = []byte{
 	0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xd0, 0x01, 0x01,
 	0xc0, 0x01, 0x01, 0x52, 0x0c, 0x63, 0x6f, 0x64, 0x65, 0x56, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65,
 	0x72, 0x42, 0x16, 0x0a, 0x0f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0x93, 0x0d, 0x0a, 0x0c, 0x4f, 0x41,
+	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22, 0xe1, 0x0c, 0x0a, 0x0c, 0x4f, 0x41,
 	0x75, 0x74, 0x68, 0x32, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x44, 0x0a, 0x0e, 0x74, 0x6f,
 	0x6b, 0x65, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69,
@@ -984,115 +970,112 @@ var file_envoy_extensions_filters_http_oauth2_v3_oauth_proto_rawDesc = []byte{
 	0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52,
 	0x15, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e,
-	0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x30, 0x0a, 0x14, 0x65, 0x6e, 0x64, 0x5f, 0x73, 0x65,
-	0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x17,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
-	0x45, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x66, 0x0a, 0x0b, 0x63, 0x72, 0x65, 0x64,
-	0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e,
+	0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x66, 0x0a, 0x0b, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e,
+	0x74, 0x69, 0x61, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66,
+	0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x6f, 0x61, 0x75, 0x74,
+	0x68, 0x32, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x43, 0x72, 0x65, 0x64,
+	0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10,
+	0x01, 0x52, 0x0b, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x12, 0x2a,
+	0x0a, 0x0c, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x75, 0x72, 0x69, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0b, 0x72,
+	0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x55, 0x72, 0x69, 0x12, 0x60, 0x0a, 0x15, 0x72, 0x65,
+	0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
+	0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76,
+	0x33, 0x2e, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa,
+	0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x13, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63,
+	0x74, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x4f, 0x0a, 0x0c,
+	0x73, 0x69, 0x67, 0x6e, 0x6f, 0x75, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x61, 0x74, 0x68, 0x4d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01,
+	0x52, 0x0b, 0x73, 0x69, 0x67, 0x6e, 0x6f, 0x75, 0x74, 0x50, 0x61, 0x74, 0x68, 0x12, 0x30, 0x0a,
+	0x14, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x62, 0x65, 0x61, 0x72, 0x65, 0x72, 0x5f,
+	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x66, 0x6f, 0x72,
+	0x77, 0x61, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12,
+	0x42, 0x0a, 0x1d, 0x70, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x5f, 0x61, 0x75, 0x74, 0x68,
+	0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1b, 0x70, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
+	0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x12, 0x56, 0x0a, 0x14, 0x70, 0x61, 0x73, 0x73, 0x5f, 0x74, 0x68, 0x72, 0x6f,
+	0x75, 0x67, 0x68, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x08, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x12, 0x70, 0x61, 0x73, 0x73, 0x54, 0x68, 0x72,
+	0x6f, 0x75, 0x67, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x61,
+	0x75, 0x74, 0x68, 0x5f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x0a, 0x61, 0x75, 0x74, 0x68, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x09,
+	0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x65, 0x0a, 0x09, 0x61, 0x75,
+	0x74, 0x68, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3e, 0x2e,
 	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
 	0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x6f, 0x61,
-	0x75, 0x74, 0x68, 0x32, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x43, 0x72,
-	0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01,
-	0x02, 0x10, 0x01, 0x52, 0x0b, 0x63, 0x72, 0x65, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x73,
-	0x12, 0x2a, 0x0a, 0x0c, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x75, 0x72, 0x69,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52,
-	0x0b, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x55, 0x72, 0x69, 0x12, 0x60, 0x0a, 0x15,
-	0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x5f, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72,
-	0x2e, 0x76, 0x33, 0x2e, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42,
-	0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x13, 0x72, 0x65, 0x64, 0x69, 0x72,
-	0x65, 0x63, 0x74, 0x50, 0x61, 0x74, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x4f,
-	0x0a, 0x0c, 0x73, 0x69, 0x67, 0x6e, 0x6f, 0x75, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70,
-	0x65, 0x2e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x61, 0x74,
-	0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02,
-	0x10, 0x01, 0x52, 0x0b, 0x73, 0x69, 0x67, 0x6e, 0x6f, 0x75, 0x74, 0x50, 0x61, 0x74, 0x68, 0x12,
-	0x30, 0x0a, 0x14, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x62, 0x65, 0x61, 0x72, 0x65,
-	0x72, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x66,
-	0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65,
-	0x6e, 0x12, 0x42, 0x0a, 0x1d, 0x70, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x5f, 0x61, 0x75,
-	0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1b, 0x70, 0x72, 0x65, 0x73, 0x65, 0x72,
-	0x76, 0x65, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x56, 0x0a, 0x14, 0x70, 0x61, 0x73, 0x73, 0x5f, 0x74, 0x68,
-	0x72, 0x6f, 0x75, 0x67, 0x68, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x08, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x12, 0x70, 0x61, 0x73, 0x73, 0x54,
-	0x68, 0x72, 0x6f, 0x75, 0x67, 0x68, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x1f, 0x0a,
-	0x0b, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x73, 0x18, 0x09, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x0a, 0x61, 0x75, 0x74, 0x68, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x73, 0x12, 0x1c,
-	0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x65, 0x0a, 0x09,
-	0x61, 0x75, 0x74, 0x68, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x3e, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e,
-	0x6f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x54, 0x79, 0x70, 0x65, 0x42,
-	0x08, 0xfa, 0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x08, 0x61, 0x75, 0x74, 0x68, 0x54,
-	0x79, 0x70, 0x65, 0x12, 0x46, 0x0a, 0x11, 0x75, 0x73, 0x65, 0x5f, 0x72, 0x65, 0x66, 0x72, 0x65,
-	0x73, 0x68, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x75, 0x73, 0x65, 0x52,
-	0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x47, 0x0a, 0x12, 0x64,
-	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x5f, 0x69,
-	0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x10, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x45, 0x78, 0x70, 0x69, 0x72,
-	0x65, 0x73, 0x49, 0x6e, 0x12, 0x58, 0x0a, 0x15, 0x64, 0x65, 0x6e, 0x79, 0x5f, 0x72, 0x65, 0x64,
-	0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x0e, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x13, 0x64, 0x65, 0x6e, 0x79, 0x52,
-	0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x61,
-	0x0a, 0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73,
-	0x68, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x5f,
-	0x69, 0x6e, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x1c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x66, 0x72,
-	0x65, 0x73, 0x68, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x49,
-	0x6e, 0x12, 0x3c, 0x0a, 0x1b, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x5f,
+	0x75, 0x74, 0x68, 0x32, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x54, 0x79, 0x70, 0x65, 0x42, 0x08, 0xfa,
+	0x42, 0x05, 0x82, 0x01, 0x02, 0x10, 0x01, 0x52, 0x08, 0x61, 0x75, 0x74, 0x68, 0x54, 0x79, 0x70,
+	0x65, 0x12, 0x46, 0x0a, 0x11, 0x75, 0x73, 0x65, 0x5f, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
+	0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42,
+	0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0f, 0x75, 0x73, 0x65, 0x52, 0x65, 0x66,
+	0x72, 0x65, 0x73, 0x68, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x47, 0x0a, 0x12, 0x64, 0x65, 0x66,
+	0x61, 0x75, 0x6c, 0x74, 0x5f, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x5f, 0x69, 0x6e, 0x18,
+	0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x10, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73,
+	0x49, 0x6e, 0x12, 0x58, 0x0a, 0x15, 0x64, 0x65, 0x6e, 0x79, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72,
+	0x65, 0x63, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x18, 0x0e, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x24, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x52, 0x13, 0x64, 0x65, 0x6e, 0x79, 0x52, 0x65, 0x64,
+	0x69, 0x72, 0x65, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x12, 0x61, 0x0a, 0x20,
+	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x5f,
+	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x5f, 0x69, 0x6e,
+	0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x1c, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73,
+	0x68, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x73, 0x49, 0x6e, 0x12,
+	0x3c, 0x0a, 0x1b, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x5f, 0x74, 0x6f,
+	0x6b, 0x65, 0x6e, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x18, 0x11,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x54,
+	0x6f, 0x6b, 0x65, 0x6e, 0x53, 0x65, 0x74, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x12, 0x44, 0x0a,
+	0x1f, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f,
 	0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65,
-	0x18, 0x11, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x49,
-	0x64, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x53, 0x65, 0x74, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x12,
-	0x44, 0x0a, 0x1f, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x63, 0x63, 0x65, 0x73,
-	0x73, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x73, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6f, 0x6b,
-	0x69, 0x65, 0x18, 0x13, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1b, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c,
-	0x65, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x53, 0x65, 0x74, 0x43,
-	0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x12, 0x46, 0x0a, 0x20, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65,
-	0x5f, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x73,
-	0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x1c, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54,
-	0x6f, 0x6b, 0x65, 0x6e, 0x53, 0x65, 0x74, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x12, 0x5d, 0x0a,
-	0x0e, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x18,
-	0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73,
-	0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x2e, 0x76, 0x33, 0x2e,
-	0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x52, 0x0d, 0x63,
-	0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x0b,
-	0x73, 0x74, 0x61, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x16, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x22, 0x30, 0x0a,
-	0x08, 0x41, 0x75, 0x74, 0x68, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x55, 0x52, 0x4c,
-	0x5f, 0x45, 0x4e, 0x43, 0x4f, 0x44, 0x45, 0x44, 0x5f, 0x42, 0x4f, 0x44, 0x59, 0x10, 0x00, 0x12,
-	0x0e, 0x0a, 0x0a, 0x42, 0x41, 0x53, 0x49, 0x43, 0x5f, 0x41, 0x55, 0x54, 0x48, 0x10, 0x01, 0x22,
-	0x57, 0x0a, 0x06, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x12, 0x4d, 0x0a, 0x06, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x32,
-	0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xa6, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06,
-	0x02, 0x10, 0x02, 0x0a, 0x35, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
-	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70,
-	0x2e, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x2e, 0x76, 0x33, 0x42, 0x0a, 0x4f, 0x61, 0x75, 0x74,
-	0x68, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x57, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x6f,
-	0x61, 0x75, 0x74, 0x68, 0x32, 0x2f, 0x76, 0x33, 0x3b, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x76,
-	0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x18, 0x13, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1b, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x41,
+	0x63, 0x63, 0x65, 0x73, 0x73, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x53, 0x65, 0x74, 0x43, 0x6f, 0x6f,
+	0x6b, 0x69, 0x65, 0x12, 0x46, 0x0a, 0x20, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72,
+	0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x73, 0x65, 0x74,
+	0x5f, 0x63, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1c, 0x64,
+	0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x6f, 0x6b,
+	0x65, 0x6e, 0x53, 0x65, 0x74, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x12, 0x5d, 0x0a, 0x0e, 0x63,
+	0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x18, 0x15, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65,
+	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68,
+	0x74, 0x74, 0x70, 0x2e, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6f,
+	0x6f, 0x6b, 0x69, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x52, 0x0d, 0x63, 0x6f, 0x6f,
+	0x6b, 0x69, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74,
+	0x61, 0x74, 0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0a, 0x73, 0x74, 0x61, 0x74, 0x50, 0x72, 0x65, 0x66, 0x69, 0x78, 0x22, 0x30, 0x0a, 0x08, 0x41,
+	0x75, 0x74, 0x68, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x10, 0x55, 0x52, 0x4c, 0x5f, 0x45,
+	0x4e, 0x43, 0x4f, 0x44, 0x45, 0x44, 0x5f, 0x42, 0x4f, 0x44, 0x59, 0x10, 0x00, 0x12, 0x0e, 0x0a,
+	0x0a, 0x42, 0x41, 0x53, 0x49, 0x43, 0x5f, 0x41, 0x55, 0x54, 0x48, 0x10, 0x01, 0x22, 0x57, 0x0a,
+	0x06, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x12, 0x4d, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
+	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65,
+	0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x2e, 0x76,
+	0x33, 0x2e, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0xa6, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10,
+	0x02, 0x0a, 0x35, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79,
+	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+	0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x6f,
+	0x61, 0x75, 0x74, 0x68, 0x32, 0x2e, 0x76, 0x33, 0x42, 0x0a, 0x4f, 0x61, 0x75, 0x74, 0x68, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x57, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
+	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
+	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
+	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x6f, 0x61, 0x75,
+	0x74, 0x68, 0x32, 0x2f, 0x76, 0x33, 0x3b, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x76, 0x33, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/envoy/extensions/filters/http/oauth2/v3/oauth.pb.validate.go b/envoy/extensions/filters/http/oauth2/v3/oauth.pb.validate.go
old mode 100755
new mode 100644
index 9decd1796b..eb1d0f4257
--- a/envoy/extensions/filters/http/oauth2/v3/oauth.pb.validate.go
+++ b/envoy/extensions/filters/http/oauth2/v3/oauth.pb.validate.go
@@ -793,8 +793,6 @@ func (m *OAuth2Config) validate(all bool) error {
 		errors = append(errors, err)
 	}
 
-	// no validation rules for EndSessionEndpoint
-
 	if m.GetCredentials() == nil {
 		err := OAuth2ConfigValidationError{
 			field:  "Credentials",
diff --git a/envoy/extensions/filters/http/oauth2/v3/oauth_vtproto.pb.go b/envoy/extensions/filters/http/oauth2/v3/oauth_vtproto.pb.go
index f57792f5bd..9655993d2a 100755
--- a/envoy/extensions/filters/http/oauth2/v3/oauth_vtproto.pb.go
+++ b/envoy/extensions/filters/http/oauth2/v3/oauth_vtproto.pb.go
@@ -395,15 +395,6 @@ func (m *OAuth2Config) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
 		i -= len(m.unknownFields)
 		copy(dAtA[i:], m.unknownFields)
 	}
-	if len(m.EndSessionEndpoint) > 0 {
-		i -= len(m.EndSessionEndpoint)
-		copy(dAtA[i:], m.EndSessionEndpoint)
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.EndSessionEndpoint)))
-		i--
-		dAtA[i] = 0x1
-		i--
-		dAtA[i] = 0xba
-	}
 	if len(m.StatPrefix) > 0 {
 		i -= len(m.StatPrefix)
 		copy(dAtA[i:], m.StatPrefix)
@@ -1020,10 +1011,6 @@ func (m *OAuth2Config) SizeVT() (n int) {
 	if l > 0 {
 		n += 2 + l + protohelpers.SizeOfVarint(uint64(l))
 	}
-	l = len(m.EndSessionEndpoint)
-	if l > 0 {
-		n += 2 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
 	n += len(m.unknownFields)
 	return n
 }
diff --git a/envoy/extensions/filters/http/on_demand/v3/on_demand.pb.validate.go b/envoy/extensions/filters/http/on_demand/v3/on_demand.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/original_src/v3/original_src.pb.validate.go b/envoy/extensions/filters/http/original_src/v3/original_src.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/proto_api_scrubber/v3/config.pb.validate.go b/envoy/extensions/filters/http/proto_api_scrubber/v3/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/proto_api_scrubber/v3/matcher_actions.pb.go b/envoy/extensions/filters/http/proto_api_scrubber/v3/matcher_actions.pb.go
deleted file mode 100755
index 0d1a8107d9..0000000000
--- a/envoy/extensions/filters/http/proto_api_scrubber/v3/matcher_actions.pb.go
+++ /dev/null
@@ -1,159 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        v5.29.3
-// source: envoy/extensions/filters/http/proto_api_scrubber/v3/matcher_actions.proto
-
-package proto_api_scrubberv3
-
-import (
-	_ "github.com/cncf/xds/go/udpa/annotations"
-	_ "github.com/cncf/xds/go/xds/annotations/v3"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// Specifies an :ref:`Unified Matcher API <envoy_v3_api_msg_.xds.type.matcher.v3.Matcher>` action to remove a field.
-// This actual action needs to be implemented by the filter using it.
-type RemoveFieldAction struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *RemoveFieldAction) Reset() {
-	*x = RemoveFieldAction{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RemoveFieldAction) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RemoveFieldAction) ProtoMessage() {}
-
-func (x *RemoveFieldAction) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RemoveFieldAction.ProtoReflect.Descriptor instead.
-func (*RemoveFieldAction) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_rawDescGZIP(), []int{0}
-}
-
-var File_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto protoreflect.FileDescriptor
-
-var file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_rawDesc = []byte{
-	0x0a, 0x49, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x61, 0x70, 0x69, 0x5f, 0x73, 0x63, 0x72, 0x75, 0x62, 0x62,
-	0x65, 0x72, 0x2f, 0x76, 0x33, 0x2f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x5f, 0x61, 0x63,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x33, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x5f, 0x61, 0x70, 0x69, 0x5f, 0x73, 0x63, 0x72, 0x75, 0x62, 0x62, 0x65, 0x72, 0x2e, 0x76, 0x33,
-	0x1a, 0x1f, 0x78, 0x64, 0x73, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x2f, 0x76, 0x33, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x22, 0x13, 0x0a, 0x11, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x41,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0xdb, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02,
-	0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x0a, 0x41, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73,
-	0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x61, 0x70, 0x69, 0x5f,
-	0x73, 0x63, 0x72, 0x75, 0x62, 0x62, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x13, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x65, 0x72, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x6f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x61,
-	0x70, 0x69, 0x5f, 0x73, 0x63, 0x72, 0x75, 0x62, 0x62, 0x65, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x5f, 0x61, 0x70, 0x69, 0x5f, 0x73, 0x63, 0x72, 0x75, 0x62, 0x62, 0x65,
-	0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_rawDescOnce sync.Once
-	file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_rawDescData = file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_rawDesc
-)
-
-func file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_rawDescGZIP() []byte {
-	file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_rawDescOnce.Do(func() {
-		file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_rawDescData)
-	})
-	return file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_rawDescData
-}
-
-var file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_goTypes = []interface{}{
-	(*RemoveFieldAction)(nil), // 0: envoy.extensions.filters.http.proto_api_scrubber.v3.RemoveFieldAction
-}
-var file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_init() }
-func file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_init() {
-	if File_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RemoveFieldAction); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_goTypes,
-		DependencyIndexes: file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_depIdxs,
-		MessageInfos:      file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_msgTypes,
-	}.Build()
-	File_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto = out.File
-	file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_rawDesc = nil
-	file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_goTypes = nil
-	file_envoy_extensions_filters_http_proto_api_scrubber_v3_matcher_actions_proto_depIdxs = nil
-}
diff --git a/envoy/extensions/filters/http/proto_api_scrubber/v3/matcher_actions.pb.validate.go b/envoy/extensions/filters/http/proto_api_scrubber/v3/matcher_actions.pb.validate.go
deleted file mode 100755
index b66ed76cf8..0000000000
--- a/envoy/extensions/filters/http/proto_api_scrubber/v3/matcher_actions.pb.validate.go
+++ /dev/null
@@ -1,139 +0,0 @@
-//go:build !disable_pgv
-// Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: envoy/extensions/filters/http/proto_api_scrubber/v3/matcher_actions.proto
-
-package proto_api_scrubberv3
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"net"
-	"net/mail"
-	"net/url"
-	"regexp"
-	"sort"
-	"strings"
-	"time"
-	"unicode/utf8"
-
-	"google.golang.org/protobuf/types/known/anypb"
-)
-
-// ensure the imports are used
-var (
-	_ = bytes.MinRead
-	_ = errors.New("")
-	_ = fmt.Print
-	_ = utf8.UTFMax
-	_ = (*regexp.Regexp)(nil)
-	_ = (*strings.Reader)(nil)
-	_ = net.IPv4len
-	_ = time.Duration(0)
-	_ = (*url.URL)(nil)
-	_ = (*mail.Address)(nil)
-	_ = anypb.Any{}
-	_ = sort.Sort
-)
-
-// Validate checks the field values on RemoveFieldAction with the rules defined
-// in the proto definition for this message. If any rules are violated, the
-// first error encountered is returned, or nil if there are no violations.
-func (m *RemoveFieldAction) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on RemoveFieldAction with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, the result is a list of violation errors wrapped in
-// RemoveFieldActionMultiError, or nil if none found.
-func (m *RemoveFieldAction) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *RemoveFieldAction) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if len(errors) > 0 {
-		return RemoveFieldActionMultiError(errors)
-	}
-
-	return nil
-}
-
-// RemoveFieldActionMultiError is an error wrapping multiple validation errors
-// returned by RemoveFieldAction.ValidateAll() if the designated constraints
-// aren't met.
-type RemoveFieldActionMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m RemoveFieldActionMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m RemoveFieldActionMultiError) AllErrors() []error { return m }
-
-// RemoveFieldActionValidationError is the validation error returned by
-// RemoveFieldAction.Validate if the designated constraints aren't met.
-type RemoveFieldActionValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e RemoveFieldActionValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e RemoveFieldActionValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e RemoveFieldActionValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e RemoveFieldActionValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e RemoveFieldActionValidationError) ErrorName() string {
-	return "RemoveFieldActionValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e RemoveFieldActionValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sRemoveFieldAction.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = RemoveFieldActionValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = RemoveFieldActionValidationError{}
diff --git a/envoy/extensions/filters/http/proto_api_scrubber/v3/matcher_actions_vtproto.pb.go b/envoy/extensions/filters/http/proto_api_scrubber/v3/matcher_actions_vtproto.pb.go
deleted file mode 100755
index 9ecbbf138c..0000000000
--- a/envoy/extensions/filters/http/proto_api_scrubber/v3/matcher_actions_vtproto.pb.go
+++ /dev/null
@@ -1,61 +0,0 @@
-//go:build vtprotobuf
-// +build vtprotobuf
-
-// Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// source: envoy/extensions/filters/http/proto_api_scrubber/v3/matcher_actions.proto
-
-package proto_api_scrubberv3
-
-import (
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-func (m *RemoveFieldAction) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *RemoveFieldAction) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *RemoveFieldAction) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *RemoveFieldAction) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	n += len(m.unknownFields)
-	return n
-}
diff --git a/envoy/extensions/filters/http/proto_message_extraction/v3/config.pb.validate.go b/envoy/extensions/filters/http/proto_message_extraction/v3/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/rate_limit_quota/v3/rate_limit_quota.pb.validate.go b/envoy/extensions/filters/http/rate_limit_quota/v3/rate_limit_quota.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.go b/envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.go
index 6a5ef57cc8..17f7d3a8ae 100755
--- a/envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.go
+++ b/envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.go
@@ -242,7 +242,7 @@ type RateLimit struct {
 	//     in :ref:`duration_until_reset<envoy_v3_api_field_service.ratelimit.v3.RateLimitResponse.DescriptorStatus.duration_until_reset>`
 	//     field.
 	//
-	// In case rate limiting policy specifies more than one time window, the values
+	// In case rate limiting policy specifies more then one time window, the values
 	// above represent the window that is closest to reaching its limit.
 	//
 	// For more information about the headers specification see selected version of
diff --git a/envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.validate.go b/envoy/extensions/filters/http/ratelimit/v3/rate_limit.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/rbac/v3/rbac.pb.validate.go b/envoy/extensions/filters/http/rbac/v3/rbac.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/router/v3/router.pb.validate.go b/envoy/extensions/filters/http/router/v3/router.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/set_filter_state/v3/set_filter_state.pb.validate.go b/envoy/extensions/filters/http/set_filter_state/v3/set_filter_state.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.validate.go b/envoy/extensions/filters/http/set_metadata/v3/set_metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/stateful_session/v3/stateful_session.pb.validate.go b/envoy/extensions/filters/http/stateful_session/v3/stateful_session.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/tap/v3/tap.pb.validate.go b/envoy/extensions/filters/http/tap/v3/tap.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/thrift_to_metadata/v3/thrift_to_metadata.pb.validate.go b/envoy/extensions/filters/http/thrift_to_metadata/v3/thrift_to_metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/upstream_codec/v3/upstream_codec.pb.validate.go b/envoy/extensions/filters/http/upstream_codec/v3/upstream_codec.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/http/wasm/v3/wasm.pb.validate.go b/envoy/extensions/filters/http/wasm/v3/wasm.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/listener/http_inspector/v3/http_inspector.pb.validate.go b/envoy/extensions/filters/listener/http_inspector/v3/http_inspector.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/listener/local_ratelimit/v3/local_ratelimit.pb.validate.go b/envoy/extensions/filters/listener/local_ratelimit/v3/local_ratelimit.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/listener/original_dst/v3/original_dst.pb.validate.go b/envoy/extensions/filters/listener/original_dst/v3/original_dst.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/listener/original_src/v3/original_src.pb.validate.go b/envoy/extensions/filters/listener/original_src/v3/original_src.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/listener/proxy_protocol/v3/proxy_protocol.pb.validate.go b/envoy/extensions/filters/listener/proxy_protocol/v3/proxy_protocol.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector.pb.go b/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector.pb.go
index 207c6ccf33..837bfbfeec 100755
--- a/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector.pb.go
+++ b/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector.pb.go
@@ -30,10 +30,6 @@ type TlsInspector struct {
 
 	// Populate “JA3“ fingerprint hash using data from the TLS Client Hello packet. Default is false.
 	EnableJa3Fingerprinting *wrapperspb.BoolValue `protobuf:"bytes,1,opt,name=enable_ja3_fingerprinting,json=enableJa3Fingerprinting,proto3" json:"enable_ja3_fingerprinting,omitempty"`
-	// Populate “JA4“ fingerprint hash using data from the TLS Client Hello packet.
-	// “JA4“ is an improved version of “JA3“ that includes TLS version, ciphers, extensions,
-	// and ALPN information in a hex format. Default is false.
-	EnableJa4Fingerprinting *wrapperspb.BoolValue `protobuf:"bytes,3,opt,name=enable_ja4_fingerprinting,json=enableJa4Fingerprinting,proto3" json:"enable_ja4_fingerprinting,omitempty"`
 	// The size in bytes of the initial buffer requested by the tls_inspector.
 	// If the filter needs to read additional bytes from the socket, the
 	// filter will double the buffer up to it's default maximum of 64KiB.
@@ -81,13 +77,6 @@ func (x *TlsInspector) GetEnableJa3Fingerprinting() *wrapperspb.BoolValue {
 	return nil
 }
 
-func (x *TlsInspector) GetEnableJa4Fingerprinting() *wrapperspb.BoolValue {
-	if x != nil {
-		return x.EnableJa4Fingerprinting
-	}
-	return nil
-}
-
 func (x *TlsInspector) GetInitialReadBufferSize() *wrapperspb.UInt32Value {
 	if x != nil {
 		return x.InitialReadBufferSize
@@ -113,43 +102,37 @@ var file_envoy_extensions_filters_listener_tls_inspector_v3_tls_inspector_proto_
 	0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x76, 0x65,
 	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x69, 0x6e, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17,
 	0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe6, 0x02, 0x0a, 0x0c, 0x54, 0x6c, 0x73, 0x49,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8e, 0x02, 0x0a, 0x0c, 0x54, 0x6c, 0x73, 0x49,
 	0x6e, 0x73, 0x70, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x56, 0x0a, 0x19, 0x65, 0x6e, 0x61, 0x62,
 	0x6c, 0x65, 0x5f, 0x6a, 0x61, 0x33, 0x5f, 0x66, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, 0x69,
 	0x6e, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f,
 	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f,
 	0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x17, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4a,
 	0x61, 0x33, 0x46, 0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67,
-	0x12, 0x56, 0x0a, 0x19, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6a, 0x61, 0x34, 0x5f, 0x66,
-	0x69, 0x6e, 0x67, 0x65, 0x72, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
-	0x17, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4a, 0x61, 0x34, 0x46, 0x69, 0x6e, 0x67, 0x65, 0x72,
-	0x70, 0x72, 0x69, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x63, 0x0a, 0x18, 0x69, 0x6e, 0x69, 0x74,
-	0x69, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x5f,
-	0x73, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e,
-	0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0c, 0xfa, 0x42, 0x09, 0x2a, 0x07, 0x10,
-	0x81, 0x80, 0x04, 0x20, 0xff, 0x01, 0x52, 0x15, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x52,
-	0x65, 0x61, 0x64, 0x42, 0x75, 0x66, 0x66, 0x65, 0x72, 0x53, 0x69, 0x7a, 0x65, 0x3a, 0x41, 0x9a,
-	0xc5, 0x88, 0x1e, 0x3c, 0x0a, 0x3a, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e,
-	0x65, 0x72, 0x2e, 0x74, 0x6c, 0x73, 0x5f, 0x69, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x74, 0x6f, 0x72,
-	0x2e, 0x76, 0x32, 0x2e, 0x54, 0x6c, 0x73, 0x49, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x74, 0x6f, 0x72,
-	0x42, 0xca, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x40, 0x69, 0x6f, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x73, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x74, 0x6c, 0x73,
-	0x5f, 0x69, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x11, 0x54,
-	0x6c, 0x73, 0x49, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x69, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x73, 0x2f, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2f, 0x74, 0x6c, 0x73,
-	0x5f, 0x69, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x6c,
-	0x73, 0x5f, 0x69, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x12, 0x63, 0x0a, 0x18, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x72, 0x65, 0x61, 0x64,
+	0x5f, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x42, 0x0c, 0xfa, 0x42, 0x09, 0x2a, 0x07, 0x10, 0x81, 0x80, 0x04, 0x20, 0xff, 0x01, 0x52, 0x15,
+	0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x52, 0x65, 0x61, 0x64, 0x42, 0x75, 0x66, 0x66, 0x65,
+	0x72, 0x53, 0x69, 0x7a, 0x65, 0x3a, 0x41, 0x9a, 0xc5, 0x88, 0x1e, 0x3c, 0x0a, 0x3a, 0x65, 0x6e,
+	0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65,
+	0x72, 0x2e, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x2e, 0x74, 0x6c, 0x73, 0x5f, 0x69,
+	0x6e, 0x73, 0x70, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x2e, 0x76, 0x32, 0x2e, 0x54, 0x6c, 0x73, 0x49,
+	0x6e, 0x73, 0x70, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x42, 0xca, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06,
+	0x02, 0x10, 0x02, 0x0a, 0x40, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f,
+	0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6c, 0x69, 0x73, 0x74,
+	0x65, 0x6e, 0x65, 0x72, 0x2e, 0x74, 0x6c, 0x73, 0x5f, 0x69, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x11, 0x54, 0x6c, 0x73, 0x49, 0x6e, 0x73, 0x70, 0x65, 0x63,
+	0x74, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x69, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
+	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x6c, 0x69, 0x73, 0x74,
+	0x65, 0x6e, 0x65, 0x72, 0x2f, 0x74, 0x6c, 0x73, 0x5f, 0x69, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x74,
+	0x6f, 0x72, 0x2f, 0x76, 0x33, 0x3b, 0x74, 0x6c, 0x73, 0x5f, 0x69, 0x6e, 0x73, 0x70, 0x65, 0x63,
+	0x74, 0x6f, 0x72, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -172,13 +155,12 @@ var file_envoy_extensions_filters_listener_tls_inspector_v3_tls_inspector_proto_
 }
 var file_envoy_extensions_filters_listener_tls_inspector_v3_tls_inspector_proto_depIdxs = []int32{
 	1, // 0: envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector.enable_ja3_fingerprinting:type_name -> google.protobuf.BoolValue
-	1, // 1: envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector.enable_ja4_fingerprinting:type_name -> google.protobuf.BoolValue
-	2, // 2: envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector.initial_read_buffer_size:type_name -> google.protobuf.UInt32Value
-	3, // [3:3] is the sub-list for method output_type
-	3, // [3:3] is the sub-list for method input_type
-	3, // [3:3] is the sub-list for extension type_name
-	3, // [3:3] is the sub-list for extension extendee
-	0, // [0:3] is the sub-list for field type_name
+	2, // 1: envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector.initial_read_buffer_size:type_name -> google.protobuf.UInt32Value
+	2, // [2:2] is the sub-list for method output_type
+	2, // [2:2] is the sub-list for method input_type
+	2, // [2:2] is the sub-list for extension type_name
+	2, // [2:2] is the sub-list for extension extendee
+	0, // [0:2] is the sub-list for field type_name
 }
 
 func init() { file_envoy_extensions_filters_listener_tls_inspector_v3_tls_inspector_proto_init() }
diff --git a/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector.pb.validate.go b/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector.pb.validate.go
old mode 100755
new mode 100644
index d660399746..b20806425e
--- a/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector.pb.validate.go
+++ b/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector.pb.validate.go
@@ -87,35 +87,6 @@ func (m *TlsInspector) validate(all bool) error {
 		}
 	}
 
-	if all {
-		switch v := interface{}(m.GetEnableJa4Fingerprinting()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, TlsInspectorValidationError{
-					field:  "EnableJa4Fingerprinting",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, TlsInspectorValidationError{
-					field:  "EnableJa4Fingerprinting",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetEnableJa4Fingerprinting()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return TlsInspectorValidationError{
-				field:  "EnableJa4Fingerprinting",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
 	if wrapper := m.GetInitialReadBufferSize(); wrapper != nil {
 
 		if val := wrapper.GetValue(); val <= 255 || val >= 65537 {
diff --git a/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector_vtproto.pb.go b/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector_vtproto.pb.go
index 952093fcd0..493d03c975 100755
--- a/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector_vtproto.pb.go
+++ b/envoy/extensions/filters/listener/tls_inspector/v3/tls_inspector_vtproto.pb.go
@@ -49,16 +49,6 @@ func (m *TlsInspector) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
 		i -= len(m.unknownFields)
 		copy(dAtA[i:], m.unknownFields)
 	}
-	if m.EnableJa4Fingerprinting != nil {
-		size, err := (*wrapperspb.BoolValue)(m.EnableJa4Fingerprinting).MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0x1a
-	}
 	if m.InitialReadBufferSize != nil {
 		size, err := (*wrapperspb.UInt32Value)(m.InitialReadBufferSize).MarshalToSizedBufferVTStrict(dAtA[:i])
 		if err != nil {
@@ -96,10 +86,6 @@ func (m *TlsInspector) SizeVT() (n int) {
 		l = (*wrapperspb.UInt32Value)(m.InitialReadBufferSize).SizeVT()
 		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
 	}
-	if m.EnableJa4Fingerprinting != nil {
-		l = (*wrapperspb.BoolValue)(m.EnableJa4Fingerprinting).SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
 	n += len(m.unknownFields)
 	return n
 }
diff --git a/envoy/extensions/filters/network/connection_limit/v3/connection_limit.pb.validate.go b/envoy/extensions/filters/network/connection_limit/v3/connection_limit.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/direct_response/v3/config.pb.validate.go b/envoy/extensions/filters/network/direct_response/v3/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/dubbo_proxy/router/v3/router.pb.validate.go b/envoy/extensions/filters/network/dubbo_proxy/router/v3/router.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.validate.go b/envoy/extensions/filters/network/dubbo_proxy/v3/dubbo_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/dubbo_proxy/v3/route.pb.validate.go b/envoy/extensions/filters/network/dubbo_proxy/v3/route.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/echo/v3/echo.pb.validate.go b/envoy/extensions/filters/network/echo/v3/echo.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/ext_authz/v3/ext_authz.pb.validate.go b/envoy/extensions/filters/network/ext_authz/v3/ext_authz.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/ext_proc/v3/ext_proc.pb.go b/envoy/extensions/filters/network/ext_proc/v3/ext_proc.pb.go
index 03a56b12a4..85dded9dac 100755
--- a/envoy/extensions/filters/network/ext_proc/v3/ext_proc.pb.go
+++ b/envoy/extensions/filters/network/ext_proc/v3/ext_proc.pb.go
@@ -79,14 +79,12 @@ func (ProcessingMode_DataSendMode) EnumDescriptor() ([]byte, []int) {
 // this filter operates at the L4 (transport) layer, giving access to raw network traffic.
 //
 // The filter communicates with an external gRPC service that can:
-//
-// 1. Inspect traffic in both directions
-// 2. Modify the network traffic
-// 3. Control connection lifecycle (continue, close, or reset)
+// * Inspect traffic in both directions
+// * Modify the network traffic
+// * Control connection lifecycle (continue, close, or reset)
 //
 // By using the filter's processing mode, you can selectively choose which data
 // directions to process (read, write or both), allowing for efficient processing.
-// [#next-free-field: 7]
 type NetworkExternalProcessor struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -112,9 +110,6 @@ type NetworkExternalProcessor struct {
 	// to the processing mode) if the timer expires. Default is 200 ms.
 	// [#not-implemented-hide:]
 	MessageTimeout *durationpb.Duration `protobuf:"bytes,4,opt,name=message_timeout,json=messageTimeout,proto3" json:"message_timeout,omitempty"`
-	StatPrefix     string               `protobuf:"bytes,5,opt,name=stat_prefix,json=statPrefix,proto3" json:"stat_prefix,omitempty"`
-	// Options related to the sending and receiving of dynamic metadata.
-	MetadataOptions *MetadataOptions `protobuf:"bytes,6,opt,name=metadata_options,json=metadataOptions,proto3" json:"metadata_options,omitempty"`
 }
 
 func (x *NetworkExternalProcessor) Reset() {
@@ -177,20 +172,6 @@ func (x *NetworkExternalProcessor) GetMessageTimeout() *durationpb.Duration {
 	return nil
 }
 
-func (x *NetworkExternalProcessor) GetStatPrefix() string {
-	if x != nil {
-		return x.StatPrefix
-	}
-	return ""
-}
-
-func (x *NetworkExternalProcessor) GetMetadataOptions() *MetadataOptions {
-	if x != nil {
-		return x.MetadataOptions
-	}
-	return nil
-}
-
 // Options for controlling processing behavior.
 // Filter will reject the config if both read and write are SKIP mode.
 type ProcessingMode struct {
@@ -252,118 +233,6 @@ func (x *ProcessingMode) GetProcessWrite() ProcessingMode_DataSendMode {
 	return ProcessingMode_STREAMED
 }
 
-// The MetadataOptions structure defines options for sending dynamic metadata. Specifically,
-// which namespaces to send to the server.
-type MetadataOptions struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Describes which typed or untyped dynamic metadata namespaces to forward to
-	// the external processing server.
-	ForwardingNamespaces *MetadataOptions_MetadataNamespaces `protobuf:"bytes,1,opt,name=forwarding_namespaces,json=forwardingNamespaces,proto3" json:"forwarding_namespaces,omitempty"`
-}
-
-func (x *MetadataOptions) Reset() {
-	*x = MetadataOptions{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MetadataOptions) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MetadataOptions) ProtoMessage() {}
-
-func (x *MetadataOptions) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MetadataOptions.ProtoReflect.Descriptor instead.
-func (*MetadataOptions) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *MetadataOptions) GetForwardingNamespaces() *MetadataOptions_MetadataNamespaces {
-	if x != nil {
-		return x.ForwardingNamespaces
-	}
-	return nil
-}
-
-type MetadataOptions_MetadataNamespaces struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Specifies a list of metadata namespaces whose values, if present,
-	// will be passed to the ext_proc service as an opaque *protobuf::Struct*.
-	Untyped []string `protobuf:"bytes,1,rep,name=untyped,proto3" json:"untyped,omitempty"`
-	// Specifies a list of metadata namespaces whose values, if present,
-	// will be passed to the ext_proc service as a *protobuf::Any*. This allows
-	// envoy and the external processing server to share the protobuf message
-	// definition for safe parsing.
-	Typed []string `protobuf:"bytes,2,rep,name=typed,proto3" json:"typed,omitempty"`
-}
-
-func (x *MetadataOptions_MetadataNamespaces) Reset() {
-	*x = MetadataOptions_MetadataNamespaces{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MetadataOptions_MetadataNamespaces) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MetadataOptions_MetadataNamespaces) ProtoMessage() {}
-
-func (x *MetadataOptions_MetadataNamespaces) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MetadataOptions_MetadataNamespaces.ProtoReflect.Descriptor instead.
-func (*MetadataOptions_MetadataNamespaces) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_rawDescGZIP(), []int{2, 0}
-}
-
-func (x *MetadataOptions_MetadataNamespaces) GetUntyped() []string {
-	if x != nil {
-		return x.Untyped
-	}
-	return nil
-}
-
-func (x *MetadataOptions_MetadataNamespaces) GetTyped() []string {
-	if x != nil {
-		return x.Typed
-	}
-	return nil
-}
-
 var File_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto protoreflect.FileDescriptor
 
 var file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_rawDesc = []byte{
@@ -383,7 +252,7 @@ var file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_rawDesc = [
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f,
 	0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76,
-	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdc, 0x03,
+	0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc8, 0x02,
 	0x0a, 0x18, 0x4e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61,
 	0x6c, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x12, 0x44, 0x0a, 0x0c, 0x67, 0x72,
 	0x70, 0x63, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
@@ -404,60 +273,37 @@ var file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_rawDesc = [
 	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
 	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0d, 0xfa, 0x42, 0x0a, 0xaa, 0x01,
 	0x07, 0x22, 0x03, 0x08, 0x90, 0x1c, 0x32, 0x00, 0x52, 0x0e, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x28, 0x0a, 0x0b, 0x73, 0x74, 0x61, 0x74,
-	0x5f, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x07, 0xfa,
-	0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x50, 0x72, 0x65, 0x66,
-	0x69, 0x78, 0x12, 0x68, 0x0a, 0x10, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x6f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
-	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e,
-	0x65, 0x78, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x63, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x0f, 0x6d, 0x65, 0x74,
-	0x61, 0x64, 0x61, 0x74, 0x61, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x96, 0x02, 0x0a,
-	0x0e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x4d, 0x6f, 0x64, 0x65, 0x12,
-	0x6c, 0x0a, 0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x49, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73,
-	0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x72, 0x6f,
-	0x63, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x4d,
-	0x6f, 0x64, 0x65, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x6f, 0x64, 0x65,
-	0x52, 0x0b, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x52, 0x65, 0x61, 0x64, 0x12, 0x6e, 0x0a,
-	0x0d, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x49, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e,
-	0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x63,
-	0x2e, 0x76, 0x33, 0x2e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x4d, 0x6f,
-	0x64, 0x65, 0x2e, 0x44, 0x61, 0x74, 0x61, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x6f, 0x64, 0x65, 0x52,
-	0x0c, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x57, 0x72, 0x69, 0x74, 0x65, 0x22, 0x26, 0x0a,
-	0x0c, 0x44, 0x61, 0x74, 0x61, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x0c, 0x0a,
-	0x08, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4d, 0x45, 0x44, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x53,
-	0x4b, 0x49, 0x50, 0x10, 0x01, 0x22, 0xdf, 0x01, 0x0a, 0x0f, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x85, 0x01, 0x0a, 0x15, 0x66, 0x6f,
-	0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x50, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c,
-	0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x65, 0x78, 0x74,
-	0x5f, 0x70, 0x72, 0x6f, 0x63, 0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
-	0x61, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
-	0x61, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x52, 0x14, 0x66, 0x6f, 0x72,
-	0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65,
-	0x73, 0x1a, 0x44, 0x0a, 0x12, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4e, 0x61, 0x6d,
-	0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x74, 0x79, 0x70,
-	0x65, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x75, 0x6e, 0x74, 0x79, 0x70, 0x65,
-	0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x79, 0x70, 0x65, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09,
-	0x52, 0x05, 0x74, 0x79, 0x70, 0x65, 0x64, 0x42, 0xbc, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02,
-	0x10, 0x02, 0xd2, 0xc6, 0xa4, 0xe1, 0x06, 0x02, 0x08, 0x01, 0x0a, 0x3a, 0x69, 0x6f, 0x2e, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x65, 0x78, 0x74, 0x5f, 0x70,
-	0x72, 0x6f, 0x63, 0x2e, 0x76, 0x33, 0x42, 0x0c, 0x45, 0x78, 0x74, 0x50, 0x72, 0x6f, 0x63, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x5e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f,
-	0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f,
-	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f,
-	0x65, 0x78, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x63, 0x2f, 0x76, 0x33, 0x3b, 0x65, 0x78, 0x74, 0x5f,
-	0x70, 0x72, 0x6f, 0x63, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x22, 0x96, 0x02, 0x0a, 0x0e, 0x50, 0x72, 0x6f,
+	0x63, 0x65, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x6c, 0x0a, 0x0c, 0x70,
+	0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x49, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
+	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74,
+	0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x63, 0x2e, 0x76, 0x33,
+	0x2e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x4d, 0x6f, 0x64, 0x65, 0x2e,
+	0x44, 0x61, 0x74, 0x61, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x0b, 0x70, 0x72,
+	0x6f, 0x63, 0x65, 0x73, 0x73, 0x52, 0x65, 0x61, 0x64, 0x12, 0x6e, 0x0a, 0x0d, 0x70, 0x72, 0x6f,
+	0x63, 0x65, 0x73, 0x73, 0x5f, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e,
+	0x32, 0x49, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77,
+	0x6f, 0x72, 0x6b, 0x2e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x63, 0x2e, 0x76, 0x33, 0x2e,
+	0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x4d, 0x6f, 0x64, 0x65, 0x2e, 0x44,
+	0x61, 0x74, 0x61, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x6f, 0x64, 0x65, 0x52, 0x0c, 0x70, 0x72, 0x6f,
+	0x63, 0x65, 0x73, 0x73, 0x57, 0x72, 0x69, 0x74, 0x65, 0x22, 0x26, 0x0a, 0x0c, 0x44, 0x61, 0x74,
+	0x61, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x54, 0x52,
+	0x45, 0x41, 0x4d, 0x45, 0x44, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x4b, 0x49, 0x50, 0x10,
+	0x01, 0x42, 0xbc, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0xd2, 0xc6, 0xa4, 0xe1,
+	0x06, 0x02, 0x08, 0x01, 0x0a, 0x3a, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
+	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x6e, 0x65, 0x74,
+	0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x63, 0x2e, 0x76, 0x33,
+	0x42, 0x0c, 0x45, 0x78, 0x74, 0x50, 0x72, 0x6f, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x5e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
+	0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x72,
+	0x6f, 0x63, 0x2f, 0x76, 0x33, 0x3b, 0x65, 0x78, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x63, 0x76, 0x33,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -473,29 +319,25 @@ func file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_rawDescGZI
 }
 
 var file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_goTypes = []interface{}{
-	(ProcessingMode_DataSendMode)(0),           // 0: envoy.extensions.filters.network.ext_proc.v3.ProcessingMode.DataSendMode
-	(*NetworkExternalProcessor)(nil),           // 1: envoy.extensions.filters.network.ext_proc.v3.NetworkExternalProcessor
-	(*ProcessingMode)(nil),                     // 2: envoy.extensions.filters.network.ext_proc.v3.ProcessingMode
-	(*MetadataOptions)(nil),                    // 3: envoy.extensions.filters.network.ext_proc.v3.MetadataOptions
-	(*MetadataOptions_MetadataNamespaces)(nil), // 4: envoy.extensions.filters.network.ext_proc.v3.MetadataOptions.MetadataNamespaces
-	(*v3.GrpcService)(nil),                     // 5: envoy.config.core.v3.GrpcService
-	(*durationpb.Duration)(nil),                // 6: google.protobuf.Duration
+	(ProcessingMode_DataSendMode)(0), // 0: envoy.extensions.filters.network.ext_proc.v3.ProcessingMode.DataSendMode
+	(*NetworkExternalProcessor)(nil), // 1: envoy.extensions.filters.network.ext_proc.v3.NetworkExternalProcessor
+	(*ProcessingMode)(nil),           // 2: envoy.extensions.filters.network.ext_proc.v3.ProcessingMode
+	(*v3.GrpcService)(nil),           // 3: envoy.config.core.v3.GrpcService
+	(*durationpb.Duration)(nil),      // 4: google.protobuf.Duration
 }
 var file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_depIdxs = []int32{
-	5, // 0: envoy.extensions.filters.network.ext_proc.v3.NetworkExternalProcessor.grpc_service:type_name -> envoy.config.core.v3.GrpcService
+	3, // 0: envoy.extensions.filters.network.ext_proc.v3.NetworkExternalProcessor.grpc_service:type_name -> envoy.config.core.v3.GrpcService
 	2, // 1: envoy.extensions.filters.network.ext_proc.v3.NetworkExternalProcessor.processing_mode:type_name -> envoy.extensions.filters.network.ext_proc.v3.ProcessingMode
-	6, // 2: envoy.extensions.filters.network.ext_proc.v3.NetworkExternalProcessor.message_timeout:type_name -> google.protobuf.Duration
-	3, // 3: envoy.extensions.filters.network.ext_proc.v3.NetworkExternalProcessor.metadata_options:type_name -> envoy.extensions.filters.network.ext_proc.v3.MetadataOptions
-	0, // 4: envoy.extensions.filters.network.ext_proc.v3.ProcessingMode.process_read:type_name -> envoy.extensions.filters.network.ext_proc.v3.ProcessingMode.DataSendMode
-	0, // 5: envoy.extensions.filters.network.ext_proc.v3.ProcessingMode.process_write:type_name -> envoy.extensions.filters.network.ext_proc.v3.ProcessingMode.DataSendMode
-	4, // 6: envoy.extensions.filters.network.ext_proc.v3.MetadataOptions.forwarding_namespaces:type_name -> envoy.extensions.filters.network.ext_proc.v3.MetadataOptions.MetadataNamespaces
-	7, // [7:7] is the sub-list for method output_type
-	7, // [7:7] is the sub-list for method input_type
-	7, // [7:7] is the sub-list for extension type_name
-	7, // [7:7] is the sub-list for extension extendee
-	0, // [0:7] is the sub-list for field type_name
+	4, // 2: envoy.extensions.filters.network.ext_proc.v3.NetworkExternalProcessor.message_timeout:type_name -> google.protobuf.Duration
+	0, // 3: envoy.extensions.filters.network.ext_proc.v3.ProcessingMode.process_read:type_name -> envoy.extensions.filters.network.ext_proc.v3.ProcessingMode.DataSendMode
+	0, // 4: envoy.extensions.filters.network.ext_proc.v3.ProcessingMode.process_write:type_name -> envoy.extensions.filters.network.ext_proc.v3.ProcessingMode.DataSendMode
+	5, // [5:5] is the sub-list for method output_type
+	5, // [5:5] is the sub-list for method input_type
+	5, // [5:5] is the sub-list for extension type_name
+	5, // [5:5] is the sub-list for extension extendee
+	0, // [0:5] is the sub-list for field type_name
 }
 
 func init() { file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_init() }
@@ -528,30 +370,6 @@ func file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_init() {
 				return nil
 			}
 		}
-		file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MetadataOptions); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MetadataOptions_MetadataNamespaces); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -559,7 +377,7 @@ func file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_envoy_extensions_filters_network_ext_proc_v3_ext_proc_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   4,
+			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/envoy/extensions/filters/network/ext_proc/v3/ext_proc.pb.validate.go b/envoy/extensions/filters/network/ext_proc/v3/ext_proc.pb.validate.go
old mode 100755
new mode 100644
index aad9fdd23b..80010e0e72
--- a/envoy/extensions/filters/network/ext_proc/v3/ext_proc.pb.validate.go
+++ b/envoy/extensions/filters/network/ext_proc/v3/ext_proc.pb.validate.go
@@ -149,46 +149,6 @@ func (m *NetworkExternalProcessor) validate(all bool) error {
 		}
 	}
 
-	if utf8.RuneCountInString(m.GetStatPrefix()) < 1 {
-		err := NetworkExternalProcessorValidationError{
-			field:  "StatPrefix",
-			reason: "value length must be at least 1 runes",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	if all {
-		switch v := interface{}(m.GetMetadataOptions()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, NetworkExternalProcessorValidationError{
-					field:  "MetadataOptions",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, NetworkExternalProcessorValidationError{
-					field:  "MetadataOptions",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetMetadataOptions()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return NetworkExternalProcessorValidationError{
-				field:  "MetadataOptions",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
 	if len(errors) > 0 {
 		return NetworkExternalProcessorMultiError(errors)
 	}
@@ -372,237 +332,3 @@ var _ interface {
 	Cause() error
 	ErrorName() string
 } = ProcessingModeValidationError{}
-
-// Validate checks the field values on MetadataOptions with the rules defined
-// in the proto definition for this message. If any rules are violated, the
-// first error encountered is returned, or nil if there are no violations.
-func (m *MetadataOptions) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on MetadataOptions with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, the result is a list of violation errors wrapped in
-// MetadataOptionsMultiError, or nil if none found.
-func (m *MetadataOptions) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *MetadataOptions) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if all {
-		switch v := interface{}(m.GetForwardingNamespaces()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, MetadataOptionsValidationError{
-					field:  "ForwardingNamespaces",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, MetadataOptionsValidationError{
-					field:  "ForwardingNamespaces",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetForwardingNamespaces()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return MetadataOptionsValidationError{
-				field:  "ForwardingNamespaces",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if len(errors) > 0 {
-		return MetadataOptionsMultiError(errors)
-	}
-
-	return nil
-}
-
-// MetadataOptionsMultiError is an error wrapping multiple validation errors
-// returned by MetadataOptions.ValidateAll() if the designated constraints
-// aren't met.
-type MetadataOptionsMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m MetadataOptionsMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m MetadataOptionsMultiError) AllErrors() []error { return m }
-
-// MetadataOptionsValidationError is the validation error returned by
-// MetadataOptions.Validate if the designated constraints aren't met.
-type MetadataOptionsValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e MetadataOptionsValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e MetadataOptionsValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e MetadataOptionsValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e MetadataOptionsValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e MetadataOptionsValidationError) ErrorName() string { return "MetadataOptionsValidationError" }
-
-// Error satisfies the builtin error interface
-func (e MetadataOptionsValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sMetadataOptions.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = MetadataOptionsValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = MetadataOptionsValidationError{}
-
-// Validate checks the field values on MetadataOptions_MetadataNamespaces with
-// the rules defined in the proto definition for this message. If any rules
-// are violated, the first error encountered is returned, or nil if there are
-// no violations.
-func (m *MetadataOptions_MetadataNamespaces) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on MetadataOptions_MetadataNamespaces
-// with the rules defined in the proto definition for this message. If any
-// rules are violated, the result is a list of violation errors wrapped in
-// MetadataOptions_MetadataNamespacesMultiError, or nil if none found.
-func (m *MetadataOptions_MetadataNamespaces) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *MetadataOptions_MetadataNamespaces) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if len(errors) > 0 {
-		return MetadataOptions_MetadataNamespacesMultiError(errors)
-	}
-
-	return nil
-}
-
-// MetadataOptions_MetadataNamespacesMultiError is an error wrapping multiple
-// validation errors returned by
-// MetadataOptions_MetadataNamespaces.ValidateAll() if the designated
-// constraints aren't met.
-type MetadataOptions_MetadataNamespacesMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m MetadataOptions_MetadataNamespacesMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m MetadataOptions_MetadataNamespacesMultiError) AllErrors() []error { return m }
-
-// MetadataOptions_MetadataNamespacesValidationError is the validation error
-// returned by MetadataOptions_MetadataNamespaces.Validate if the designated
-// constraints aren't met.
-type MetadataOptions_MetadataNamespacesValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e MetadataOptions_MetadataNamespacesValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e MetadataOptions_MetadataNamespacesValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e MetadataOptions_MetadataNamespacesValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e MetadataOptions_MetadataNamespacesValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e MetadataOptions_MetadataNamespacesValidationError) ErrorName() string {
-	return "MetadataOptions_MetadataNamespacesValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e MetadataOptions_MetadataNamespacesValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sMetadataOptions_MetadataNamespaces.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = MetadataOptions_MetadataNamespacesValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = MetadataOptions_MetadataNamespacesValidationError{}
diff --git a/envoy/extensions/filters/network/ext_proc/v3/ext_proc_vtproto.pb.go b/envoy/extensions/filters/network/ext_proc/v3/ext_proc_vtproto.pb.go
index 4d89bb89bc..0a4fec2140 100755
--- a/envoy/extensions/filters/network/ext_proc/v3/ext_proc_vtproto.pb.go
+++ b/envoy/extensions/filters/network/ext_proc/v3/ext_proc_vtproto.pb.go
@@ -50,23 +50,6 @@ func (m *NetworkExternalProcessor) MarshalToSizedBufferVTStrict(dAtA []byte) (in
 		i -= len(m.unknownFields)
 		copy(dAtA[i:], m.unknownFields)
 	}
-	if m.MetadataOptions != nil {
-		size, err := m.MetadataOptions.MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0x32
-	}
-	if len(m.StatPrefix) > 0 {
-		i -= len(m.StatPrefix)
-		copy(dAtA[i:], m.StatPrefix)
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.StatPrefix)))
-		i--
-		dAtA[i] = 0x2a
-	}
 	if m.MessageTimeout != nil {
 		size, err := (*durationpb.Duration)(m.MessageTimeout).MarshalToSizedBufferVTStrict(dAtA[:i])
 		if err != nil {
@@ -165,100 +148,6 @@ func (m *ProcessingMode) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error)
 	return len(dAtA) - i, nil
 }
 
-func (m *MetadataOptions_MetadataNamespaces) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *MetadataOptions_MetadataNamespaces) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *MetadataOptions_MetadataNamespaces) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	if len(m.Typed) > 0 {
-		for iNdEx := len(m.Typed) - 1; iNdEx >= 0; iNdEx-- {
-			i -= len(m.Typed[iNdEx])
-			copy(dAtA[i:], m.Typed[iNdEx])
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.Typed[iNdEx])))
-			i--
-			dAtA[i] = 0x12
-		}
-	}
-	if len(m.Untyped) > 0 {
-		for iNdEx := len(m.Untyped) - 1; iNdEx >= 0; iNdEx-- {
-			i -= len(m.Untyped[iNdEx])
-			copy(dAtA[i:], m.Untyped[iNdEx])
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.Untyped[iNdEx])))
-			i--
-			dAtA[i] = 0xa
-		}
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *MetadataOptions) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *MetadataOptions) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *MetadataOptions) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	if m.ForwardingNamespaces != nil {
-		size, err := m.ForwardingNamespaces.MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
 func (m *NetworkExternalProcessor) SizeVT() (n int) {
 	if m == nil {
 		return 0
@@ -286,14 +175,6 @@ func (m *NetworkExternalProcessor) SizeVT() (n int) {
 		l = (*durationpb.Duration)(m.MessageTimeout).SizeVT()
 		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
 	}
-	l = len(m.StatPrefix)
-	if l > 0 {
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	if m.MetadataOptions != nil {
-		l = m.MetadataOptions.SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
 	n += len(m.unknownFields)
 	return n
 }
@@ -313,39 +194,3 @@ func (m *ProcessingMode) SizeVT() (n int) {
 	n += len(m.unknownFields)
 	return n
 }
-
-func (m *MetadataOptions_MetadataNamespaces) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if len(m.Untyped) > 0 {
-		for _, s := range m.Untyped {
-			l = len(s)
-			n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-		}
-	}
-	if len(m.Typed) > 0 {
-		for _, s := range m.Typed {
-			l = len(s)
-			n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-		}
-	}
-	n += len(m.unknownFields)
-	return n
-}
-
-func (m *MetadataOptions) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.ForwardingNamespaces != nil {
-		l = m.ForwardingNamespaces.SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	n += len(m.unknownFields)
-	return n
-}
diff --git a/envoy/extensions/filters/network/generic_proxy/action/v3/action.pb.validate.go b/envoy/extensions/filters/network/generic_proxy/action/v3/action.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.pb.validate.go b/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/dubbo.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.pb.validate.go b/envoy/extensions/filters/network/generic_proxy/codecs/http1/v3/http1.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.pb.validate.go b/envoy/extensions/filters/network/generic_proxy/matcher/v3/matcher.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/generic_proxy/router/v3/router.pb.validate.go b/envoy/extensions/filters/network/generic_proxy/router/v3/router.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.pb.validate.go b/envoy/extensions/filters/network/generic_proxy/v3/generic_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/generic_proxy/v3/route.pb.validate.go b/envoy/extensions/filters/network/generic_proxy/v3/route.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go b/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go
index 3623b05c93..2859cbba42 100755
--- a/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go
+++ b/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.go
@@ -216,39 +216,31 @@ func (HttpConnectionManager_ForwardClientCertDetails) EnumDescriptor() ([]byte,
 	return file_envoy_extensions_filters_network_http_connection_manager_v3_http_connection_manager_proto_rawDescGZIP(), []int{0, 2}
 }
 
-// Determines the action for request that contain “%2F“, “%2f“, “%5C“ or “%5c“ sequences in the URI path.
+// 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.
 type HttpConnectionManager_PathWithEscapedSlashesAction int32
 
 const (
 	// 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.
+	// NOTE: the implementation may change the default behavior at-will.
 	HttpConnectionManager_IMPLEMENTATION_SPECIFIC_DEFAULT HttpConnectionManager_PathWithEscapedSlashesAction = 0
 	// Keep escaped slashes.
 	HttpConnectionManager_KEEP_UNCHANGED HttpConnectionManager_PathWithEscapedSlashesAction = 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.
+	// The "httpN.downstream_rq_failed_path_normalization" counter is incremented for each rejected request.
 	HttpConnectionManager_REJECT_REQUEST HttpConnectionManager_PathWithEscapedSlashesAction = 2
-	// Unescape “%2F“ and “%5C“ sequences and redirect request to the new path if these sequences were present.
+	// 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.
+	// 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.
 	HttpConnectionManager_UNESCAPE_AND_REDIRECT HttpConnectionManager_PathWithEscapedSlashesAction = 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 %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.
 	HttpConnectionManager_UNESCAPE_AND_FORWARD HttpConnectionManager_PathWithEscapedSlashesAction = 4
 )
 
@@ -376,21 +368,21 @@ type HttpConnectionManager struct {
 	// <envoy_v3_api_msg_config.trace.v3.Tracing>`.
 	Tracing *HttpConnectionManager_Tracing `protobuf:"bytes,7,opt,name=tracing,proto3" json:"tracing,omitempty"`
 	// Additional settings for HTTP requests handled by the connection manager. These will be
-	// applicable to both HTTP/1.1 and HTTP/2 requests.
+	// applicable to both HTTP1 and HTTP2 requests.
 	CommonHttpProtocolOptions *v3.HttpProtocolOptions `protobuf:"bytes,35,opt,name=common_http_protocol_options,json=commonHttpProtocolOptions,proto3" json:"common_http_protocol_options,omitempty"`
-	// If set to “true“, Envoy will not initiate an immediate drain timer for downstream HTTP/1 connections
-	// once :ref:`common_http_protocol_options.max_connection_duration
-	// <envoy_v3_api_field_config.core.v3.HttpProtocolOptions.max_connection_duration>` is exceeded.
-	// Instead, Envoy will wait until the next downstream request arrives, add a “connection: close“ header
-	// to the response, and then gracefully close the connection once the stream has completed.
+	// If set to true, Envoy will not start a drain timer for downstream HTTP1 connections after
+	// :ref:`common_http_protocol_options.max_connection_duration
+	// <envoy_v3_api_field_config.core.v3.HttpProtocolOptions.max_connection_duration>` passes.
+	// Instead, Envoy will wait for the next downstream request, add connection:close to the response
+	// headers, then close the connection after the stream ends.
 	//
-	// This behavior adheres to `RFC 9112, Section 9.6 <https://www.rfc-editor.org/rfc/rfc9112#name-tear-down>`_.
+	// This behavior is compliant with `RFC 9112 section 9.6 <https://www.rfc-editor.org/rfc/rfc9112#name-tear-down>`_
 	//
-	// If set to “false“, exceeding “max_connection_duration“ triggers Envoy's default drain behavior for HTTP/1,
-	// where the connection is eventually closed after all active streams finish.
+	// If set to false, “max_connection_duration“ will cause Envoy to enter the normal drain
+	// sequence for HTTP1 with Envoy eventually closing the connection (once there are no active
+	// streams).
 	//
-	// This option has no effect if “max_connection_duration“ is not configured.
-	// Defaults to “false“.
+	// Has no effect if “max_connection_duration“ is unset. Defaults to false.
 	Http1SafeMaxConnectionDuration bool `protobuf:"varint,58,opt,name=http1_safe_max_connection_duration,json=http1SafeMaxConnectionDuration,proto3" json:"http1_safe_max_connection_duration,omitempty"`
 	// Additional HTTP/1 settings that are passed to the HTTP/1 codec.
 	// [#comment:TODO: The following fields are ignored when the
@@ -418,12 +410,10 @@ type HttpConnectionManager struct {
 	// The default value can be overridden by setting runtime key “envoy.reloadable_features.max_request_headers_size_kb“.
 	// Requests that exceed this limit will receive a 431 response.
 	//
-	// .. note::
-	//
-	//	Currently some protocol codecs impose limits on the maximum size of a single header.
+	// Note: currently some protocol codecs impose limits on the maximum size of a single header:
 	//
-	//	* HTTP/2 (when using nghttp2) limits a single header to around 100kb.
-	//	* HTTP/3 limits a single header to around 1024kb.
+	//	HTTP/2 (when using nghttp2) limits a single header to around 100kb.
+	//	HTTP/3 limits a single header to around 1024kb.
 	MaxRequestHeadersKb *wrapperspb.UInt32Value `protobuf:"bytes,29,opt,name=max_request_headers_kb,json=maxRequestHeadersKb,proto3" json:"max_request_headers_kb,omitempty"`
 	// The stream idle timeout for connections managed by the connection manager.
 	// If not specified, this defaults to 5 minutes. The default value was selected
@@ -490,33 +480,31 @@ type HttpConnectionManager struct {
 	// during which Envoy will wait for the peer to close (i.e., a TCP FIN/RST is received by Envoy
 	// from the downstream connection) prior to Envoy closing the socket associated with that
 	// connection.
-	//
-	// .. note::
-	//
-	//	This timeout is enforced even when the socket associated with the downstream connection is pending a flush of
-	//	the write buffer. However, any progress made writing data to the socket will restart the timer associated with
-	//	this timeout. This means that the total grace period for a socket in this state will be
-	//	<total_time_waiting_for_write_buffer_flushes>+<delayed_close_timeout>.
+	// NOTE: This timeout is enforced even when the socket associated with the downstream connection
+	// is pending a flush of the write buffer. However, any progress made writing data to the socket
+	// will restart the timer associated with this timeout. This means that the total grace period for
+	// a socket in this state will be
+	// <total_time_waiting_for_write_buffer_flushes>+<delayed_close_timeout>.
 	//
 	// Delaying Envoy's connection close and giving the peer the opportunity to initiate the close
 	// sequence mitigates a race condition that exists when downstream clients do not drain/process
 	// data in a connection's receive buffer after a remote close has been detected via a socket
-	// “write()“. This race leads to such clients failing to process the response code sent by Envoy,
+	// write(). This race leads to such clients failing to process the response code sent by Envoy,
 	// which could result in erroneous downstream processing.
 	//
 	// If the timeout triggers, Envoy will close the connection's socket.
 	//
 	// The default timeout is 1000 ms if this option is not specified.
 	//
-	// .. note::
+	// .. NOTE::
 	//
 	//	To be useful in avoiding the race condition described above, this timeout must be set
 	//	to *at least* <max round trip time expected between clients and Envoy>+<100ms to account for
 	//	a reasonable "worst" case processing time for a full iteration of Envoy's event loop>.
 	//
-	// .. warning::
+	// .. WARNING::
 	//
-	//	A value of ``0`` will completely disable delayed close processing. When disabled, the downstream
+	//	A value of 0 will completely disable delayed close processing. When disabled, the downstream
 	//	connection's socket will be closed immediately after the write flush is completed or will
 	//	never close if the write flush does not complete.
 	DelayedCloseTimeout *durationpb.Duration `protobuf:"bytes,26,opt,name=delayed_close_timeout,json=delayedCloseTimeout,proto3" json:"delayed_close_timeout,omitempty"`
@@ -566,20 +554,21 @@ type HttpConnectionManager struct {
 	// is not specified. See the documentation for
 	// :ref:`config_http_conn_man_headers_x-forwarded-for` for more information.
 	XffNumTrustedHops uint32 `protobuf:"varint,19,opt,name=xff_num_trusted_hops,json=xffNumTrustedHops,proto3" json:"xff_num_trusted_hops,omitempty"`
-	// Configuration for original IP detection extensions.
+	// The configuration for the original IP detection extensions.
 	//
-	// When these extensions are configured, Envoy will invoke them with the incoming request headers and
-	// details about the downstream connection, including the directly connected address. Each extension uses
-	// this information to determine the effective remote IP address for the request. If an extension cannot
-	// identify the original IP address and isn't set to reject the request, Envoy will sequentially attempt
-	// the remaining extensions until one successfully determines the IP or explicitly rejects the request.
-	// If all extensions fail without rejection, Envoy defaults to using the directly connected remote address.
+	// When configured the extensions will be called along with the request headers
+	// and information about the downstream connection, such as the directly connected address.
+	// Each extension will then use these parameters to decide the request's effective remote address.
+	// If an extension fails to detect the original IP address and isn't configured to reject
+	// the request, the HCM will try the remaining extensions until one succeeds or rejects
+	// the request. If the request isn't rejected nor any extension succeeds, the HCM will
+	// fallback to using the remote address.
 	//
-	// .. warning::
+	// .. WARNING::
 	//
-	//	These extensions cannot be configured simultaneously with :ref:`use_remote_address
+	//	Extensions cannot be used in conjunction with :ref:`use_remote_address
 	//	<envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.use_remote_address>`
-	//	or :ref:`xff_num_trusted_hops
+	//	nor :ref:`xff_num_trusted_hops
 	//	<envoy_v3_api_field_extensions.filters.network.http_connection_manager.v3.HttpConnectionManager.xff_num_trusted_hops>`.
 	//
 	// [#extension-category: envoy.http.original_ip_detection]
@@ -2321,12 +2310,14 @@ func (x *HttpConnectionManager_SetCurrentClientCertDetails) GetUri() bool {
 //
 // .. warning::
 //
-//	The current implementation of upgrade headers does not handle multi-valued upgrade headers. Support for
-//	multi-valued headers may be added in the future if needed.
+//	The current implementation of upgrade headers does not handle
+//	multi-valued upgrade headers. Support for multi-valued headers may be
+//	added in the future if needed.
 //
 // .. warning::
 //
-//	The current implementation of upgrade headers does not work with HTTP/2 upstreams.
+//	The current implementation of upgrade headers does not work with HTTP/2
+//	upstreams.
 type HttpConnectionManager_UpgradeConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2409,9 +2400,7 @@ func (x *HttpConnectionManager_UpgradeConfig) GetEnabled() *wrapperspb.BoolValue
 // <envoy_v3_api_field_config.route.v3.RouteAction.prefix_rewrite>`) will apply to the “:path“ header
 // destined for the upstream.
 //
-// .. note::
-//
-//	Access logging and tracing will show the original ``:path`` header.
+// Note: access logging and tracing will show the original “:path“ header.
 type HttpConnectionManager_PathNormalizationOptions struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
diff --git a/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.validate.go b/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.validate.go b/envoy/extensions/filters/network/local_ratelimit/v3/local_rate_limit.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/mongo_proxy/v3/mongo_proxy.pb.validate.go b/envoy/extensions/filters/network/mongo_proxy/v3/mongo_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.validate.go b/envoy/extensions/filters/network/ratelimit/v3/rate_limit.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/rbac/v3/rbac.pb.validate.go b/envoy/extensions/filters/network/rbac/v3/rbac.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.go b/envoy/extensions/filters/network/redis_proxy/v3/redis_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/set_filter_state/v3/set_filter_state.pb.validate.go b/envoy/extensions/filters/network/set_filter_state/v3/set_filter_state.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/sni_cluster/v3/sni_cluster.pb.validate.go b/envoy/extensions/filters/network/sni_cluster/v3/sni_cluster.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3/sni_dynamic_forward_proxy.pb.validate.go b/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3/sni_dynamic_forward_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.validate.go b/envoy/extensions/filters/network/tcp_proxy/v3/tcp_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/thrift_proxy/filters/header_to_metadata/v3/header_to_metadata.pb.validate.go b/envoy/extensions/filters/network/thrift_proxy/filters/header_to_metadata/v3/header_to_metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/v3/payload_to_metadata.pb.validate.go b/envoy/extensions/filters/network/thrift_proxy/filters/payload_to_metadata/v3/payload_to_metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.validate.go b/envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3/rate_limit.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/thrift_proxy/router/v3/router.pb.validate.go b/envoy/extensions/filters/network/thrift_proxy/router/v3/router.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/thrift_proxy/v3/route.pb.validate.go b/envoy/extensions/filters/network/thrift_proxy/v3/route.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.validate.go b/envoy/extensions/filters/network/thrift_proxy/v3/thrift_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/wasm/v3/wasm.pb.validate.go b/envoy/extensions/filters/network/wasm/v3/wasm.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.validate.go b/envoy/extensions/filters/network/zookeeper_proxy/v3/zookeeper_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/udp/dns_filter/v3/dns_filter.pb.validate.go b/envoy/extensions/filters/udp/dns_filter/v3/dns_filter.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/udp/udp_proxy/session/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.validate.go b/envoy/extensions/filters/udp/udp_proxy/session/dynamic_forward_proxy/v3/dynamic_forward_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3/http_capsule.pb.validate.go b/envoy/extensions/filters/udp/udp_proxy/session/http_capsule/v3/http_capsule.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/udp/udp_proxy/v3/route.pb.validate.go b/envoy/extensions/filters/udp/udp_proxy/v3/route.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.validate.go b/envoy/extensions/filters/udp/udp_proxy/v3/udp_proxy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/formatter/cel/v3/cel.pb.validate.go b/envoy/extensions/formatter/cel/v3/cel.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/formatter/metadata/v3/metadata.pb.validate.go b/envoy/extensions/formatter/metadata/v3/metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/formatter/req_without_query/v3/req_without_query.pb.validate.go b/envoy/extensions/formatter/req_without_query/v3/req_without_query.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/geoip_providers/common/v3/common.pb.validate.go b/envoy/extensions/geoip_providers/common/v3/common.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/geoip_providers/maxmind/v3/maxmind.pb.validate.go b/envoy/extensions/geoip_providers/maxmind/v3/maxmind.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/health_check/event_sinks/file/v3/file.pb.validate.go b/envoy/extensions/health_check/event_sinks/file/v3/file.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/health_checkers/redis/v3/redis.pb.validate.go b/envoy/extensions/health_checkers/redis/v3/redis.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/health_checkers/thrift/v3/thrift.pb.validate.go b/envoy/extensions/health_checkers/thrift/v3/thrift.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/http/cache/file_system_http_cache/v3/file_system_http_cache.pb.validate.go b/envoy/extensions/http/cache/file_system_http_cache/v3/file_system_http_cache.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/http/cache/simple_http_cache/v3/config.pb.validate.go b/envoy/extensions/http/cache/simple_http_cache/v3/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/http/custom_response/local_response_policy/v3/local_response_policy.pb.validate.go b/envoy/extensions/http/custom_response/local_response_policy/v3/local_response_policy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/http/custom_response/redirect_policy/v3/redirect_policy.pb.validate.go b/envoy/extensions/http/custom_response/redirect_policy/v3/redirect_policy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/http/early_header_mutation/header_mutation/v3/header_mutation.pb.validate.go b/envoy/extensions/http/early_header_mutation/header_mutation/v3/header_mutation.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/http/ext_proc/response_processors/save_processing_response/v3/save_processing_response.pb.validate.go b/envoy/extensions/http/ext_proc/response_processors/save_processing_response/v3/save_processing_response.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/http/header_formatters/preserve_case/v3/preserve_case.pb.validate.go b/envoy/extensions/http/header_formatters/preserve_case/v3/preserve_case.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/http/header_validators/envoy_default/v3/header_validator.pb.validate.go b/envoy/extensions/http/header_validators/envoy_default/v3/header_validator.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/http/injected_credentials/generic/v3/generic.pb.validate.go b/envoy/extensions/http/injected_credentials/generic/v3/generic.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/http/injected_credentials/oauth2/v3/oauth2.pb.validate.go b/envoy/extensions/http/injected_credentials/oauth2/v3/oauth2.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/http/original_ip_detection/custom_header/v3/custom_header.pb.validate.go b/envoy/extensions/http/original_ip_detection/custom_header/v3/custom_header.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/http/original_ip_detection/xff/v3/xff.pb.validate.go b/envoy/extensions/http/original_ip_detection/xff/v3/xff.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/http/stateful_session/cookie/v3/cookie.pb.validate.go b/envoy/extensions/http/stateful_session/cookie/v3/cookie.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/http/stateful_session/envelope/v3/envelope.pb.go b/envoy/extensions/http/stateful_session/envelope/v3/envelope.pb.go
deleted file mode 100755
index 4889d01484..0000000000
--- a/envoy/extensions/http/stateful_session/envelope/v3/envelope.pb.go
+++ /dev/null
@@ -1,264 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        v5.29.3
-// source: envoy/extensions/http/stateful_session/envelope/v3/envelope.proto
-
-package envelopev3
-
-import (
-	_ "github.com/cncf/xds/go/udpa/annotations"
-	_ "github.com/envoyproxy/protoc-gen-validate/validate"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// The extension allows the session state is tracked via existing session context that initialized
-// by the upstream server. It assumes that the upstream server will generate the session context
-// (like session id header or cookie) in the initial response of the session and the client will use
-// the same session context in the subsequent requests without any modification.
-//
-// When processing the response from the upstream, Envoy will check if the response contains the
-// session context. If the response contains the session context, no matter if it's a new session
-// context or an existing one, Envoy will join it and the upstream host as new session context.
-//
-// When processing the request from the downstream, Envoy will check if the request contains the
-// session context. If the request contains the session context, Envoy will strip the
-// upstream host from the session context.
-//
-// [#extension: envoy.http.stateful_session.envelope]
-type EnvelopeSessionState struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Set the header config to track the session state.
-	Header *EnvelopeSessionState_Header `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"`
-}
-
-func (x *EnvelopeSessionState) Reset() {
-	*x = EnvelopeSessionState{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *EnvelopeSessionState) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EnvelopeSessionState) ProtoMessage() {}
-
-func (x *EnvelopeSessionState) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EnvelopeSessionState.ProtoReflect.Descriptor instead.
-func (*EnvelopeSessionState) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *EnvelopeSessionState) GetHeader() *EnvelopeSessionState_Header {
-	if x != nil {
-		return x.Header
-	}
-	return nil
-}
-
-type EnvelopeSessionState_Header struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Iff the header specified by the “name“ field is present in the response (assume the “name“
-	// is set to “session-header“ and original header value is “xxxxxx“), then the upstream host
-	// address and value of “name“ field specified header will be encoded in following format and
-	// the output will be used to update the “name“ field specified header in the response:
-	//
-	// .. code-block:: none
-	//
-	//	session-header: "MS4yLjMuNDo4MAo=;UV:eHh4eHh4Cg==" # base64(1.2.3.4:80);UV:base64(xxxxxx)
-	//
-	// The “UV“ (upstream value) part is used to store the original upstream header value of
-	// “name“ field specified header.
-	//
-	// If this mode is used then Envoy will assume that the header in the request will also be in the
-	// same format and will contain the “UV“ part. This extension will parse the upstream host
-	// address and update the “name“ field specified header in the request to the “UV“ part.
-	Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-}
-
-func (x *EnvelopeSessionState_Header) Reset() {
-	*x = EnvelopeSessionState_Header{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *EnvelopeSessionState_Header) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*EnvelopeSessionState_Header) ProtoMessage() {}
-
-func (x *EnvelopeSessionState_Header) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use EnvelopeSessionState_Header.ProtoReflect.Descriptor instead.
-func (*EnvelopeSessionState_Header) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_rawDescGZIP(), []int{0, 0}
-}
-
-func (x *EnvelopeSessionState_Header) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-var File_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto protoreflect.FileDescriptor
-
-var file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_rawDesc = []byte{
-	0x0a, 0x41, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6c,
-	0x5f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x2f, 0x65, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70,
-	0x65, 0x2f, 0x76, 0x33, 0x2f, 0x65, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x12, 0x32, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65,
-	0x66, 0x75, 0x6c, 0x5f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x65, 0x6e, 0x76, 0x65,
-	0x6c, 0x6f, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e,
-	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65,
-	0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0xb0, 0x01, 0x0a, 0x14, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x53, 0x65, 0x73, 0x73,
-	0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x71, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x68, 0x74, 0x74, 0x70,
-	0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6c, 0x5f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f,
-	0x6e, 0x2e, 0x65, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x45, 0x6e,
-	0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61,
-	0x74, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01,
-	0x02, 0x10, 0x01, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x1a, 0x25, 0x0a, 0x06, 0x48,
-	0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x72, 0x02, 0x10, 0x01, 0x52, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x42, 0xc1, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x40, 0x69,
-	0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x68, 0x74,
-	0x74, 0x70, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6c, 0x5f, 0x73, 0x65, 0x73, 0x73,
-	0x69, 0x6f, 0x6e, 0x2e, 0x65, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x42,
-	0x0d, 0x45, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x64, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x68, 0x74, 0x74, 0x70, 0x2f, 0x73,
-	0x74, 0x61, 0x74, 0x65, 0x66, 0x75, 0x6c, 0x5f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x2f,
-	0x65, 0x6e, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x3b, 0x65, 0x6e, 0x76, 0x65,
-	0x6c, 0x6f, 0x70, 0x65, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_rawDescOnce sync.Once
-	file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_rawDescData = file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_rawDesc
-)
-
-func file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_rawDescGZIP() []byte {
-	file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_rawDescOnce.Do(func() {
-		file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_rawDescData)
-	})
-	return file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_rawDescData
-}
-
-var file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_goTypes = []interface{}{
-	(*EnvelopeSessionState)(nil),        // 0: envoy.extensions.http.stateful_session.envelope.v3.EnvelopeSessionState
-	(*EnvelopeSessionState_Header)(nil), // 1: envoy.extensions.http.stateful_session.envelope.v3.EnvelopeSessionState.Header
-}
-var file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_depIdxs = []int32{
-	1, // 0: envoy.extensions.http.stateful_session.envelope.v3.EnvelopeSessionState.header:type_name -> envoy.extensions.http.stateful_session.envelope.v3.EnvelopeSessionState.Header
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
-}
-
-func init() { file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_init() }
-func file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_init() {
-	if File_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EnvelopeSessionState); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*EnvelopeSessionState_Header); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_goTypes,
-		DependencyIndexes: file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_depIdxs,
-		MessageInfos:      file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_msgTypes,
-	}.Build()
-	File_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto = out.File
-	file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_rawDesc = nil
-	file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_goTypes = nil
-	file_envoy_extensions_http_stateful_session_envelope_v3_envelope_proto_depIdxs = nil
-}
diff --git a/envoy/extensions/http/stateful_session/envelope/v3/envelope.pb.validate.go b/envoy/extensions/http/stateful_session/envelope/v3/envelope.pb.validate.go
deleted file mode 100755
index c5ae2ae01d..0000000000
--- a/envoy/extensions/http/stateful_session/envelope/v3/envelope.pb.validate.go
+++ /dev/null
@@ -1,293 +0,0 @@
-//go:build !disable_pgv
-// Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: envoy/extensions/http/stateful_session/envelope/v3/envelope.proto
-
-package envelopev3
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"net"
-	"net/mail"
-	"net/url"
-	"regexp"
-	"sort"
-	"strings"
-	"time"
-	"unicode/utf8"
-
-	"google.golang.org/protobuf/types/known/anypb"
-)
-
-// ensure the imports are used
-var (
-	_ = bytes.MinRead
-	_ = errors.New("")
-	_ = fmt.Print
-	_ = utf8.UTFMax
-	_ = (*regexp.Regexp)(nil)
-	_ = (*strings.Reader)(nil)
-	_ = net.IPv4len
-	_ = time.Duration(0)
-	_ = (*url.URL)(nil)
-	_ = (*mail.Address)(nil)
-	_ = anypb.Any{}
-	_ = sort.Sort
-)
-
-// Validate checks the field values on EnvelopeSessionState with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, the first error encountered is returned, or nil if there are no violations.
-func (m *EnvelopeSessionState) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on EnvelopeSessionState with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, the result is a list of violation errors wrapped in
-// EnvelopeSessionStateMultiError, or nil if none found.
-func (m *EnvelopeSessionState) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *EnvelopeSessionState) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if m.GetHeader() == nil {
-		err := EnvelopeSessionStateValidationError{
-			field:  "Header",
-			reason: "value is required",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	if all {
-		switch v := interface{}(m.GetHeader()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, EnvelopeSessionStateValidationError{
-					field:  "Header",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, EnvelopeSessionStateValidationError{
-					field:  "Header",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetHeader()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return EnvelopeSessionStateValidationError{
-				field:  "Header",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if len(errors) > 0 {
-		return EnvelopeSessionStateMultiError(errors)
-	}
-
-	return nil
-}
-
-// EnvelopeSessionStateMultiError is an error wrapping multiple validation
-// errors returned by EnvelopeSessionState.ValidateAll() if the designated
-// constraints aren't met.
-type EnvelopeSessionStateMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m EnvelopeSessionStateMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m EnvelopeSessionStateMultiError) AllErrors() []error { return m }
-
-// EnvelopeSessionStateValidationError is the validation error returned by
-// EnvelopeSessionState.Validate if the designated constraints aren't met.
-type EnvelopeSessionStateValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e EnvelopeSessionStateValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e EnvelopeSessionStateValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e EnvelopeSessionStateValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e EnvelopeSessionStateValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e EnvelopeSessionStateValidationError) ErrorName() string {
-	return "EnvelopeSessionStateValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e EnvelopeSessionStateValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sEnvelopeSessionState.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = EnvelopeSessionStateValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = EnvelopeSessionStateValidationError{}
-
-// Validate checks the field values on EnvelopeSessionState_Header with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, the first error encountered is returned, or nil if there are no violations.
-func (m *EnvelopeSessionState_Header) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on EnvelopeSessionState_Header with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, the result is a list of violation errors wrapped in
-// EnvelopeSessionState_HeaderMultiError, or nil if none found.
-func (m *EnvelopeSessionState_Header) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *EnvelopeSessionState_Header) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if utf8.RuneCountInString(m.GetName()) < 1 {
-		err := EnvelopeSessionState_HeaderValidationError{
-			field:  "Name",
-			reason: "value length must be at least 1 runes",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	if len(errors) > 0 {
-		return EnvelopeSessionState_HeaderMultiError(errors)
-	}
-
-	return nil
-}
-
-// EnvelopeSessionState_HeaderMultiError is an error wrapping multiple
-// validation errors returned by EnvelopeSessionState_Header.ValidateAll() if
-// the designated constraints aren't met.
-type EnvelopeSessionState_HeaderMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m EnvelopeSessionState_HeaderMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m EnvelopeSessionState_HeaderMultiError) AllErrors() []error { return m }
-
-// EnvelopeSessionState_HeaderValidationError is the validation error returned
-// by EnvelopeSessionState_Header.Validate if the designated constraints
-// aren't met.
-type EnvelopeSessionState_HeaderValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e EnvelopeSessionState_HeaderValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e EnvelopeSessionState_HeaderValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e EnvelopeSessionState_HeaderValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e EnvelopeSessionState_HeaderValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e EnvelopeSessionState_HeaderValidationError) ErrorName() string {
-	return "EnvelopeSessionState_HeaderValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e EnvelopeSessionState_HeaderValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sEnvelopeSessionState_Header.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = EnvelopeSessionState_HeaderValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = EnvelopeSessionState_HeaderValidationError{}
diff --git a/envoy/extensions/http/stateful_session/envelope/v3/envelope_vtproto.pb.go b/envoy/extensions/http/stateful_session/envelope/v3/envelope_vtproto.pb.go
deleted file mode 100755
index 42a2e86fc1..0000000000
--- a/envoy/extensions/http/stateful_session/envelope/v3/envelope_vtproto.pb.go
+++ /dev/null
@@ -1,130 +0,0 @@
-//go:build vtprotobuf
-// +build vtprotobuf
-
-// Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// source: envoy/extensions/http/stateful_session/envelope/v3/envelope.proto
-
-package envelopev3
-
-import (
-	protohelpers "github.com/planetscale/vtprotobuf/protohelpers"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-func (m *EnvelopeSessionState_Header) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *EnvelopeSessionState_Header) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *EnvelopeSessionState_Header) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	if len(m.Name) > 0 {
-		i -= len(m.Name)
-		copy(dAtA[i:], m.Name)
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.Name)))
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *EnvelopeSessionState) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *EnvelopeSessionState) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *EnvelopeSessionState) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	if m.Header != nil {
-		size, err := m.Header.MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *EnvelopeSessionState_Header) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = len(m.Name)
-	if l > 0 {
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	n += len(m.unknownFields)
-	return n
-}
-
-func (m *EnvelopeSessionState) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.Header != nil {
-		l = m.Header.SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	n += len(m.unknownFields)
-	return n
-}
diff --git a/envoy/extensions/http/stateful_session/header/v3/header.pb.validate.go b/envoy/extensions/http/stateful_session/header/v3/header.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/internal_redirect/allow_listed_routes/v3/allow_listed_routes_config.pb.validate.go b/envoy/extensions/internal_redirect/allow_listed_routes/v3/allow_listed_routes_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/internal_redirect/previous_routes/v3/previous_routes_config.pb.validate.go b/envoy/extensions/internal_redirect/previous_routes/v3/previous_routes_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/internal_redirect/safe_cross_scheme/v3/safe_cross_scheme_config.pb.validate.go b/envoy/extensions/internal_redirect/safe_cross_scheme/v3/safe_cross_scheme_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/key_value/file_based/v3/config.pb.validate.go b/envoy/extensions/key_value/file_based/v3/config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.go b/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.go
index be36b1e7f9..1661aa04af 100755
--- a/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.go
+++ b/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.go
@@ -39,13 +39,6 @@ const (
 // weights using eps and qps. The weight of a given endpoint is computed as:
 // “qps / (utilization + eps/qps * error_utilization_penalty)“.
 //
-// Note that Envoy will forward the ORCA response headers/trailers from the upstream
-// cluster to the downstream client. This means that if the downstream client is also
-// configured to use “client_side_weighted_round_robin“ it will load balance against
-// Envoy based on upstream weights. This can happen when Envoy is used as a reverse proxy.
-// To avoid this issue you can configure the :ref:`header_mutation filter  <envoy_v3_api_msg_extensions.filters.http.header_mutation.v3.HeaderMutation>` to remove
-// the ORCA payload from the response headers/trailers.
-//
 // See the :ref:`load balancing architecture
 // overview<arch_overview_load_balancing_types>` for more information.
 //
diff --git a/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.validate.go b/envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/load_balancing_policies/cluster_provided/v3/cluster_provided.pb.validate.go b/envoy/extensions/load_balancing_policies/cluster_provided/v3/cluster_provided.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/load_balancing_policies/common/v3/common.pb.go b/envoy/extensions/load_balancing_policies/common/v3/common.pb.go
index 671a89ac50..d98b985563 100755
--- a/envoy/extensions/load_balancing_policies/common/v3/common.pb.go
+++ b/envoy/extensions/load_balancing_policies/common/v3/common.pb.go
@@ -8,7 +8,6 @@ package commonv3
 
 import (
 	_ "github.com/cncf/xds/go/udpa/annotations"
-	_ "github.com/envoyproxy/go-control-plane/envoy/annotations"
 	v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	v31 "github.com/envoyproxy/go-control-plane/envoy/type/v3"
 	_ "github.com/envoyproxy/protoc-gen-validate/validate"
@@ -270,7 +269,6 @@ func (x *ConsistentHashingLbConfig) GetHashBalanceFactor() *wrapperspb.UInt32Val
 
 // Configuration for :ref:`zone aware routing
 // <arch_overview_load_balancing_zone_aware_routing>`.
-// [#next-free-field: 6]
 type LocalityLbConfig_ZoneAwareLbConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -293,10 +291,7 @@ type LocalityLbConfig_ZoneAwareLbConfig struct {
 	// failing service.
 	FailTrafficOnPanic bool `protobuf:"varint,3,opt,name=fail_traffic_on_panic,json=failTrafficOnPanic,proto3" json:"fail_traffic_on_panic,omitempty"`
 	// If set to true, Envoy will force LocalityDirect routing if a local locality exists.
-	//
-	// Deprecated: Marked as deprecated in envoy/extensions/load_balancing_policies/common/v3/common.proto.
-	ForceLocalityDirectRouting bool                                               `protobuf:"varint,4,opt,name=force_locality_direct_routing,json=forceLocalityDirectRouting,proto3" json:"force_locality_direct_routing,omitempty"`
-	ForceLocalZone             *LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone `protobuf:"bytes,5,opt,name=force_local_zone,json=forceLocalZone,proto3" json:"force_local_zone,omitempty"`
+	ForceLocalityDirectRouting bool `protobuf:"varint,4,opt,name=force_locality_direct_routing,json=forceLocalityDirectRouting,proto3" json:"force_locality_direct_routing,omitempty"`
 }
 
 func (x *LocalityLbConfig_ZoneAwareLbConfig) Reset() {
@@ -352,7 +347,6 @@ func (x *LocalityLbConfig_ZoneAwareLbConfig) GetFailTrafficOnPanic() bool {
 	return false
 }
 
-// Deprecated: Marked as deprecated in envoy/extensions/load_balancing_policies/common/v3/common.proto.
 func (x *LocalityLbConfig_ZoneAwareLbConfig) GetForceLocalityDirectRouting() bool {
 	if x != nil {
 		return x.ForceLocalityDirectRouting
@@ -360,13 +354,6 @@ func (x *LocalityLbConfig_ZoneAwareLbConfig) GetForceLocalityDirectRouting() boo
 	return false
 }
 
-func (x *LocalityLbConfig_ZoneAwareLbConfig) GetForceLocalZone() *LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone {
-	if x != nil {
-		return x.ForceLocalZone
-	}
-	return nil
-}
-
 // Configuration for :ref:`locality weighted load balancing
 // <arch_overview_load_balancing_locality_weighted_lb>`
 type LocalityLbConfig_LocalityWeightedLbConfig struct {
@@ -407,66 +394,6 @@ func (*LocalityLbConfig_LocalityWeightedLbConfig) Descriptor() ([]byte, []int) {
 	return file_envoy_extensions_load_balancing_policies_common_v3_common_proto_rawDescGZIP(), []int{0, 1}
 }
 
-// Configures Envoy to always route requests to the local zone regardless of the
-// upstream zone structure. In Envoy's default configuration, traffic is distributed proportionally
-// across all upstream hosts while trying to maximize local routing when possible. The approach
-// with force_local_zone aims to be more predictable and if there are upstream hosts in the local
-// zone, they will receive all traffic.
-// * :ref:`runtime values <config_cluster_manager_cluster_runtime_zone_routing>`.
-// * :ref:`Zone aware routing support <arch_overview_load_balancing_zone_aware_routing>`.
-type LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Configures the minimum number of upstream hosts in the local zone required when force_local_zone
-	// is enabled. If the number of upstream hosts in the local zone is less than the specified value,
-	// Envoy will fall back to the default proportional-based distribution across localities.
-	// If not specified, the default is 1.
-	// * :ref:`runtime values <config_cluster_manager_cluster_runtime_zone_routing>`.
-	// * :ref:`Zone aware routing support <arch_overview_load_balancing_zone_aware_routing>`.
-	MinSize *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=min_size,json=minSize,proto3" json:"min_size,omitempty"`
-}
-
-func (x *LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone) Reset() {
-	*x = LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_load_balancing_policies_common_v3_common_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone) ProtoMessage() {}
-
-func (x *LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_load_balancing_policies_common_v3_common_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone.ProtoReflect.Descriptor instead.
-func (*LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_load_balancing_policies_common_v3_common_proto_rawDescGZIP(), []int{0, 0, 0}
-}
-
-func (x *LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone) GetMinSize() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.MinSize
-	}
-	return nil
-}
-
 var File_envoy_extensions_load_balancing_policies_common_v3_common_proto protoreflect.FileDescriptor
 
 var file_envoy_extensions_load_balancing_policies_common_v3_common_proto_rawDesc = []byte{
@@ -485,106 +412,89 @@ var file_envoy_extensions_load_balancing_policies_common_v3_common_proto_rawDesc
 	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x1a, 0x23, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61,
-	0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
-	0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x22, 0xfc, 0x06, 0x0a, 0x10, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x4c, 0x62, 0x43,
-	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x89, 0x01, 0x0a, 0x14, 0x7a, 0x6f, 0x6e, 0x65, 0x5f, 0x61,
-	0x77, 0x61, 0x72, 0x65, 0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x56, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c,
-	0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69,
-	0x74, 0x79, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x5a, 0x6f, 0x6e, 0x65, 0x41,
-	0x77, 0x61, 0x72, 0x65, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x11,
-	0x7a, 0x6f, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x65, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x9e, 0x01, 0x0a, 0x1b, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x77,
-	0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x5d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e,
-	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f,
-	0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69,
-	0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x6f, 0x63,
-	0x61, 0x6c, 0x69, 0x74, 0x79, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c, 0x6f,
-	0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x4c, 0x62,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x18, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69,
-	0x74, 0x79, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x1a, 0xfc, 0x03, 0x0a, 0x11, 0x5a, 0x6f, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x65,
-	0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x3f, 0x0a, 0x0f, 0x72, 0x6f, 0x75, 0x74,
-	0x69, 0x6e, 0x67, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x16, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76,
-	0x33, 0x2e, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x0e, 0x72, 0x6f, 0x75, 0x74, 0x69,
-	0x6e, 0x67, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x46, 0x0a, 0x10, 0x6d, 0x69, 0x6e,
-	0x5f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x52, 0x0e, 0x6d, 0x69, 0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x69, 0x7a,
-	0x65, 0x12, 0x31, 0x0a, 0x15, 0x66, 0x61, 0x69, 0x6c, 0x5f, 0x74, 0x72, 0x61, 0x66, 0x66, 0x69,
-	0x63, 0x5f, 0x6f, 0x6e, 0x5f, 0x70, 0x61, 0x6e, 0x69, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x12, 0x66, 0x61, 0x69, 0x6c, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x4f, 0x6e, 0x50,
-	0x61, 0x6e, 0x69, 0x63, 0x12, 0x4e, 0x0a, 0x1d, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x5f, 0x6c, 0x6f,
-	0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x72, 0x6f,
-	0x75, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x42, 0x0b, 0x92, 0xc7, 0x86,
-	0xd8, 0x04, 0x03, 0x33, 0x2e, 0x30, 0x18, 0x01, 0x52, 0x1a, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x4c,
-	0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x6f, 0x75,
-	0x74, 0x69, 0x6e, 0x67, 0x12, 0x8f, 0x01, 0x0a, 0x10, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x5f, 0x6c,
-	0x6f, 0x63, 0x61, 0x6c, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x65, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+	0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c,
+	0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x92, 0x05, 0x0a, 0x10,
+	0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x12, 0x89, 0x01, 0x0a, 0x14, 0x7a, 0x6f, 0x6e, 0x65, 0x5f, 0x61, 0x77, 0x61, 0x72, 0x65, 0x5f,
+	0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x56, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
 	0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e,
 	0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
 	0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x4c, 0x62, 0x43,
 	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x5a, 0x6f, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x65, 0x4c,
-	0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x63,
-	0x61, 0x6c, 0x5a, 0x6f, 0x6e, 0x65, 0x52, 0x0e, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x63,
-	0x61, 0x6c, 0x5a, 0x6f, 0x6e, 0x65, 0x1a, 0x49, 0x0a, 0x0e, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x4c,
-	0x6f, 0x63, 0x61, 0x6c, 0x5a, 0x6f, 0x6e, 0x65, 0x12, 0x37, 0x0a, 0x08, 0x6d, 0x69, 0x6e, 0x5f,
-	0x73, 0x69, 0x7a, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f,
-	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e,
-	0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x07, 0x6d, 0x69, 0x6e, 0x53, 0x69, 0x7a,
-	0x65, 0x1a, 0x1a, 0x0a, 0x18, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x57, 0x65, 0x69,
-	0x67, 0x68, 0x74, 0x65, 0x64, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x20, 0x0a,
-	0x19, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01, 0x22,
-	0xe3, 0x01, 0x0a, 0x0f, 0x53, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x12, 0x45, 0x0a, 0x11, 0x73, 0x6c, 0x6f, 0x77, 0x5f, 0x73, 0x74, 0x61, 0x72,
-	0x74, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19,
+	0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x48, 0x00, 0x52, 0x11, 0x7a, 0x6f, 0x6e, 0x65, 0x41,
+	0x77, 0x61, 0x72, 0x65, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x9e, 0x01, 0x0a,
+	0x1b, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74,
+	0x65, 0x64, 0x5f, 0x6c, 0x62, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x5d, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e,
+	0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x63, 0x6f,
+	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79,
+	0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74,
+	0x79, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x48, 0x00, 0x52, 0x18, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x57, 0x65, 0x69,
+	0x67, 0x68, 0x74, 0x65, 0x64, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x92, 0x02,
+	0x0a, 0x11, 0x5a, 0x6f, 0x6e, 0x65, 0x41, 0x77, 0x61, 0x72, 0x65, 0x4c, 0x62, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x12, 0x3f, 0x0a, 0x0f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x65,
+	0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x65, 0x72,
+	0x63, 0x65, 0x6e, 0x74, 0x52, 0x0e, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67, 0x45, 0x6e, 0x61,
+	0x62, 0x6c, 0x65, 0x64, 0x12, 0x46, 0x0a, 0x10, 0x6d, 0x69, 0x6e, 0x5f, 0x63, 0x6c, 0x75, 0x73,
+	0x74, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c,
 	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
-	0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x73, 0x6c, 0x6f, 0x77, 0x53,
-	0x74, 0x61, 0x72, 0x74, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x12, 0x43, 0x0a, 0x0a, 0x61, 0x67,
-	0x67, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23,
-	0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x44, 0x6f, 0x75,
-	0x62, 0x6c, 0x65, 0x52, 0x0a, 0x61, 0x67, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12,
-	0x44, 0x0a, 0x12, 0x6d, 0x69, 0x6e, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x70, 0x65,
-	0x72, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x65, 0x72, 0x63,
-	0x65, 0x6e, 0x74, 0x52, 0x10, 0x6d, 0x69, 0x6e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x50, 0x65,
-	0x72, 0x63, 0x65, 0x6e, 0x74, 0x22, 0xab, 0x01, 0x0a, 0x19, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73,
-	0x74, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x4c, 0x62, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x12, 0x37, 0x0a, 0x18, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x6e,
-	0x61, 0x6d, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x75, 0x73, 0x65, 0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61,
-	0x6d, 0x65, 0x46, 0x6f, 0x72, 0x48, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x12, 0x55, 0x0a, 0x13,
-	0x68, 0x61, 0x73, 0x68, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x66, 0x61, 0x63,
-	0x74, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74,
-	0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28, 0x64,
-	0x52, 0x11, 0x68, 0x61, 0x73, 0x68, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x46, 0x61, 0x63,
-	0x74, 0x6f, 0x72, 0x42, 0xbd, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x40,
-	0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6c,
-	0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f,
-	0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x33,
-	0x42, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x62, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
-	0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61,
-	0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73,
-	0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x2e, 0x55, 0x49, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0e, 0x6d, 0x69,
+	0x6e, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x31, 0x0a, 0x15,
+	0x66, 0x61, 0x69, 0x6c, 0x5f, 0x74, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x5f, 0x6f, 0x6e, 0x5f,
+	0x70, 0x61, 0x6e, 0x69, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x66, 0x61, 0x69,
+	0x6c, 0x54, 0x72, 0x61, 0x66, 0x66, 0x69, 0x63, 0x4f, 0x6e, 0x50, 0x61, 0x6e, 0x69, 0x63, 0x12,
+	0x41, 0x0a, 0x1d, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74,
+	0x79, 0x5f, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f, 0x72, 0x6f, 0x75, 0x74, 0x69, 0x6e, 0x67,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1a, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x4c, 0x6f, 0x63,
+	0x61, 0x6c, 0x69, 0x74, 0x79, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x69,
+	0x6e, 0x67, 0x1a, 0x1a, 0x0a, 0x18, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x57, 0x65,
+	0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x4c, 0x62, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x42, 0x20,
+	0x0a, 0x19, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x03, 0xf8, 0x42, 0x01,
+	0x22, 0xe3, 0x01, 0x0a, 0x0f, 0x53, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x12, 0x45, 0x0a, 0x11, 0x73, 0x6c, 0x6f, 0x77, 0x5f, 0x73, 0x74, 0x61,
+	0x72, 0x74, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0f, 0x73, 0x6c, 0x6f, 0x77,
+	0x53, 0x74, 0x61, 0x72, 0x74, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x12, 0x43, 0x0a, 0x0a, 0x61,
+	0x67, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x23, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63,
+	0x6f, 0x72, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x52, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x44, 0x6f,
+	0x75, 0x62, 0x6c, 0x65, 0x52, 0x0a, 0x61, 0x67, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
+	0x12, 0x44, 0x0a, 0x12, 0x6d, 0x69, 0x6e, 0x5f, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x70,
+	0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x65, 0x72,
+	0x63, 0x65, 0x6e, 0x74, 0x52, 0x10, 0x6d, 0x69, 0x6e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x50,
+	0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x22, 0xab, 0x01, 0x0a, 0x19, 0x43, 0x6f, 0x6e, 0x73, 0x69,
+	0x73, 0x74, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x4c, 0x62, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x12, 0x37, 0x0a, 0x18, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x6f, 0x73, 0x74,
+	0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x66, 0x6f, 0x72, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x75, 0x73, 0x65, 0x48, 0x6f, 0x73, 0x74, 0x6e,
+	0x61, 0x6d, 0x65, 0x46, 0x6f, 0x72, 0x48, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x12, 0x55, 0x0a,
+	0x13, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x66, 0x61,
+	0x63, 0x74, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e,
+	0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0xfa, 0x42, 0x04, 0x2a, 0x02, 0x28,
+	0x64, 0x52, 0x11, 0x68, 0x61, 0x73, 0x68, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x46, 0x61,
+	0x63, 0x74, 0x6f, 0x72, 0x42, 0xbd, 0x01, 0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a,
+	0x40, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65,
+	0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
+	0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70,
+	0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76,
+	0x33, 0x42, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
+	0x5a, 0x62, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
+	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62,
+	0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65,
+	0x73, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -599,36 +509,33 @@ func file_envoy_extensions_load_balancing_policies_common_v3_common_proto_rawDes
 	return file_envoy_extensions_load_balancing_policies_common_v3_common_proto_rawDescData
 }
 
-var file_envoy_extensions_load_balancing_policies_common_v3_common_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_envoy_extensions_load_balancing_policies_common_v3_common_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_envoy_extensions_load_balancing_policies_common_v3_common_proto_goTypes = []interface{}{
-	(*LocalityLbConfig)(nil),                                  // 0: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig
-	(*SlowStartConfig)(nil),                                   // 1: envoy.extensions.load_balancing_policies.common.v3.SlowStartConfig
-	(*ConsistentHashingLbConfig)(nil),                         // 2: envoy.extensions.load_balancing_policies.common.v3.ConsistentHashingLbConfig
-	(*LocalityLbConfig_ZoneAwareLbConfig)(nil),                // 3: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig
-	(*LocalityLbConfig_LocalityWeightedLbConfig)(nil),         // 4: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.LocalityWeightedLbConfig
-	(*LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone)(nil), // 5: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig.ForceLocalZone
-	(*durationpb.Duration)(nil),                               // 6: google.protobuf.Duration
-	(*v3.RuntimeDouble)(nil),                                  // 7: envoy.config.core.v3.RuntimeDouble
-	(*v31.Percent)(nil),                                       // 8: envoy.type.v3.Percent
-	(*wrapperspb.UInt32Value)(nil),                            // 9: google.protobuf.UInt32Value
-	(*wrapperspb.UInt64Value)(nil),                            // 10: google.protobuf.UInt64Value
+	(*LocalityLbConfig)(nil),                          // 0: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig
+	(*SlowStartConfig)(nil),                           // 1: envoy.extensions.load_balancing_policies.common.v3.SlowStartConfig
+	(*ConsistentHashingLbConfig)(nil),                 // 2: envoy.extensions.load_balancing_policies.common.v3.ConsistentHashingLbConfig
+	(*LocalityLbConfig_ZoneAwareLbConfig)(nil),        // 3: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig
+	(*LocalityLbConfig_LocalityWeightedLbConfig)(nil), // 4: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.LocalityWeightedLbConfig
+	(*durationpb.Duration)(nil),                       // 5: google.protobuf.Duration
+	(*v3.RuntimeDouble)(nil),                          // 6: envoy.config.core.v3.RuntimeDouble
+	(*v31.Percent)(nil),                               // 7: envoy.type.v3.Percent
+	(*wrapperspb.UInt32Value)(nil),                    // 8: google.protobuf.UInt32Value
+	(*wrapperspb.UInt64Value)(nil),                    // 9: google.protobuf.UInt64Value
 }
 var file_envoy_extensions_load_balancing_policies_common_v3_common_proto_depIdxs = []int32{
-	3,  // 0: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.zone_aware_lb_config:type_name -> envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig
-	4,  // 1: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.locality_weighted_lb_config:type_name -> envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.LocalityWeightedLbConfig
-	6,  // 2: envoy.extensions.load_balancing_policies.common.v3.SlowStartConfig.slow_start_window:type_name -> google.protobuf.Duration
-	7,  // 3: envoy.extensions.load_balancing_policies.common.v3.SlowStartConfig.aggression:type_name -> envoy.config.core.v3.RuntimeDouble
-	8,  // 4: envoy.extensions.load_balancing_policies.common.v3.SlowStartConfig.min_weight_percent:type_name -> envoy.type.v3.Percent
-	9,  // 5: envoy.extensions.load_balancing_policies.common.v3.ConsistentHashingLbConfig.hash_balance_factor:type_name -> google.protobuf.UInt32Value
-	8,  // 6: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig.routing_enabled:type_name -> envoy.type.v3.Percent
-	10, // 7: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig.min_cluster_size:type_name -> google.protobuf.UInt64Value
-	5,  // 8: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig.force_local_zone:type_name -> envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig.ForceLocalZone
-	9,  // 9: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig.ForceLocalZone.min_size:type_name -> google.protobuf.UInt32Value
-	10, // [10:10] is the sub-list for method output_type
-	10, // [10:10] is the sub-list for method input_type
-	10, // [10:10] is the sub-list for extension type_name
-	10, // [10:10] is the sub-list for extension extendee
-	0,  // [0:10] is the sub-list for field type_name
+	3, // 0: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.zone_aware_lb_config:type_name -> envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig
+	4, // 1: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.locality_weighted_lb_config:type_name -> envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.LocalityWeightedLbConfig
+	5, // 2: envoy.extensions.load_balancing_policies.common.v3.SlowStartConfig.slow_start_window:type_name -> google.protobuf.Duration
+	6, // 3: envoy.extensions.load_balancing_policies.common.v3.SlowStartConfig.aggression:type_name -> envoy.config.core.v3.RuntimeDouble
+	7, // 4: envoy.extensions.load_balancing_policies.common.v3.SlowStartConfig.min_weight_percent:type_name -> envoy.type.v3.Percent
+	8, // 5: envoy.extensions.load_balancing_policies.common.v3.ConsistentHashingLbConfig.hash_balance_factor:type_name -> google.protobuf.UInt32Value
+	7, // 6: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig.routing_enabled:type_name -> envoy.type.v3.Percent
+	9, // 7: envoy.extensions.load_balancing_policies.common.v3.LocalityLbConfig.ZoneAwareLbConfig.min_cluster_size:type_name -> google.protobuf.UInt64Value
+	8, // [8:8] is the sub-list for method output_type
+	8, // [8:8] is the sub-list for method input_type
+	8, // [8:8] is the sub-list for extension type_name
+	8, // [8:8] is the sub-list for extension extendee
+	0, // [0:8] is the sub-list for field type_name
 }
 
 func init() { file_envoy_extensions_load_balancing_policies_common_v3_common_proto_init() }
@@ -697,18 +604,6 @@ func file_envoy_extensions_load_balancing_policies_common_v3_common_proto_init()
 				return nil
 			}
 		}
-		file_envoy_extensions_load_balancing_policies_common_v3_common_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
 	}
 	file_envoy_extensions_load_balancing_policies_common_v3_common_proto_msgTypes[0].OneofWrappers = []interface{}{
 		(*LocalityLbConfig_ZoneAwareLbConfig_)(nil),
@@ -720,7 +615,7 @@ func file_envoy_extensions_load_balancing_policies_common_v3_common_proto_init()
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_envoy_extensions_load_balancing_policies_common_v3_common_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   6,
+			NumMessages:   5,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/envoy/extensions/load_balancing_policies/common/v3/common.pb.validate.go b/envoy/extensions/load_balancing_policies/common/v3/common.pb.validate.go
old mode 100755
new mode 100644
index 1ed730c3a2..144740dc92
--- a/envoy/extensions/load_balancing_policies/common/v3/common.pb.validate.go
+++ b/envoy/extensions/load_balancing_policies/common/v3/common.pb.validate.go
@@ -627,35 +627,6 @@ func (m *LocalityLbConfig_ZoneAwareLbConfig) validate(all bool) error {
 
 	// no validation rules for ForceLocalityDirectRouting
 
-	if all {
-		switch v := interface{}(m.GetForceLocalZone()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, LocalityLbConfig_ZoneAwareLbConfigValidationError{
-					field:  "ForceLocalZone",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, LocalityLbConfig_ZoneAwareLbConfigValidationError{
-					field:  "ForceLocalZone",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetForceLocalZone()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return LocalityLbConfig_ZoneAwareLbConfigValidationError{
-				field:  "ForceLocalZone",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
 	if len(errors) > 0 {
 		return LocalityLbConfig_ZoneAwareLbConfigMultiError(errors)
 	}
@@ -843,145 +814,3 @@ var _ interface {
 	Cause() error
 	ErrorName() string
 } = LocalityLbConfig_LocalityWeightedLbConfigValidationError{}
-
-// Validate checks the field values on
-// LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone with the rules defined in
-// the proto definition for this message. If any rules are violated, the first
-// error encountered is returned, or nil if there are no violations.
-func (m *LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on
-// LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone with the rules defined in
-// the proto definition for this message. If any rules are violated, the
-// result is a list of violation errors wrapped in
-// LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneMultiError, or nil if none found.
-func (m *LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if all {
-		switch v := interface{}(m.GetMinSize()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneValidationError{
-					field:  "MinSize",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneValidationError{
-					field:  "MinSize",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetMinSize()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneValidationError{
-				field:  "MinSize",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if len(errors) > 0 {
-		return LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneMultiError(errors)
-	}
-
-	return nil
-}
-
-// LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneMultiError is an error
-// wrapping multiple validation errors returned by
-// LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone.ValidateAll() if the
-// designated constraints aren't met.
-type LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneMultiError) AllErrors() []error { return m }
-
-// LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneValidationError is the
-// validation error returned by
-// LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone.Validate if the
-// designated constraints aren't met.
-type LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneValidationError) Field() string {
-	return e.field
-}
-
-// Reason function returns reason value.
-func (e LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneValidationError) Reason() string {
-	return e.reason
-}
-
-// Cause function returns cause value.
-func (e LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneValidationError) Cause() error {
-	return e.cause
-}
-
-// Key function returns key value.
-func (e LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneValidationError) ErrorName() string {
-	return "LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sLocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZoneValidationError{}
diff --git a/envoy/extensions/load_balancing_policies/common/v3/common_vtproto.pb.go b/envoy/extensions/load_balancing_policies/common/v3/common_vtproto.pb.go
index d28645eb4a..dd52443c9f 100755
--- a/envoy/extensions/load_balancing_policies/common/v3/common_vtproto.pb.go
+++ b/envoy/extensions/load_balancing_policies/common/v3/common_vtproto.pb.go
@@ -21,49 +21,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-func (m *LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	if m.MinSize != nil {
-		size, err := (*wrapperspb.UInt32Value)(m.MinSize).MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
 func (m *LocalityLbConfig_ZoneAwareLbConfig) MarshalVTStrict() (dAtA []byte, err error) {
 	if m == nil {
 		return nil, nil
@@ -94,16 +51,6 @@ func (m *LocalityLbConfig_ZoneAwareLbConfig) MarshalToSizedBufferVTStrict(dAtA [
 		i -= len(m.unknownFields)
 		copy(dAtA[i:], m.unknownFields)
 	}
-	if m.ForceLocalZone != nil {
-		size, err := m.ForceLocalZone.MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0x2a
-	}
 	if m.ForceLocalityDirectRouting {
 		i--
 		if m.ForceLocalityDirectRouting {
@@ -425,20 +372,6 @@ func (m *ConsistentHashingLbConfig) MarshalToSizedBufferVTStrict(dAtA []byte) (i
 	return len(dAtA) - i, nil
 }
 
-func (m *LocalityLbConfig_ZoneAwareLbConfig_ForceLocalZone) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.MinSize != nil {
-		l = (*wrapperspb.UInt32Value)(m.MinSize).SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	n += len(m.unknownFields)
-	return n
-}
-
 func (m *LocalityLbConfig_ZoneAwareLbConfig) SizeVT() (n int) {
 	if m == nil {
 		return 0
@@ -465,10 +398,6 @@ func (m *LocalityLbConfig_ZoneAwareLbConfig) SizeVT() (n int) {
 	if m.ForceLocalityDirectRouting {
 		n += 2
 	}
-	if m.ForceLocalZone != nil {
-		l = m.ForceLocalZone.SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
 	n += len(m.unknownFields)
 	return n
 }
diff --git a/envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.validate.go b/envoy/extensions/load_balancing_policies/least_request/v3/least_request.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/load_balancing_policies/maglev/v3/maglev.pb.validate.go b/envoy/extensions/load_balancing_policies/maglev/v3/maglev.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/load_balancing_policies/override_host/v3/override_host.pb.go b/envoy/extensions/load_balancing_policies/override_host/v3/override_host.pb.go
deleted file mode 100755
index aa85de9a74..0000000000
--- a/envoy/extensions/load_balancing_policies/override_host/v3/override_host.pb.go
+++ /dev/null
@@ -1,324 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        v5.29.3
-// source: envoy/extensions/load_balancing_policies/override_host/v3/override_host.proto
-
-package override_hostv3
-
-import (
-	_ "github.com/cncf/xds/go/udpa/annotations"
-	v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
-	v31 "github.com/envoyproxy/go-control-plane/envoy/type/metadata/v3"
-	_ "github.com/envoyproxy/protoc-gen-validate/validate"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-// Configuration for the Override Host Load Balancing policy.
-//
-// This policy allows endpoint picking to be implemented in downstream HTTP filters. For example an ext_proc RPC to a service
-// that implements k8s proposal for AI gateway inferences extensions
-// https://github.com/kubernetes-sigs/gateway-api-inference-extension/tree/main/docs/proposals/004-endpoint-picker-protocol
-// can provide hosts for serving a request using Override Host load balancing policy.
-//
-// This policy extracts selected override hosts from a list of “OverrideHostSource“ (request headers, metadata, etc.).
-//
-// The override host source must specify at least one host in “IP:Port“ format or multiple hosts in “IP:Port,IP:Port,...“
-// format. For example “10.0.0.5:8080“ or “[2600:4040:5204::1574:24ae]:80“. The IPv6 address is enclosed in square brackets.
-//
-// For specific example, to support k8s gateway inference extensions, which uses the “x-gateway-destination-endpoint“
-// header or metadata value under the "envoy.lb" key for selected hosts, the Override Host load balancing policy should be
-// configured in the following way:
-//
-// .. code-block:: yaml
-//
-//	override_host_sources:
-//	  - header: "x-gateway-destination-endpoint"
-//	  - metadata:
-//	      key: "envoy.lb"
-//	      path:
-//	      - key: "x-gateway-destination-endpoint"
-//
-// If no valid host in the override host list, then the specified fallback load balancing policy is used. This allows load
-// balancing to degrade to a a built in policy (i.e. Round Robin) in case external endpoint picker fails.
-//
-// See the :ref:`load balancing architecture
-// overview<arch_overview_load_balancing_types>` for more information.
-type OverrideHost struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// A list of sources to get host addresses from. The host sources are searched in the order
-	// specified. The request is forwarded to the first address and subsequent addresses are used
-	// for request retries or hedging.
-	// Note that if an overridden host address is not present in the current endpoint set, it is
-	// skipped and the next found address is used. If there are not enough overridden addresses to
-	// satisfy all retry attempts the fallback load balancing policy is used to pick a host.
-	OverrideHostSources []*OverrideHost_OverrideHostSource `protobuf:"bytes,1,rep,name=override_host_sources,json=overrideHostSources,proto3" json:"override_host_sources,omitempty"`
-	// The child LB policy to use in case neither header nor metadata with selected
-	// hosts is present.
-	FallbackPolicy *v3.LoadBalancingPolicy `protobuf:"bytes,3,opt,name=fallback_policy,json=fallbackPolicy,proto3" json:"fallback_policy,omitempty"`
-}
-
-func (x *OverrideHost) Reset() {
-	*x = OverrideHost{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OverrideHost) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OverrideHost) ProtoMessage() {}
-
-func (x *OverrideHost) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OverrideHost.ProtoReflect.Descriptor instead.
-func (*OverrideHost) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *OverrideHost) GetOverrideHostSources() []*OverrideHost_OverrideHostSource {
-	if x != nil {
-		return x.OverrideHostSources
-	}
-	return nil
-}
-
-func (x *OverrideHost) GetFallbackPolicy() *v3.LoadBalancingPolicy {
-	if x != nil {
-		return x.FallbackPolicy
-	}
-	return nil
-}
-
-type OverrideHost_OverrideHostSource struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// The header to get the override host addresses.
-	//
-	// Only one of the header or metadata field could be set.
-	Header string `protobuf:"bytes,1,opt,name=header,proto3" json:"header,omitempty"`
-	// The metadata key to get the override host addresses from the request dynamic metadata. If
-	// set this field then it will take precedence over the header field.
-	//
-	// Only one of the header or metadata field could be set.
-	Metadata *v31.MetadataKey `protobuf:"bytes,2,opt,name=metadata,proto3" json:"metadata,omitempty"`
-}
-
-func (x *OverrideHost_OverrideHostSource) Reset() {
-	*x = OverrideHost_OverrideHostSource{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OverrideHost_OverrideHostSource) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OverrideHost_OverrideHostSource) ProtoMessage() {}
-
-func (x *OverrideHost_OverrideHostSource) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OverrideHost_OverrideHostSource.ProtoReflect.Descriptor instead.
-func (*OverrideHost_OverrideHostSource) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_rawDescGZIP(), []int{0, 0}
-}
-
-func (x *OverrideHost_OverrideHostSource) GetHeader() string {
-	if x != nil {
-		return x.Header
-	}
-	return ""
-}
-
-func (x *OverrideHost_OverrideHostSource) GetMetadata() *v31.MetadataKey {
-	if x != nil {
-		return x.Metadata
-	}
-	return nil
-}
-
-var File_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto protoreflect.FileDescriptor
-
-var file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_rawDesc = []byte{
-	0x0a, 0x4d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x2f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e,
-	0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2f, 0x6f, 0x76, 0x65, 0x72, 0x72,
-	0x69, 0x64, 0x65, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x2f, 0x76, 0x33, 0x2f, 0x6f, 0x76, 0x65, 0x72,
-	0x72, 0x69, 0x64, 0x65, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x39, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67,
-	0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69,
-	0x64, 0x65, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x2e, 0x76, 0x33, 0x1a, 0x25, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x25, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x6d, 0x65,
-	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x76, 0x33, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61,
-	0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
-	0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x22, 0x86, 0x03, 0x0a, 0x0c, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x48, 0x6f, 0x73,
-	0x74, 0x12, 0x98, 0x01, 0x0a, 0x15, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x68,
-	0x6f, 0x73, 0x74, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x5a, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63,
-	0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x6f, 0x76, 0x65,
-	0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x2e, 0x76, 0x33, 0x2e, 0x4f, 0x76,
-	0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x48, 0x6f, 0x73, 0x74, 0x2e, 0x4f, 0x76, 0x65, 0x72, 0x72,
-	0x69, 0x64, 0x65, 0x48, 0x6f, 0x73, 0x74, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x08, 0xfa,
-	0x42, 0x05, 0x92, 0x01, 0x02, 0x08, 0x01, 0x52, 0x13, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64,
-	0x65, 0x48, 0x6f, 0x73, 0x74, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x12, 0x5f, 0x0a, 0x0f,
-	0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e,
-	0x4c, 0x6f, 0x61, 0x64, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x6c,
-	0x69, 0x63, 0x79, 0x42, 0x08, 0xfa, 0x42, 0x05, 0x8a, 0x01, 0x02, 0x10, 0x01, 0x52, 0x0e, 0x66,
-	0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x1a, 0x7a, 0x0a,
-	0x12, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x48, 0x6f, 0x73, 0x74, 0x53, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x42, 0x0b, 0xfa, 0x42, 0x08, 0x72, 0x06, 0xc8, 0x01, 0x00, 0xc0, 0x01, 0x02,
-	0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x3f, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61,
-	0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
-	0x2e, 0x76, 0x33, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x52,
-	0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0xd8, 0x01, 0xba, 0x80, 0xc8, 0xd1,
-	0x06, 0x02, 0x10, 0x02, 0x0a, 0x47, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63,
-	0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x69, 0x65, 0x73, 0x2e, 0x6f, 0x76, 0x65,
-	0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x2e, 0x76, 0x33, 0x42, 0x11, 0x4f,
-	0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x48, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x50, 0x01, 0x5a, 0x70, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65,
-	0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6c, 0x6f, 0x61, 0x64,
-	0x5f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63,
-	0x69, 0x65, 0x73, 0x2f, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x68, 0x6f, 0x73,
-	0x74, 0x2f, 0x76, 0x33, 0x3b, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x5f, 0x68, 0x6f,
-	0x73, 0x74, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_rawDescOnce sync.Once
-	file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_rawDescData = file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_rawDesc
-)
-
-func file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_rawDescGZIP() []byte {
-	file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_rawDescOnce.Do(func() {
-		file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_rawDescData)
-	})
-	return file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_rawDescData
-}
-
-var file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_goTypes = []interface{}{
-	(*OverrideHost)(nil),                    // 0: envoy.extensions.load_balancing_policies.override_host.v3.OverrideHost
-	(*OverrideHost_OverrideHostSource)(nil), // 1: envoy.extensions.load_balancing_policies.override_host.v3.OverrideHost.OverrideHostSource
-	(*v3.LoadBalancingPolicy)(nil),          // 2: envoy.config.cluster.v3.LoadBalancingPolicy
-	(*v31.MetadataKey)(nil),                 // 3: envoy.type.metadata.v3.MetadataKey
-}
-var file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_depIdxs = []int32{
-	1, // 0: envoy.extensions.load_balancing_policies.override_host.v3.OverrideHost.override_host_sources:type_name -> envoy.extensions.load_balancing_policies.override_host.v3.OverrideHost.OverrideHostSource
-	2, // 1: envoy.extensions.load_balancing_policies.override_host.v3.OverrideHost.fallback_policy:type_name -> envoy.config.cluster.v3.LoadBalancingPolicy
-	3, // 2: envoy.extensions.load_balancing_policies.override_host.v3.OverrideHost.OverrideHostSource.metadata:type_name -> envoy.type.metadata.v3.MetadataKey
-	3, // [3:3] is the sub-list for method output_type
-	3, // [3:3] is the sub-list for method input_type
-	3, // [3:3] is the sub-list for extension type_name
-	3, // [3:3] is the sub-list for extension extendee
-	0, // [0:3] is the sub-list for field type_name
-}
-
-func init() {
-	file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_init()
-}
-func file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_init() {
-	if File_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OverrideHost); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OverrideHost_OverrideHostSource); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_goTypes,
-		DependencyIndexes: file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_depIdxs,
-		MessageInfos:      file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_msgTypes,
-	}.Build()
-	File_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto = out.File
-	file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_rawDesc = nil
-	file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_goTypes = nil
-	file_envoy_extensions_load_balancing_policies_override_host_v3_override_host_proto_depIdxs = nil
-}
diff --git a/envoy/extensions/load_balancing_policies/override_host/v3/override_host.pb.validate.go b/envoy/extensions/load_balancing_policies/override_host/v3/override_host.pb.validate.go
deleted file mode 100755
index a2c0205108..0000000000
--- a/envoy/extensions/load_balancing_policies/override_host/v3/override_host.pb.validate.go
+++ /dev/null
@@ -1,366 +0,0 @@
-//go:build !disable_pgv
-// Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: envoy/extensions/load_balancing_policies/override_host/v3/override_host.proto
-
-package override_hostv3
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"net"
-	"net/mail"
-	"net/url"
-	"regexp"
-	"sort"
-	"strings"
-	"time"
-	"unicode/utf8"
-
-	"google.golang.org/protobuf/types/known/anypb"
-)
-
-// ensure the imports are used
-var (
-	_ = bytes.MinRead
-	_ = errors.New("")
-	_ = fmt.Print
-	_ = utf8.UTFMax
-	_ = (*regexp.Regexp)(nil)
-	_ = (*strings.Reader)(nil)
-	_ = net.IPv4len
-	_ = time.Duration(0)
-	_ = (*url.URL)(nil)
-	_ = (*mail.Address)(nil)
-	_ = anypb.Any{}
-	_ = sort.Sort
-)
-
-// Validate checks the field values on OverrideHost with the rules defined in
-// the proto definition for this message. If any rules are violated, the first
-// error encountered is returned, or nil if there are no violations.
-func (m *OverrideHost) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on OverrideHost with the rules defined
-// in the proto definition for this message. If any rules are violated, the
-// result is a list of violation errors wrapped in OverrideHostMultiError, or
-// nil if none found.
-func (m *OverrideHost) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *OverrideHost) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if len(m.GetOverrideHostSources()) < 1 {
-		err := OverrideHostValidationError{
-			field:  "OverrideHostSources",
-			reason: "value must contain at least 1 item(s)",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	for idx, item := range m.GetOverrideHostSources() {
-		_, _ = idx, item
-
-		if all {
-			switch v := interface{}(item).(type) {
-			case interface{ ValidateAll() error }:
-				if err := v.ValidateAll(); err != nil {
-					errors = append(errors, OverrideHostValidationError{
-						field:  fmt.Sprintf("OverrideHostSources[%v]", idx),
-						reason: "embedded message failed validation",
-						cause:  err,
-					})
-				}
-			case interface{ Validate() error }:
-				if err := v.Validate(); err != nil {
-					errors = append(errors, OverrideHostValidationError{
-						field:  fmt.Sprintf("OverrideHostSources[%v]", idx),
-						reason: "embedded message failed validation",
-						cause:  err,
-					})
-				}
-			}
-		} else if v, ok := interface{}(item).(interface{ Validate() error }); ok {
-			if err := v.Validate(); err != nil {
-				return OverrideHostValidationError{
-					field:  fmt.Sprintf("OverrideHostSources[%v]", idx),
-					reason: "embedded message failed validation",
-					cause:  err,
-				}
-			}
-		}
-
-	}
-
-	if m.GetFallbackPolicy() == nil {
-		err := OverrideHostValidationError{
-			field:  "FallbackPolicy",
-			reason: "value is required",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	if all {
-		switch v := interface{}(m.GetFallbackPolicy()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, OverrideHostValidationError{
-					field:  "FallbackPolicy",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, OverrideHostValidationError{
-					field:  "FallbackPolicy",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetFallbackPolicy()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return OverrideHostValidationError{
-				field:  "FallbackPolicy",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if len(errors) > 0 {
-		return OverrideHostMultiError(errors)
-	}
-
-	return nil
-}
-
-// OverrideHostMultiError is an error wrapping multiple validation errors
-// returned by OverrideHost.ValidateAll() if the designated constraints aren't met.
-type OverrideHostMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m OverrideHostMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m OverrideHostMultiError) AllErrors() []error { return m }
-
-// OverrideHostValidationError is the validation error returned by
-// OverrideHost.Validate if the designated constraints aren't met.
-type OverrideHostValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e OverrideHostValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e OverrideHostValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e OverrideHostValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e OverrideHostValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e OverrideHostValidationError) ErrorName() string { return "OverrideHostValidationError" }
-
-// Error satisfies the builtin error interface
-func (e OverrideHostValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sOverrideHost.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = OverrideHostValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = OverrideHostValidationError{}
-
-// Validate checks the field values on OverrideHost_OverrideHostSource with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, the first error encountered is returned, or nil if there are no violations.
-func (m *OverrideHost_OverrideHostSource) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on OverrideHost_OverrideHostSource with
-// the rules defined in the proto definition for this message. If any rules
-// are violated, the result is a list of violation errors wrapped in
-// OverrideHost_OverrideHostSourceMultiError, or nil if none found.
-func (m *OverrideHost_OverrideHostSource) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *OverrideHost_OverrideHostSource) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if !_OverrideHost_OverrideHostSource_Header_Pattern.MatchString(m.GetHeader()) {
-		err := OverrideHost_OverrideHostSourceValidationError{
-			field:  "Header",
-			reason: "value does not match regex pattern \"^[^\\x00\\n\\r]*$\"",
-		}
-		if !all {
-			return err
-		}
-		errors = append(errors, err)
-	}
-
-	if all {
-		switch v := interface{}(m.GetMetadata()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, OverrideHost_OverrideHostSourceValidationError{
-					field:  "Metadata",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, OverrideHost_OverrideHostSourceValidationError{
-					field:  "Metadata",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetMetadata()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return OverrideHost_OverrideHostSourceValidationError{
-				field:  "Metadata",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if len(errors) > 0 {
-		return OverrideHost_OverrideHostSourceMultiError(errors)
-	}
-
-	return nil
-}
-
-// OverrideHost_OverrideHostSourceMultiError is an error wrapping multiple
-// validation errors returned by OverrideHost_OverrideHostSource.ValidateAll()
-// if the designated constraints aren't met.
-type OverrideHost_OverrideHostSourceMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m OverrideHost_OverrideHostSourceMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m OverrideHost_OverrideHostSourceMultiError) AllErrors() []error { return m }
-
-// OverrideHost_OverrideHostSourceValidationError is the validation error
-// returned by OverrideHost_OverrideHostSource.Validate if the designated
-// constraints aren't met.
-type OverrideHost_OverrideHostSourceValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e OverrideHost_OverrideHostSourceValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e OverrideHost_OverrideHostSourceValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e OverrideHost_OverrideHostSourceValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e OverrideHost_OverrideHostSourceValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e OverrideHost_OverrideHostSourceValidationError) ErrorName() string {
-	return "OverrideHost_OverrideHostSourceValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e OverrideHost_OverrideHostSourceValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sOverrideHost_OverrideHostSource.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = OverrideHost_OverrideHostSourceValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = OverrideHost_OverrideHostSourceValidationError{}
-
-var _OverrideHost_OverrideHostSource_Header_Pattern = regexp.MustCompile("^[^\x00\n\r]*$")
diff --git a/envoy/extensions/load_balancing_policies/override_host/v3/override_host_vtproto.pb.go b/envoy/extensions/load_balancing_policies/override_host/v3/override_host_vtproto.pb.go
deleted file mode 100755
index bc5a13059e..0000000000
--- a/envoy/extensions/load_balancing_policies/override_host/v3/override_host_vtproto.pb.go
+++ /dev/null
@@ -1,199 +0,0 @@
-//go:build vtprotobuf
-// +build vtprotobuf
-
-// Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// source: envoy/extensions/load_balancing_policies/override_host/v3/override_host.proto
-
-package override_hostv3
-
-import (
-	protohelpers "github.com/planetscale/vtprotobuf/protohelpers"
-	proto "google.golang.org/protobuf/proto"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-func (m *OverrideHost_OverrideHostSource) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *OverrideHost_OverrideHostSource) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *OverrideHost_OverrideHostSource) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	if m.Metadata != nil {
-		if vtmsg, ok := interface{}(m.Metadata).(interface {
-			MarshalToSizedBufferVTStrict([]byte) (int, error)
-		}); ok {
-			size, err := vtmsg.MarshalToSizedBufferVTStrict(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		} else {
-			encoded, err := proto.Marshal(m.Metadata)
-			if err != nil {
-				return 0, err
-			}
-			i -= len(encoded)
-			copy(dAtA[i:], encoded)
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(len(encoded)))
-		}
-		i--
-		dAtA[i] = 0x12
-	}
-	if len(m.Header) > 0 {
-		i -= len(m.Header)
-		copy(dAtA[i:], m.Header)
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(len(m.Header)))
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *OverrideHost) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *OverrideHost) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *OverrideHost) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	if m.FallbackPolicy != nil {
-		if vtmsg, ok := interface{}(m.FallbackPolicy).(interface {
-			MarshalToSizedBufferVTStrict([]byte) (int, error)
-		}); ok {
-			size, err := vtmsg.MarshalToSizedBufferVTStrict(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		} else {
-			encoded, err := proto.Marshal(m.FallbackPolicy)
-			if err != nil {
-				return 0, err
-			}
-			i -= len(encoded)
-			copy(dAtA[i:], encoded)
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(len(encoded)))
-		}
-		i--
-		dAtA[i] = 0x1a
-	}
-	if len(m.OverrideHostSources) > 0 {
-		for iNdEx := len(m.OverrideHostSources) - 1; iNdEx >= 0; iNdEx-- {
-			size, err := m.OverrideHostSources[iNdEx].MarshalToSizedBufferVTStrict(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-			i--
-			dAtA[i] = 0xa
-		}
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *OverrideHost_OverrideHostSource) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = len(m.Header)
-	if l > 0 {
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	if m.Metadata != nil {
-		if size, ok := interface{}(m.Metadata).(interface {
-			SizeVT() int
-		}); ok {
-			l = size.SizeVT()
-		} else {
-			l = proto.Size(m.Metadata)
-		}
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	n += len(m.unknownFields)
-	return n
-}
-
-func (m *OverrideHost) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if len(m.OverrideHostSources) > 0 {
-		for _, e := range m.OverrideHostSources {
-			l = e.SizeVT()
-			n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-		}
-	}
-	if m.FallbackPolicy != nil {
-		if size, ok := interface{}(m.FallbackPolicy).(interface {
-			SizeVT() int
-		}); ok {
-			l = size.SizeVT()
-		} else {
-			l = proto.Size(m.FallbackPolicy)
-		}
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	n += len(m.unknownFields)
-	return n
-}
diff --git a/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.pb.validate.go b/envoy/extensions/load_balancing_policies/pick_first/v3/pick_first.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/load_balancing_policies/random/v3/random.pb.validate.go b/envoy/extensions/load_balancing_policies/random/v3/random.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.pb.validate.go b/envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.pb.validate.go b/envoy/extensions/load_balancing_policies/round_robin/v3/round_robin.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/load_balancing_policies/subset/v3/subset.pb.validate.go b/envoy/extensions/load_balancing_policies/subset/v3/subset.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.pb.validate.go b/envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/matching/common_inputs/environment_variable/v3/input.pb.validate.go b/envoy/extensions/matching/common_inputs/environment_variable/v3/input.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/matching/common_inputs/network/v3/network_inputs.pb.validate.go b/envoy/extensions/matching/common_inputs/network/v3/network_inputs.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/matching/common_inputs/ssl/v3/ssl_inputs.pb.validate.go b/envoy/extensions/matching/common_inputs/ssl/v3/ssl_inputs.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/matching/input_matchers/consistent_hashing/v3/consistent_hashing.pb.validate.go b/envoy/extensions/matching/input_matchers/consistent_hashing/v3/consistent_hashing.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/matching/input_matchers/ip/v3/ip.pb.validate.go b/envoy/extensions/matching/input_matchers/ip/v3/ip.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/matching/input_matchers/metadata/v3/metadata.pb.validate.go b/envoy/extensions/matching/input_matchers/metadata/v3/metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/matching/input_matchers/runtime_fraction/v3/runtime_fraction.pb.validate.go b/envoy/extensions/matching/input_matchers/runtime_fraction/v3/runtime_fraction.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/network/dns_resolver/apple/v3/apple_dns_resolver.pb.validate.go b/envoy/extensions/network/dns_resolver/apple/v3/apple_dns_resolver.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/network/dns_resolver/cares/v3/cares_dns_resolver.pb.validate.go b/envoy/extensions/network/dns_resolver/cares/v3/cares_dns_resolver.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/network/dns_resolver/getaddrinfo/v3/getaddrinfo_dns_resolver.pb.go b/envoy/extensions/network/dns_resolver/getaddrinfo/v3/getaddrinfo_dns_resolver.pb.go
index 84a13eb45c..0090a7a360 100755
--- a/envoy/extensions/network/dns_resolver/getaddrinfo/v3/getaddrinfo_dns_resolver.pb.go
+++ b/envoy/extensions/network/dns_resolver/getaddrinfo/v3/getaddrinfo_dns_resolver.pb.go
@@ -27,6 +27,12 @@ const (
 //
 // .. attention::
 //
+//	This resolver uses a single background thread to do resolutions. As such, it is not currently
+//	advised for use in situations requiring a high resolution rate. A thread pool can be added
+//	in the future if needed.
+//
+// .. attention::
+//
 //	Resolutions currently use a hard coded TTL of 60s because the getaddrinfo() API does not
 //	provide the actual TTL. Configuration for this can be added in the future if needed.
 type GetAddrInfoDnsResolverConfig struct {
@@ -37,8 +43,6 @@ type GetAddrInfoDnsResolverConfig struct {
 	// Specifies the number of retries before the resolver gives up. If not specified, the resolver will
 	// retry indefinitely until it succeeds or the DNS query times out.
 	NumRetries *wrapperspb.UInt32Value `protobuf:"bytes,1,opt,name=num_retries,json=numRetries,proto3" json:"num_retries,omitempty"`
-	// Specifies the number of threads used to resolve pending DNS queries. If not specified, one thread is used.
-	NumResolverThreads *wrapperspb.UInt32Value `protobuf:"bytes,2,opt,name=num_resolver_threads,json=numResolverThreads,proto3" json:"num_resolver_threads,omitempty"`
 }
 
 func (x *GetAddrInfoDnsResolverConfig) Reset() {
@@ -80,13 +84,6 @@ func (x *GetAddrInfoDnsResolverConfig) GetNumRetries() *wrapperspb.UInt32Value {
 	return nil
 }
 
-func (x *GetAddrInfoDnsResolverConfig) GetNumResolverThreads() *wrapperspb.UInt32Value {
-	if x != nil {
-		return x.NumResolverThreads
-	}
-	return nil
-}
-
 var File_envoy_extensions_network_dns_resolver_getaddrinfo_v3_getaddrinfo_dns_resolver_proto protoreflect.FileDescriptor
 
 var file_envoy_extensions_network_dns_resolver_getaddrinfo_v3_getaddrinfo_dns_resolver_proto_rawDesc = []byte{
@@ -102,32 +99,27 @@ var file_envoy_extensions_network_dns_resolver_getaddrinfo_v3_getaddrinfo_dns_re
 	0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x77, 0x72, 0x61,
 	0x70, 0x70, 0x65, 0x72, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70,
 	0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xad, 0x01, 0x0a, 0x1c, 0x47,
-	0x65, 0x74, 0x41, 0x64, 0x64, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x44, 0x6e, 0x73, 0x52, 0x65, 0x73,
-	0x6f, 0x6c, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x3d, 0x0a, 0x0b, 0x6e,
-	0x75, 0x6d, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
-	0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0a,
-	0x6e, 0x75, 0x6d, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x12, 0x4e, 0x0a, 0x14, 0x6e, 0x75,
-	0x6d, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x61,
-	0x64, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
-	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33,
-	0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x12, 0x6e, 0x75, 0x6d, 0x52, 0x65, 0x73, 0x6f, 0x6c,
-	0x76, 0x65, 0x72, 0x54, 0x68, 0x72, 0x65, 0x61, 0x64, 0x73, 0x42, 0xd6, 0x01, 0xba, 0x80, 0xc8,
-	0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x42, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70,
-	0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e,
-	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x64, 0x6e,
-	0x73, 0x5f, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x2e, 0x67, 0x65, 0x74, 0x61, 0x64,
-	0x64, 0x72, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x76, 0x33, 0x42, 0x1b, 0x47, 0x65, 0x74, 0x61, 0x64,
-	0x64, 0x72, 0x69, 0x6e, 0x66, 0x6f, 0x44, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65,
-	0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x69, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f,
-	0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x65,
-	0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x2f, 0x67, 0x65, 0x74, 0x61, 0x64, 0x64, 0x72, 0x69, 0x6e,
-	0x66, 0x6f, 0x2f, 0x76, 0x33, 0x3b, 0x67, 0x65, 0x74, 0x61, 0x64, 0x64, 0x72, 0x69, 0x6e, 0x66,
-	0x6f, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5d, 0x0a, 0x1c, 0x47, 0x65,
+	0x74, 0x41, 0x64, 0x64, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x44, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x6f,
+	0x6c, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x3d, 0x0a, 0x0b, 0x6e, 0x75,
+	0x6d, 0x5f, 0x72, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x1c, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x55, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0a, 0x6e,
+	0x75, 0x6d, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x73, 0x42, 0xd6, 0x01, 0xba, 0x80, 0xc8, 0xd1,
+	0x06, 0x02, 0x10, 0x02, 0x0a, 0x42, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
+	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
+	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x64, 0x6e, 0x73,
+	0x5f, 0x72, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72, 0x2e, 0x67, 0x65, 0x74, 0x61, 0x64, 0x64,
+	0x72, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x76, 0x33, 0x42, 0x1b, 0x47, 0x65, 0x74, 0x61, 0x64, 0x64,
+	0x72, 0x69, 0x6e, 0x66, 0x6f, 0x44, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x72,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x69, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67,
+	0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f,
+	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73,
+	0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x64, 0x6e, 0x73, 0x5f, 0x72, 0x65, 0x73,
+	0x6f, 0x6c, 0x76, 0x65, 0x72, 0x2f, 0x67, 0x65, 0x74, 0x61, 0x64, 0x64, 0x72, 0x69, 0x6e, 0x66,
+	0x6f, 0x2f, 0x76, 0x33, 0x3b, 0x67, 0x65, 0x74, 0x61, 0x64, 0x64, 0x72, 0x69, 0x6e, 0x66, 0x6f,
+	0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -149,12 +141,11 @@ var file_envoy_extensions_network_dns_resolver_getaddrinfo_v3_getaddrinfo_dns_re
 }
 var file_envoy_extensions_network_dns_resolver_getaddrinfo_v3_getaddrinfo_dns_resolver_proto_depIdxs = []int32{
 	1, // 0: envoy.extensions.network.dns_resolver.getaddrinfo.v3.GetAddrInfoDnsResolverConfig.num_retries:type_name -> google.protobuf.UInt32Value
-	1, // 1: envoy.extensions.network.dns_resolver.getaddrinfo.v3.GetAddrInfoDnsResolverConfig.num_resolver_threads:type_name -> google.protobuf.UInt32Value
-	2, // [2:2] is the sub-list for method output_type
-	2, // [2:2] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension type_name
-	2, // [2:2] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
+	1, // [1:1] is the sub-list for method output_type
+	1, // [1:1] is the sub-list for method input_type
+	1, // [1:1] is the sub-list for extension type_name
+	1, // [1:1] is the sub-list for extension extendee
+	0, // [0:1] is the sub-list for field type_name
 }
 
 func init() {
diff --git a/envoy/extensions/network/dns_resolver/getaddrinfo/v3/getaddrinfo_dns_resolver.pb.validate.go b/envoy/extensions/network/dns_resolver/getaddrinfo/v3/getaddrinfo_dns_resolver.pb.validate.go
old mode 100755
new mode 100644
index 4a7a62b31b..edc20b7a07
--- a/envoy/extensions/network/dns_resolver/getaddrinfo/v3/getaddrinfo_dns_resolver.pb.validate.go
+++ b/envoy/extensions/network/dns_resolver/getaddrinfo/v3/getaddrinfo_dns_resolver.pb.validate.go
@@ -87,35 +87,6 @@ func (m *GetAddrInfoDnsResolverConfig) validate(all bool) error {
 		}
 	}
 
-	if all {
-		switch v := interface{}(m.GetNumResolverThreads()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, GetAddrInfoDnsResolverConfigValidationError{
-					field:  "NumResolverThreads",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, GetAddrInfoDnsResolverConfigValidationError{
-					field:  "NumResolverThreads",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetNumResolverThreads()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return GetAddrInfoDnsResolverConfigValidationError{
-				field:  "NumResolverThreads",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
 	if len(errors) > 0 {
 		return GetAddrInfoDnsResolverConfigMultiError(errors)
 	}
diff --git a/envoy/extensions/network/dns_resolver/getaddrinfo/v3/getaddrinfo_dns_resolver_vtproto.pb.go b/envoy/extensions/network/dns_resolver/getaddrinfo/v3/getaddrinfo_dns_resolver_vtproto.pb.go
index 5c11edf1e6..afdac10066 100755
--- a/envoy/extensions/network/dns_resolver/getaddrinfo/v3/getaddrinfo_dns_resolver_vtproto.pb.go
+++ b/envoy/extensions/network/dns_resolver/getaddrinfo/v3/getaddrinfo_dns_resolver_vtproto.pb.go
@@ -49,16 +49,6 @@ func (m *GetAddrInfoDnsResolverConfig) MarshalToSizedBufferVTStrict(dAtA []byte)
 		i -= len(m.unknownFields)
 		copy(dAtA[i:], m.unknownFields)
 	}
-	if m.NumResolverThreads != nil {
-		size, err := (*wrapperspb.UInt32Value)(m.NumResolverThreads).MarshalToSizedBufferVTStrict(dAtA[:i])
-		if err != nil {
-			return 0, err
-		}
-		i -= size
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		i--
-		dAtA[i] = 0x12
-	}
 	if m.NumRetries != nil {
 		size, err := (*wrapperspb.UInt32Value)(m.NumRetries).MarshalToSizedBufferVTStrict(dAtA[:i])
 		if err != nil {
@@ -82,10 +72,6 @@ func (m *GetAddrInfoDnsResolverConfig) SizeVT() (n int) {
 		l = (*wrapperspb.UInt32Value)(m.NumRetries).SizeVT()
 		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
 	}
-	if m.NumResolverThreads != nil {
-		l = (*wrapperspb.UInt32Value)(m.NumResolverThreads).SizeVT()
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
 	n += len(m.unknownFields)
 	return n
 }
diff --git a/envoy/extensions/network/socket_interface/v3/default_socket_interface.pb.validate.go b/envoy/extensions/network/socket_interface/v3/default_socket_interface.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/outlier_detection_monitors/common/v3/error_types.pb.validate.go b/envoy/extensions/outlier_detection_monitors/common/v3/error_types.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/outlier_detection_monitors/consecutive_errors/v3/consecutive_errors.pb.validate.go b/envoy/extensions/outlier_detection_monitors/consecutive_errors/v3/consecutive_errors.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/path/match/uri_template/v3/uri_template_match.pb.validate.go b/envoy/extensions/path/match/uri_template/v3/uri_template_match.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/path/rewrite/uri_template/v3/uri_template_rewrite.pb.validate.go b/envoy/extensions/path/rewrite/uri_template/v3/uri_template_rewrite.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/quic/connection_debug_visitor/quic_stats/v3/quic_stats.pb.validate.go b/envoy/extensions/quic/connection_debug_visitor/quic_stats/v3/quic_stats.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/quic/connection_debug_visitor/v3/connection_debug_visitor_basic.pb.validate.go b/envoy/extensions/quic/connection_debug_visitor/v3/connection_debug_visitor_basic.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/quic/connection_id_generator/quic_lb/v3/quic_lb.pb.validate.go b/envoy/extensions/quic/connection_id_generator/quic_lb/v3/quic_lb.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/quic/connection_id_generator/v3/envoy_deterministic_connection_id_generator.pb.validate.go b/envoy/extensions/quic/connection_id_generator/v3/envoy_deterministic_connection_id_generator.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/quic/crypto_stream/v3/crypto_stream.pb.validate.go b/envoy/extensions/quic/crypto_stream/v3/crypto_stream.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/quic/proof_source/v3/proof_source.pb.validate.go b/envoy/extensions/quic/proof_source/v3/proof_source.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/quic/server_preferred_address/v3/datasource.pb.validate.go b/envoy/extensions/quic/server_preferred_address/v3/datasource.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/quic/server_preferred_address/v3/fixed_server_preferred_address_config.pb.go b/envoy/extensions/quic/server_preferred_address/v3/fixed_server_preferred_address_config.pb.go
index 30dad58f20..a1b87d87ea 100755
--- a/envoy/extensions/quic/server_preferred_address/v3/fixed_server_preferred_address_config.pb.go
+++ b/envoy/extensions/quic/server_preferred_address/v3/fixed_server_preferred_address_config.pb.go
@@ -112,21 +112,18 @@ type FixedServerPreferredAddressConfig_AddressFamilyConfig struct {
 
 	// The server preferred address sent to clients.
 	//
-	// .. note::
-	//
-	//	Envoy currently requires all packets for a QUIC connection to arrive on the same port. Therefore, unless a
-	//	:ref:`dnat_address <envoy_v3_api_field_extensions.quic.server_preferred_address.v3.FixedServerPreferredAddressConfig.AddressFamilyConfig.dnat_address>`
-	//	is explicitly configured, the port specified here must be set to zero. In such cases, Envoy will automatically
-	//	use the listener's port.
+	// Note: Envoy currently must receive all packets for a QUIC connection on the same port, so unless
+	// :ref:`dnat_address <envoy_v3_api_field_extensions.quic.server_preferred_address.v3.FixedServerPreferredAddressConfig.AddressFamilyConfig.dnat_address>`
+	// is configured, the port for this address must be zero, and the listener's
+	// port will be used instead.
 	Address *v3.SocketAddress `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-	// If a DNAT exists between the client and Envoy, this is the address where Envoy will observe incoming server
-	// preferred address packets. If unspecified, Envoy assumes there is no DNAT, and packets will be sent directly
-	// to the address advertised to clients as the server preferred address.
-	//
-	// .. note::
+	// If there is a DNAT between the client and Envoy, the address that Envoy will observe
+	// server preferred address packets being sent to. If this is not specified, it is assumed
+	// there is no DNAT and the server preferred address packets will be sent to the address advertised
+	// to clients for server preferred address.
 	//
-	//	Envoy currently requires all packets for a QUIC connection to arrive on the same port. Consequently, the
-	//	port for this address must be set to zero, with Envoy defaulting to the listener's port instead.
+	// Note: Envoy currently must receive all packets for a QUIC connection on the same port, so the
+	// port for this address must be zero, and the listener's port will be used instead.
 	DnatAddress *v3.SocketAddress `protobuf:"bytes,2,opt,name=dnat_address,json=dnatAddress,proto3" json:"dnat_address,omitempty"`
 }
 
diff --git a/envoy/extensions/quic/server_preferred_address/v3/fixed_server_preferred_address_config.pb.validate.go b/envoy/extensions/quic/server_preferred_address/v3/fixed_server_preferred_address_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/rate_limit_descriptors/expr/v3/expr.pb.validate.go b/envoy/extensions/rate_limit_descriptors/expr/v3/expr.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/rbac/audit_loggers/stream/v3/stream.pb.validate.go b/envoy/extensions/rbac/audit_loggers/stream/v3/stream.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/rbac/matchers/upstream_ip_port/v3/upstream_ip_port_matcher.pb.validate.go b/envoy/extensions/rbac/matchers/upstream_ip_port/v3/upstream_ip_port_matcher.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/rbac/principals/mtls_authenticated/v3/mtls_authenticated.pb.validate.go b/envoy/extensions/rbac/principals/mtls_authenticated/v3/mtls_authenticated.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/regex_engines/v3/google_re2.pb.validate.go b/envoy/extensions/regex_engines/v3/google_re2.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/request_id/uuid/v3/uuid.pb.validate.go b/envoy/extensions/request_id/uuid/v3/uuid.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/resource_monitors/cgroup_memory/v3/cgroup_memory.pb.go b/envoy/extensions/resource_monitors/cgroup_memory/v3/cgroup_memory.pb.go
deleted file mode 100755
index 995d7924aa..0000000000
--- a/envoy/extensions/resource_monitors/cgroup_memory/v3/cgroup_memory.pb.go
+++ /dev/null
@@ -1,169 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        v5.29.3
-// source: envoy/extensions/resource_monitors/cgroup_memory/v3/cgroup_memory.proto
-
-package cgroup_memoryv3
-
-import (
-	_ "github.com/cncf/xds/go/udpa/annotations"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type CgroupMemoryConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Optional max memory limit in bytes used for memory pressure calculations.
-	// If set, this value is used as an upper bound on the memory limit, taking the minimum
-	// between this value and the system's cgroup memory limit. If not set, the system's
-	// cgroup memory limit is always used.
-	MaxMemoryBytes uint64 `protobuf:"varint,1,opt,name=max_memory_bytes,json=maxMemoryBytes,proto3" json:"max_memory_bytes,omitempty"`
-}
-
-func (x *CgroupMemoryConfig) Reset() {
-	*x = CgroupMemoryConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CgroupMemoryConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CgroupMemoryConfig) ProtoMessage() {}
-
-func (x *CgroupMemoryConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CgroupMemoryConfig.ProtoReflect.Descriptor instead.
-func (*CgroupMemoryConfig) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *CgroupMemoryConfig) GetMaxMemoryBytes() uint64 {
-	if x != nil {
-		return x.MaxMemoryBytes
-	}
-	return 0
-}
-
-var File_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto protoreflect.FileDescriptor
-
-var file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_rawDesc = []byte{
-	0x0a, 0x47, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x6f, 0x6e, 0x69,
-	0x74, 0x6f, 0x72, 0x73, 0x2f, 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x6d, 0x65, 0x6d, 0x6f,
-	0x72, 0x79, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x6d, 0x65, 0x6d,
-	0x6f, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x33, 0x65, 0x6e, 0x76, 0x6f, 0x79,
-	0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x72, 0x65, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x5f, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x73, 0x2e, 0x63, 0x67,
-	0x72, 0x6f, 0x75, 0x70, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x1a, 0x1d,
-	0x75, 0x64, 0x70, 0x61, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x2f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3e, 0x0a,
-	0x12, 0x43, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x12, 0x28, 0x0a, 0x10, 0x6d, 0x61, 0x78, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72,
-	0x79, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0e, 0x6d,
-	0x61, 0x78, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x42, 0x79, 0x74, 0x65, 0x73, 0x42, 0xcc, 0x01,
-	0xba, 0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x41, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78,
-	0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x5f, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x73, 0x2e, 0x63, 0x67, 0x72, 0x6f, 0x75,
-	0x70, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x2e, 0x76, 0x33, 0x42, 0x11, 0x43, 0x67, 0x72,
-	0x6f, 0x75, 0x70, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01,
-	0x5a, 0x6a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-	0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x5f, 0x6d, 0x6f, 0x6e, 0x69, 0x74, 0x6f, 0x72, 0x73, 0x2f, 0x63, 0x67, 0x72, 0x6f,
-	0x75, 0x70, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x2f, 0x76, 0x33, 0x3b, 0x63, 0x67, 0x72,
-	0x6f, 0x75, 0x70, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_rawDescOnce sync.Once
-	file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_rawDescData = file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_rawDesc
-)
-
-func file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_rawDescGZIP() []byte {
-	file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_rawDescOnce.Do(func() {
-		file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_rawDescData)
-	})
-	return file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_rawDescData
-}
-
-var file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_goTypes = []interface{}{
-	(*CgroupMemoryConfig)(nil), // 0: envoy.extensions.resource_monitors.cgroup_memory.v3.CgroupMemoryConfig
-}
-var file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_depIdxs = []int32{
-	0, // [0:0] is the sub-list for method output_type
-	0, // [0:0] is the sub-list for method input_type
-	0, // [0:0] is the sub-list for extension type_name
-	0, // [0:0] is the sub-list for extension extendee
-	0, // [0:0] is the sub-list for field type_name
-}
-
-func init() { file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_init() }
-func file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_init() {
-	if File_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CgroupMemoryConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_goTypes,
-		DependencyIndexes: file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_depIdxs,
-		MessageInfos:      file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_msgTypes,
-	}.Build()
-	File_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto = out.File
-	file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_rawDesc = nil
-	file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_goTypes = nil
-	file_envoy_extensions_resource_monitors_cgroup_memory_v3_cgroup_memory_proto_depIdxs = nil
-}
diff --git a/envoy/extensions/resource_monitors/cgroup_memory/v3/cgroup_memory.pb.validate.go b/envoy/extensions/resource_monitors/cgroup_memory/v3/cgroup_memory.pb.validate.go
deleted file mode 100755
index 3194a292a4..0000000000
--- a/envoy/extensions/resource_monitors/cgroup_memory/v3/cgroup_memory.pb.validate.go
+++ /dev/null
@@ -1,141 +0,0 @@
-//go:build !disable_pgv
-// Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: envoy/extensions/resource_monitors/cgroup_memory/v3/cgroup_memory.proto
-
-package cgroup_memoryv3
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"net"
-	"net/mail"
-	"net/url"
-	"regexp"
-	"sort"
-	"strings"
-	"time"
-	"unicode/utf8"
-
-	"google.golang.org/protobuf/types/known/anypb"
-)
-
-// ensure the imports are used
-var (
-	_ = bytes.MinRead
-	_ = errors.New("")
-	_ = fmt.Print
-	_ = utf8.UTFMax
-	_ = (*regexp.Regexp)(nil)
-	_ = (*strings.Reader)(nil)
-	_ = net.IPv4len
-	_ = time.Duration(0)
-	_ = (*url.URL)(nil)
-	_ = (*mail.Address)(nil)
-	_ = anypb.Any{}
-	_ = sort.Sort
-)
-
-// Validate checks the field values on CgroupMemoryConfig with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, the first error encountered is returned, or nil if there are no violations.
-func (m *CgroupMemoryConfig) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on CgroupMemoryConfig with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, the result is a list of violation errors wrapped in
-// CgroupMemoryConfigMultiError, or nil if none found.
-func (m *CgroupMemoryConfig) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *CgroupMemoryConfig) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	// no validation rules for MaxMemoryBytes
-
-	if len(errors) > 0 {
-		return CgroupMemoryConfigMultiError(errors)
-	}
-
-	return nil
-}
-
-// CgroupMemoryConfigMultiError is an error wrapping multiple validation errors
-// returned by CgroupMemoryConfig.ValidateAll() if the designated constraints
-// aren't met.
-type CgroupMemoryConfigMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m CgroupMemoryConfigMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m CgroupMemoryConfigMultiError) AllErrors() []error { return m }
-
-// CgroupMemoryConfigValidationError is the validation error returned by
-// CgroupMemoryConfig.Validate if the designated constraints aren't met.
-type CgroupMemoryConfigValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e CgroupMemoryConfigValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e CgroupMemoryConfigValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e CgroupMemoryConfigValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e CgroupMemoryConfigValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e CgroupMemoryConfigValidationError) ErrorName() string {
-	return "CgroupMemoryConfigValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e CgroupMemoryConfigValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sCgroupMemoryConfig.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = CgroupMemoryConfigValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = CgroupMemoryConfigValidationError{}
diff --git a/envoy/extensions/resource_monitors/cgroup_memory/v3/cgroup_memory_vtproto.pb.go b/envoy/extensions/resource_monitors/cgroup_memory/v3/cgroup_memory_vtproto.pb.go
deleted file mode 100755
index c4529ece3d..0000000000
--- a/envoy/extensions/resource_monitors/cgroup_memory/v3/cgroup_memory_vtproto.pb.go
+++ /dev/null
@@ -1,70 +0,0 @@
-//go:build vtprotobuf
-// +build vtprotobuf
-
-// Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// source: envoy/extensions/resource_monitors/cgroup_memory/v3/cgroup_memory.proto
-
-package cgroup_memoryv3
-
-import (
-	protohelpers "github.com/planetscale/vtprotobuf/protohelpers"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-func (m *CgroupMemoryConfig) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *CgroupMemoryConfig) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *CgroupMemoryConfig) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	if m.MaxMemoryBytes != 0 {
-		i = protohelpers.EncodeVarint(dAtA, i, uint64(m.MaxMemoryBytes))
-		i--
-		dAtA[i] = 0x8
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *CgroupMemoryConfig) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.MaxMemoryBytes != 0 {
-		n += 1 + protohelpers.SizeOfVarint(uint64(m.MaxMemoryBytes))
-	}
-	n += len(m.unknownFields)
-	return n
-}
diff --git a/envoy/extensions/resource_monitors/cpu_utilization/v3/cpu_utilization.pb.validate.go b/envoy/extensions/resource_monitors/cpu_utilization/v3/cpu_utilization.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/resource_monitors/downstream_connections/v3/downstream_connections.pb.validate.go b/envoy/extensions/resource_monitors/downstream_connections/v3/downstream_connections.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.validate.go b/envoy/extensions/resource_monitors/fixed_heap/v3/fixed_heap.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.validate.go b/envoy/extensions/resource_monitors/injected_resource/v3/injected_resource.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/retry/host/omit_canary_hosts/v3/omit_canary_hosts.pb.validate.go b/envoy/extensions/retry/host/omit_canary_hosts/v3/omit_canary_hosts.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/retry/host/omit_host_metadata/v3/omit_host_metadata_config.pb.validate.go b/envoy/extensions/retry/host/omit_host_metadata/v3/omit_host_metadata_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/retry/host/previous_hosts/v3/previous_hosts.pb.validate.go b/envoy/extensions/retry/host/previous_hosts/v3/previous_hosts.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/retry/priority/previous_priorities/v3/previous_priorities_config.pb.validate.go b/envoy/extensions/retry/priority/previous_priorities/v3/previous_priorities_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/router/cluster_specifiers/lua/v3/lua.pb.validate.go b/envoy/extensions/router/cluster_specifiers/lua/v3/lua.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/router/cluster_specifiers/matcher/v3/matcher.pb.validate.go b/envoy/extensions/router/cluster_specifiers/matcher/v3/matcher.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/stat_sinks/graphite_statsd/v3/graphite_statsd.pb.validate.go b/envoy/extensions/stat_sinks/graphite_statsd/v3/graphite_statsd.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/stat_sinks/open_telemetry/v3/open_telemetry.pb.validate.go b/envoy/extensions/stat_sinks/open_telemetry/v3/open_telemetry.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/stat_sinks/wasm/v3/wasm.pb.validate.go b/envoy/extensions/stat_sinks/wasm/v3/wasm.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/string_matcher/lua/v3/lua.pb.validate.go b/envoy/extensions/string_matcher/lua/v3/lua.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/tracers/fluentd/v3/fluentd.pb.validate.go b/envoy/extensions/tracers/fluentd/v3/fluentd.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/tracers/opentelemetry/resource_detectors/v3/dynatrace_resource_detector.pb.validate.go b/envoy/extensions/tracers/opentelemetry/resource_detectors/v3/dynatrace_resource_detector.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/tracers/opentelemetry/resource_detectors/v3/environment_resource_detector.pb.validate.go b/envoy/extensions/tracers/opentelemetry/resource_detectors/v3/environment_resource_detector.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/tracers/opentelemetry/resource_detectors/v3/static_config_resource_detector.pb.validate.go b/envoy/extensions/tracers/opentelemetry/resource_detectors/v3/static_config_resource_detector.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/tracers/opentelemetry/samplers/v3/always_on_sampler.pb.validate.go b/envoy/extensions/tracers/opentelemetry/samplers/v3/always_on_sampler.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/tracers/opentelemetry/samplers/v3/cel_sampler.pb.validate.go b/envoy/extensions/tracers/opentelemetry/samplers/v3/cel_sampler.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/tracers/opentelemetry/samplers/v3/dynatrace_sampler.pb.validate.go b/envoy/extensions/tracers/opentelemetry/samplers/v3/dynatrace_sampler.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/tracers/opentelemetry/samplers/v3/parent_based_sampler.pb.go b/envoy/extensions/tracers/opentelemetry/samplers/v3/parent_based_sampler.pb.go
deleted file mode 100755
index fcc7930234..0000000000
--- a/envoy/extensions/tracers/opentelemetry/samplers/v3/parent_based_sampler.pb.go
+++ /dev/null
@@ -1,180 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        v5.29.3
-// source: envoy/extensions/tracers/opentelemetry/samplers/v3/parent_based_sampler.proto
-
-package samplersv3
-
-import (
-	_ "github.com/cncf/xds/go/udpa/annotations"
-	v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type ParentBasedSamplerConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Specifies the sampler to be used by this sampler.
-	// The configured sampler will be used if the parent trace ID is not passed to Envoy
-	//
-	// required
-	// [#extension-category: envoy.tracers.opentelemetry.samplers]
-	WrappedSampler *v3.TypedExtensionConfig `protobuf:"bytes,1,opt,name=wrapped_sampler,json=wrappedSampler,proto3" json:"wrapped_sampler,omitempty"`
-}
-
-func (x *ParentBasedSamplerConfig) Reset() {
-	*x = ParentBasedSamplerConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ParentBasedSamplerConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ParentBasedSamplerConfig) ProtoMessage() {}
-
-func (x *ParentBasedSamplerConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use ParentBasedSamplerConfig.ProtoReflect.Descriptor instead.
-func (*ParentBasedSamplerConfig) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ParentBasedSamplerConfig) GetWrappedSampler() *v3.TypedExtensionConfig {
-	if x != nil {
-		return x.WrappedSampler
-	}
-	return nil
-}
-
-var File_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto protoreflect.FileDescriptor
-
-var file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_rawDesc = []byte{
-	0x0a, 0x4d, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x73, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x74,
-	0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x72,
-	0x73, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x62, 0x61, 0x73, 0x65,
-	0x64, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x32, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
-	0x73, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x73, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65,
-	0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x72, 0x73,
-	0x2e, 0x76, 0x33, 0x1a, 0x24, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f,
-	0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74,
-	0x75, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x6f, 0x0a, 0x18, 0x50, 0x61, 0x72, 0x65,
-	0x6e, 0x74, 0x42, 0x61, 0x73, 0x65, 0x64, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x72, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0x53, 0x0a, 0x0f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x64, 0x5f,
-	0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e,
-	0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x63, 0x6f, 0x72,
-	0x65, 0x2e, 0x76, 0x33, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0e, 0x77, 0x72, 0x61, 0x70, 0x70,
-	0x65, 0x64, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x72, 0x42, 0xcb, 0x01, 0xba, 0x80, 0xc8, 0xd1,
-	0x06, 0x02, 0x10, 0x02, 0x0a, 0x40, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72,
-	0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x73, 0x2e, 0x6f, 0x70, 0x65,
-	0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, 0x73, 0x61, 0x6d, 0x70, 0x6c,
-	0x65, 0x72, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x17, 0x50, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x42, 0x61,
-	0x73, 0x65, 0x64, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x64, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e,
-	0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74,
-	0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f,
-	0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65,
-	0x72, 0x73, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79,
-	0x2f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x72, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x73, 0x61, 0x6d,
-	0x70, 0x6c, 0x65, 0x72, 0x73, 0x76, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_rawDescOnce sync.Once
-	file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_rawDescData = file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_rawDesc
-)
-
-func file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_rawDescGZIP() []byte {
-	file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_rawDescOnce.Do(func() {
-		file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_rawDescData)
-	})
-	return file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_rawDescData
-}
-
-var file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_goTypes = []interface{}{
-	(*ParentBasedSamplerConfig)(nil), // 0: envoy.extensions.tracers.opentelemetry.samplers.v3.ParentBasedSamplerConfig
-	(*v3.TypedExtensionConfig)(nil),  // 1: envoy.config.core.v3.TypedExtensionConfig
-}
-var file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_depIdxs = []int32{
-	1, // 0: envoy.extensions.tracers.opentelemetry.samplers.v3.ParentBasedSamplerConfig.wrapped_sampler:type_name -> envoy.config.core.v3.TypedExtensionConfig
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
-}
-
-func init() {
-	file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_init()
-}
-func file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_init() {
-	if File_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParentBasedSamplerConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_goTypes,
-		DependencyIndexes: file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_depIdxs,
-		MessageInfos:      file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_msgTypes,
-	}.Build()
-	File_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto = out.File
-	file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_rawDesc = nil
-	file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_goTypes = nil
-	file_envoy_extensions_tracers_opentelemetry_samplers_v3_parent_based_sampler_proto_depIdxs = nil
-}
diff --git a/envoy/extensions/tracers/opentelemetry/samplers/v3/parent_based_sampler.pb.validate.go b/envoy/extensions/tracers/opentelemetry/samplers/v3/parent_based_sampler.pb.validate.go
deleted file mode 100755
index c6ea76bdd9..0000000000
--- a/envoy/extensions/tracers/opentelemetry/samplers/v3/parent_based_sampler.pb.validate.go
+++ /dev/null
@@ -1,168 +0,0 @@
-//go:build !disable_pgv
-// Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: envoy/extensions/tracers/opentelemetry/samplers/v3/parent_based_sampler.proto
-
-package samplersv3
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"net"
-	"net/mail"
-	"net/url"
-	"regexp"
-	"sort"
-	"strings"
-	"time"
-	"unicode/utf8"
-
-	"google.golang.org/protobuf/types/known/anypb"
-)
-
-// ensure the imports are used
-var (
-	_ = bytes.MinRead
-	_ = errors.New("")
-	_ = fmt.Print
-	_ = utf8.UTFMax
-	_ = (*regexp.Regexp)(nil)
-	_ = (*strings.Reader)(nil)
-	_ = net.IPv4len
-	_ = time.Duration(0)
-	_ = (*url.URL)(nil)
-	_ = (*mail.Address)(nil)
-	_ = anypb.Any{}
-	_ = sort.Sort
-)
-
-// Validate checks the field values on ParentBasedSamplerConfig with the rules
-// defined in the proto definition for this message. If any rules are
-// violated, the first error encountered is returned, or nil if there are no violations.
-func (m *ParentBasedSamplerConfig) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on ParentBasedSamplerConfig with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, the result is a list of violation errors wrapped in
-// ParentBasedSamplerConfigMultiError, or nil if none found.
-func (m *ParentBasedSamplerConfig) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *ParentBasedSamplerConfig) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if all {
-		switch v := interface{}(m.GetWrappedSampler()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, ParentBasedSamplerConfigValidationError{
-					field:  "WrappedSampler",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, ParentBasedSamplerConfigValidationError{
-					field:  "WrappedSampler",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetWrappedSampler()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return ParentBasedSamplerConfigValidationError{
-				field:  "WrappedSampler",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if len(errors) > 0 {
-		return ParentBasedSamplerConfigMultiError(errors)
-	}
-
-	return nil
-}
-
-// ParentBasedSamplerConfigMultiError is an error wrapping multiple validation
-// errors returned by ParentBasedSamplerConfig.ValidateAll() if the designated
-// constraints aren't met.
-type ParentBasedSamplerConfigMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m ParentBasedSamplerConfigMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m ParentBasedSamplerConfigMultiError) AllErrors() []error { return m }
-
-// ParentBasedSamplerConfigValidationError is the validation error returned by
-// ParentBasedSamplerConfig.Validate if the designated constraints aren't met.
-type ParentBasedSamplerConfigValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e ParentBasedSamplerConfigValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e ParentBasedSamplerConfigValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e ParentBasedSamplerConfigValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e ParentBasedSamplerConfigValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e ParentBasedSamplerConfigValidationError) ErrorName() string {
-	return "ParentBasedSamplerConfigValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e ParentBasedSamplerConfigValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sParentBasedSamplerConfig.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = ParentBasedSamplerConfigValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = ParentBasedSamplerConfigValidationError{}
diff --git a/envoy/extensions/tracers/opentelemetry/samplers/v3/parent_based_sampler_vtproto.pb.go b/envoy/extensions/tracers/opentelemetry/samplers/v3/parent_based_sampler_vtproto.pb.go
deleted file mode 100755
index 3b82c84eca..0000000000
--- a/envoy/extensions/tracers/opentelemetry/samplers/v3/parent_based_sampler_vtproto.pb.go
+++ /dev/null
@@ -1,95 +0,0 @@
-//go:build vtprotobuf
-// +build vtprotobuf
-
-// Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// source: envoy/extensions/tracers/opentelemetry/samplers/v3/parent_based_sampler.proto
-
-package samplersv3
-
-import (
-	protohelpers "github.com/planetscale/vtprotobuf/protohelpers"
-	proto "google.golang.org/protobuf/proto"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-func (m *ParentBasedSamplerConfig) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *ParentBasedSamplerConfig) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *ParentBasedSamplerConfig) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	if m.WrappedSampler != nil {
-		if vtmsg, ok := interface{}(m.WrappedSampler).(interface {
-			MarshalToSizedBufferVTStrict([]byte) (int, error)
-		}); ok {
-			size, err := vtmsg.MarshalToSizedBufferVTStrict(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		} else {
-			encoded, err := proto.Marshal(m.WrappedSampler)
-			if err != nil {
-				return 0, err
-			}
-			i -= len(encoded)
-			copy(dAtA[i:], encoded)
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(len(encoded)))
-		}
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *ParentBasedSamplerConfig) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.WrappedSampler != nil {
-		if size, ok := interface{}(m.WrappedSampler).(interface {
-			SizeVT() int
-		}); ok {
-			l = size.SizeVT()
-		} else {
-			l = proto.Size(m.WrappedSampler)
-		}
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	n += len(m.unknownFields)
-	return n
-}
diff --git a/envoy/extensions/tracers/opentelemetry/samplers/v3/trace_id_ratio_based_sampler.pb.go b/envoy/extensions/tracers/opentelemetry/samplers/v3/trace_id_ratio_based_sampler.pb.go
deleted file mode 100755
index cf48afe810..0000000000
--- a/envoy/extensions/tracers/opentelemetry/samplers/v3/trace_id_ratio_based_sampler.pb.go
+++ /dev/null
@@ -1,180 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        v5.29.3
-// source: envoy/extensions/tracers/opentelemetry/samplers/v3/trace_id_ratio_based_sampler.proto
-
-package samplersv3
-
-import (
-	_ "github.com/cncf/xds/go/udpa/annotations"
-	v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3"
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type TraceIdRatioBasedSamplerConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// If the given trace_id falls into a given percentage of all possible
-	// trace_id values, ShouldSample will return RECORD_AND_SAMPLE.
-	// required
-	// [#extension-category: envoy.tracers.opentelemetry.samplers]
-	SamplingPercentage *v3.FractionalPercent `protobuf:"bytes,1,opt,name=sampling_percentage,json=samplingPercentage,proto3" json:"sampling_percentage,omitempty"`
-}
-
-func (x *TraceIdRatioBasedSamplerConfig) Reset() {
-	*x = TraceIdRatioBasedSamplerConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *TraceIdRatioBasedSamplerConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*TraceIdRatioBasedSamplerConfig) ProtoMessage() {}
-
-func (x *TraceIdRatioBasedSamplerConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use TraceIdRatioBasedSamplerConfig.ProtoReflect.Descriptor instead.
-func (*TraceIdRatioBasedSamplerConfig) Descriptor() ([]byte, []int) {
-	return file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *TraceIdRatioBasedSamplerConfig) GetSamplingPercentage() *v3.FractionalPercent {
-	if x != nil {
-		return x.SamplingPercentage
-	}
-	return nil
-}
-
-var File_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto protoreflect.FileDescriptor
-
-var file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_rawDesc = []byte{
-	0x0a, 0x55, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f,
-	0x6e, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x73, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x74,
-	0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x72,
-	0x73, 0x2f, 0x76, 0x33, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x5f, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x5f, 0x62, 0x61, 0x73, 0x65, 0x64, 0x5f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65,
-	0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x32, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65,
-	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72,
-	0x73, 0x2e, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e,
-	0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x72, 0x73, 0x2e, 0x76, 0x33, 0x1a, 0x1b, 0x65, 0x6e, 0x76,
-	0x6f, 0x79, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x2f, 0x76, 0x33, 0x2f, 0x70, 0x65, 0x72, 0x63, 0x65,
-	0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x75, 0x64, 0x70, 0x61, 0x2f, 0x61,
-	0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x75,
-	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x73, 0x0a, 0x1e, 0x54, 0x72, 0x61, 0x63, 0x65,
-	0x49, 0x64, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x64, 0x53, 0x61, 0x6d, 0x70,
-	0x6c, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x51, 0x0a, 0x13, 0x73, 0x61, 0x6d,
-	0x70, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x61, 0x67, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x74,
-	0x79, 0x70, 0x65, 0x2e, 0x76, 0x33, 0x2e, 0x46, 0x72, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x61,
-	0x6c, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x52, 0x12, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x69,
-	0x6e, 0x67, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x61, 0x67, 0x65, 0x42, 0xd1, 0x01, 0xba,
-	0x80, 0xc8, 0xd1, 0x06, 0x02, 0x10, 0x02, 0x0a, 0x40, 0x69, 0x6f, 0x2e, 0x65, 0x6e, 0x76, 0x6f,
-	0x79, 0x70, 0x72, 0x6f, 0x78, 0x79, 0x2e, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2e, 0x65, 0x78, 0x74,
-	0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x73, 0x2e,
-	0x6f, 0x70, 0x65, 0x6e, 0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2e, 0x73, 0x61,
-	0x6d, 0x70, 0x6c, 0x65, 0x72, 0x73, 0x2e, 0x76, 0x33, 0x42, 0x1d, 0x54, 0x72, 0x61, 0x63, 0x65,
-	0x49, 0x64, 0x52, 0x61, 0x74, 0x69, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x64, 0x53, 0x61, 0x6d, 0x70,
-	0x6c, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x64, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x70, 0x72, 0x6f, 0x78,
-	0x79, 0x2f, 0x67, 0x6f, 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2d, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2f, 0x65, 0x6e, 0x76, 0x6f, 0x79, 0x2f, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
-	0x6f, 0x6e, 0x73, 0x2f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x72, 0x73, 0x2f, 0x6f, 0x70, 0x65, 0x6e,
-	0x74, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x2f, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65,
-	0x72, 0x73, 0x2f, 0x76, 0x33, 0x3b, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x72, 0x73, 0x76, 0x33,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_rawDescOnce sync.Once
-	file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_rawDescData = file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_rawDesc
-)
-
-func file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_rawDescGZIP() []byte {
-	file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_rawDescOnce.Do(func() {
-		file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_rawDescData = protoimpl.X.CompressGZIP(file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_rawDescData)
-	})
-	return file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_rawDescData
-}
-
-var file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_goTypes = []interface{}{
-	(*TraceIdRatioBasedSamplerConfig)(nil), // 0: envoy.extensions.tracers.opentelemetry.samplers.v3.TraceIdRatioBasedSamplerConfig
-	(*v3.FractionalPercent)(nil),           // 1: envoy.type.v3.FractionalPercent
-}
-var file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_depIdxs = []int32{
-	1, // 0: envoy.extensions.tracers.opentelemetry.samplers.v3.TraceIdRatioBasedSamplerConfig.sampling_percentage:type_name -> envoy.type.v3.FractionalPercent
-	1, // [1:1] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
-}
-
-func init() {
-	file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_init()
-}
-func file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_init() {
-	if File_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*TraceIdRatioBasedSamplerConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_goTypes,
-		DependencyIndexes: file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_depIdxs,
-		MessageInfos:      file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_msgTypes,
-	}.Build()
-	File_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto = out.File
-	file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_rawDesc = nil
-	file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_goTypes = nil
-	file_envoy_extensions_tracers_opentelemetry_samplers_v3_trace_id_ratio_based_sampler_proto_depIdxs = nil
-}
diff --git a/envoy/extensions/tracers/opentelemetry/samplers/v3/trace_id_ratio_based_sampler.pb.validate.go b/envoy/extensions/tracers/opentelemetry/samplers/v3/trace_id_ratio_based_sampler.pb.validate.go
deleted file mode 100755
index 2b5ff2be81..0000000000
--- a/envoy/extensions/tracers/opentelemetry/samplers/v3/trace_id_ratio_based_sampler.pb.validate.go
+++ /dev/null
@@ -1,169 +0,0 @@
-//go:build !disable_pgv
-// Code generated by protoc-gen-validate. DO NOT EDIT.
-// source: envoy/extensions/tracers/opentelemetry/samplers/v3/trace_id_ratio_based_sampler.proto
-
-package samplersv3
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"net"
-	"net/mail"
-	"net/url"
-	"regexp"
-	"sort"
-	"strings"
-	"time"
-	"unicode/utf8"
-
-	"google.golang.org/protobuf/types/known/anypb"
-)
-
-// ensure the imports are used
-var (
-	_ = bytes.MinRead
-	_ = errors.New("")
-	_ = fmt.Print
-	_ = utf8.UTFMax
-	_ = (*regexp.Regexp)(nil)
-	_ = (*strings.Reader)(nil)
-	_ = net.IPv4len
-	_ = time.Duration(0)
-	_ = (*url.URL)(nil)
-	_ = (*mail.Address)(nil)
-	_ = anypb.Any{}
-	_ = sort.Sort
-)
-
-// Validate checks the field values on TraceIdRatioBasedSamplerConfig with the
-// rules defined in the proto definition for this message. If any rules are
-// violated, the first error encountered is returned, or nil if there are no violations.
-func (m *TraceIdRatioBasedSamplerConfig) Validate() error {
-	return m.validate(false)
-}
-
-// ValidateAll checks the field values on TraceIdRatioBasedSamplerConfig with
-// the rules defined in the proto definition for this message. If any rules
-// are violated, the result is a list of violation errors wrapped in
-// TraceIdRatioBasedSamplerConfigMultiError, or nil if none found.
-func (m *TraceIdRatioBasedSamplerConfig) ValidateAll() error {
-	return m.validate(true)
-}
-
-func (m *TraceIdRatioBasedSamplerConfig) validate(all bool) error {
-	if m == nil {
-		return nil
-	}
-
-	var errors []error
-
-	if all {
-		switch v := interface{}(m.GetSamplingPercentage()).(type) {
-		case interface{ ValidateAll() error }:
-			if err := v.ValidateAll(); err != nil {
-				errors = append(errors, TraceIdRatioBasedSamplerConfigValidationError{
-					field:  "SamplingPercentage",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		case interface{ Validate() error }:
-			if err := v.Validate(); err != nil {
-				errors = append(errors, TraceIdRatioBasedSamplerConfigValidationError{
-					field:  "SamplingPercentage",
-					reason: "embedded message failed validation",
-					cause:  err,
-				})
-			}
-		}
-	} else if v, ok := interface{}(m.GetSamplingPercentage()).(interface{ Validate() error }); ok {
-		if err := v.Validate(); err != nil {
-			return TraceIdRatioBasedSamplerConfigValidationError{
-				field:  "SamplingPercentage",
-				reason: "embedded message failed validation",
-				cause:  err,
-			}
-		}
-	}
-
-	if len(errors) > 0 {
-		return TraceIdRatioBasedSamplerConfigMultiError(errors)
-	}
-
-	return nil
-}
-
-// TraceIdRatioBasedSamplerConfigMultiError is an error wrapping multiple
-// validation errors returned by TraceIdRatioBasedSamplerConfig.ValidateAll()
-// if the designated constraints aren't met.
-type TraceIdRatioBasedSamplerConfigMultiError []error
-
-// Error returns a concatenation of all the error messages it wraps.
-func (m TraceIdRatioBasedSamplerConfigMultiError) Error() string {
-	var msgs []string
-	for _, err := range m {
-		msgs = append(msgs, err.Error())
-	}
-	return strings.Join(msgs, "; ")
-}
-
-// AllErrors returns a list of validation violation errors.
-func (m TraceIdRatioBasedSamplerConfigMultiError) AllErrors() []error { return m }
-
-// TraceIdRatioBasedSamplerConfigValidationError is the validation error
-// returned by TraceIdRatioBasedSamplerConfig.Validate if the designated
-// constraints aren't met.
-type TraceIdRatioBasedSamplerConfigValidationError struct {
-	field  string
-	reason string
-	cause  error
-	key    bool
-}
-
-// Field function returns field value.
-func (e TraceIdRatioBasedSamplerConfigValidationError) Field() string { return e.field }
-
-// Reason function returns reason value.
-func (e TraceIdRatioBasedSamplerConfigValidationError) Reason() string { return e.reason }
-
-// Cause function returns cause value.
-func (e TraceIdRatioBasedSamplerConfigValidationError) Cause() error { return e.cause }
-
-// Key function returns key value.
-func (e TraceIdRatioBasedSamplerConfigValidationError) Key() bool { return e.key }
-
-// ErrorName returns error name.
-func (e TraceIdRatioBasedSamplerConfigValidationError) ErrorName() string {
-	return "TraceIdRatioBasedSamplerConfigValidationError"
-}
-
-// Error satisfies the builtin error interface
-func (e TraceIdRatioBasedSamplerConfigValidationError) Error() string {
-	cause := ""
-	if e.cause != nil {
-		cause = fmt.Sprintf(" | caused by: %v", e.cause)
-	}
-
-	key := ""
-	if e.key {
-		key = "key for "
-	}
-
-	return fmt.Sprintf(
-		"invalid %sTraceIdRatioBasedSamplerConfig.%s: %s%s",
-		key,
-		e.field,
-		e.reason,
-		cause)
-}
-
-var _ error = TraceIdRatioBasedSamplerConfigValidationError{}
-
-var _ interface {
-	Field() string
-	Reason() string
-	Key() bool
-	Cause() error
-	ErrorName() string
-} = TraceIdRatioBasedSamplerConfigValidationError{}
diff --git a/envoy/extensions/tracers/opentelemetry/samplers/v3/trace_id_ratio_based_sampler_vtproto.pb.go b/envoy/extensions/tracers/opentelemetry/samplers/v3/trace_id_ratio_based_sampler_vtproto.pb.go
deleted file mode 100755
index d47aed406c..0000000000
--- a/envoy/extensions/tracers/opentelemetry/samplers/v3/trace_id_ratio_based_sampler_vtproto.pb.go
+++ /dev/null
@@ -1,95 +0,0 @@
-//go:build vtprotobuf
-// +build vtprotobuf
-
-// Code generated by protoc-gen-go-vtproto. DO NOT EDIT.
-// source: envoy/extensions/tracers/opentelemetry/samplers/v3/trace_id_ratio_based_sampler.proto
-
-package samplersv3
-
-import (
-	protohelpers "github.com/planetscale/vtprotobuf/protohelpers"
-	proto "google.golang.org/protobuf/proto"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-func (m *TraceIdRatioBasedSamplerConfig) MarshalVTStrict() (dAtA []byte, err error) {
-	if m == nil {
-		return nil, nil
-	}
-	size := m.SizeVT()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBufferVTStrict(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *TraceIdRatioBasedSamplerConfig) MarshalToVTStrict(dAtA []byte) (int, error) {
-	size := m.SizeVT()
-	return m.MarshalToSizedBufferVTStrict(dAtA[:size])
-}
-
-func (m *TraceIdRatioBasedSamplerConfig) MarshalToSizedBufferVTStrict(dAtA []byte) (int, error) {
-	if m == nil {
-		return 0, nil
-	}
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if m.unknownFields != nil {
-		i -= len(m.unknownFields)
-		copy(dAtA[i:], m.unknownFields)
-	}
-	if m.SamplingPercentage != nil {
-		if vtmsg, ok := interface{}(m.SamplingPercentage).(interface {
-			MarshalToSizedBufferVTStrict([]byte) (int, error)
-		}); ok {
-			size, err := vtmsg.MarshalToSizedBufferVTStrict(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(size))
-		} else {
-			encoded, err := proto.Marshal(m.SamplingPercentage)
-			if err != nil {
-				return 0, err
-			}
-			i -= len(encoded)
-			copy(dAtA[i:], encoded)
-			i = protohelpers.EncodeVarint(dAtA, i, uint64(len(encoded)))
-		}
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *TraceIdRatioBasedSamplerConfig) SizeVT() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.SamplingPercentage != nil {
-		if size, ok := interface{}(m.SamplingPercentage).(interface {
-			SizeVT() int
-		}); ok {
-			l = size.SizeVT()
-		} else {
-			l = proto.Size(m.SamplingPercentage)
-		}
-		n += 1 + l + protohelpers.SizeOfVarint(uint64(l))
-	}
-	n += len(m.unknownFields)
-	return n
-}
diff --git a/envoy/extensions/transport_sockets/alts/v3/alts.pb.validate.go b/envoy/extensions/transport_sockets/alts/v3/alts.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.pb.validate.go b/envoy/extensions/transport_sockets/http_11_proxy/v3/upstream_http_11_connect.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/transport_sockets/internal_upstream/v3/internal_upstream.pb.validate.go b/envoy/extensions/transport_sockets/internal_upstream/v3/internal_upstream.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/transport_sockets/proxy_protocol/v3/upstream_proxy_protocol.pb.validate.go b/envoy/extensions/transport_sockets/proxy_protocol/v3/upstream_proxy_protocol.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/transport_sockets/quic/v3/quic_transport.pb.validate.go b/envoy/extensions/transport_sockets/quic/v3/quic_transport.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/transport_sockets/raw_buffer/v3/raw_buffer.pb.validate.go b/envoy/extensions/transport_sockets/raw_buffer/v3/raw_buffer.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/transport_sockets/s2a/v3/s2a.pb.validate.go b/envoy/extensions/transport_sockets/s2a/v3/s2a.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/transport_sockets/starttls/v3/starttls.pb.validate.go b/envoy/extensions/transport_sockets/starttls/v3/starttls.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/transport_sockets/tap/v3/tap.pb.validate.go b/envoy/extensions/transport_sockets/tap/v3/tap.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/transport_sockets/tcp_stats/v3/tcp_stats.pb.validate.go b/envoy/extensions/transport_sockets/tcp_stats/v3/tcp_stats.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/transport_sockets/tls/v3/cert.pb.validate.go b/envoy/extensions/transport_sockets/tls/v3/cert.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/transport_sockets/tls/v3/common.pb.validate.go b/envoy/extensions/transport_sockets/tls/v3/common.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/transport_sockets/tls/v3/secret.pb.validate.go b/envoy/extensions/transport_sockets/tls/v3/secret.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/transport_sockets/tls/v3/tls.pb.validate.go b/envoy/extensions/transport_sockets/tls/v3/tls.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.pb.validate.go b/envoy/extensions/transport_sockets/tls/v3/tls_spiffe_validator_config.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/udp_packet_writer/v3/udp_default_writer_factory.pb.validate.go b/envoy/extensions/udp_packet_writer/v3/udp_default_writer_factory.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/udp_packet_writer/v3/udp_gso_batch_writer_factory.pb.validate.go b/envoy/extensions/udp_packet_writer/v3/udp_gso_batch_writer_factory.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/upstreams/http/generic/v3/generic_connection_pool.pb.validate.go b/envoy/extensions/upstreams/http/generic/v3/generic_connection_pool.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/upstreams/http/http/v3/http_connection_pool.pb.validate.go b/envoy/extensions/upstreams/http/http/v3/http_connection_pool.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/upstreams/http/tcp/v3/tcp_connection_pool.pb.validate.go b/envoy/extensions/upstreams/http/tcp/v3/tcp_connection_pool.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/upstreams/http/udp/v3/udp_connection_pool.pb.validate.go b/envoy/extensions/upstreams/http/udp/v3/udp_connection_pool.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/upstreams/http/v3/http_protocol_options.pb.validate.go b/envoy/extensions/upstreams/http/v3/http_protocol_options.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/upstreams/tcp/generic/v3/generic_connection_pool.pb.validate.go b/envoy/extensions/upstreams/tcp/generic/v3/generic_connection_pool.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/upstreams/tcp/v3/tcp_protocol_options.pb.validate.go b/envoy/extensions/upstreams/tcp/v3/tcp_protocol_options.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/wasm/v3/wasm.pb.validate.go b/envoy/extensions/wasm/v3/wasm.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/extensions/watchdog/profile_action/v3/profile_action.pb.validate.go b/envoy/extensions/watchdog/profile_action/v3/profile_action.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/accesslog/v2/als.pb.validate.go b/envoy/service/accesslog/v2/als.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/accesslog/v3/als.pb.validate.go b/envoy/service/accesslog/v3/als.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/auth/v2/attribute_context.pb.validate.go b/envoy/service/auth/v2/attribute_context.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/auth/v2/external_auth.pb.validate.go b/envoy/service/auth/v2/external_auth.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/auth/v2alpha/external_auth.pb.validate.go b/envoy/service/auth/v2alpha/external_auth.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/auth/v3/attribute_context.pb.validate.go b/envoy/service/auth/v3/attribute_context.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/auth/v3/external_auth.pb.validate.go b/envoy/service/auth/v3/external_auth.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/cluster/v3/cds.pb.validate.go b/envoy/service/cluster/v3/cds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/discovery/v2/ads.pb.validate.go b/envoy/service/discovery/v2/ads.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/discovery/v2/hds.pb.validate.go b/envoy/service/discovery/v2/hds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/discovery/v2/rtds.pb.validate.go b/envoy/service/discovery/v2/rtds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/discovery/v2/sds.pb.validate.go b/envoy/service/discovery/v2/sds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/discovery/v3/ads.pb.validate.go b/envoy/service/discovery/v3/ads.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/discovery/v3/discovery.pb.validate.go b/envoy/service/discovery/v3/discovery.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/endpoint/v3/eds.pb.validate.go b/envoy/service/endpoint/v3/eds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/endpoint/v3/leds.pb.validate.go b/envoy/service/endpoint/v3/leds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/event_reporting/v2alpha/event_reporting_service.pb.validate.go b/envoy/service/event_reporting/v2alpha/event_reporting_service.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/event_reporting/v3/event_reporting_service.pb.validate.go b/envoy/service/event_reporting/v3/event_reporting_service.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/ext_proc/v3/external_processor.pb.validate.go b/envoy/service/ext_proc/v3/external_processor.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/extension/v3/config_discovery.pb.validate.go b/envoy/service/extension/v3/config_discovery.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/health/v3/hds.pb.validate.go b/envoy/service/health/v3/hds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/listener/v3/lds.pb.validate.go b/envoy/service/listener/v3/lds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/load_stats/v2/lrs.pb.validate.go b/envoy/service/load_stats/v2/lrs.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/load_stats/v3/lrs.pb.validate.go b/envoy/service/load_stats/v3/lrs.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/metrics/v2/metrics_service.pb.validate.go b/envoy/service/metrics/v2/metrics_service.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/metrics/v3/metrics_service.pb.validate.go b/envoy/service/metrics/v3/metrics_service.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/network_ext_proc/v3/network_external_processor.pb.validate.go b/envoy/service/network_ext_proc/v3/network_external_processor.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/rate_limit_quota/v3/rlqs.pb.validate.go b/envoy/service/rate_limit_quota/v3/rlqs.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/ratelimit/v2/rls.pb.validate.go b/envoy/service/ratelimit/v2/rls.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/ratelimit/v3/rls.pb.validate.go b/envoy/service/ratelimit/v3/rls.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/redis_auth/v3/redis_external_auth.pb.validate.go b/envoy/service/redis_auth/v3/redis_external_auth.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/route/v3/rds.pb.validate.go b/envoy/service/route/v3/rds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/route/v3/srds.pb.validate.go b/envoy/service/route/v3/srds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/runtime/v3/rtds.pb.validate.go b/envoy/service/runtime/v3/rtds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/secret/v3/sds.pb.validate.go b/envoy/service/secret/v3/sds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/status/v2/csds.pb.validate.go b/envoy/service/status/v2/csds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/status/v3/csds.pb.validate.go b/envoy/service/status/v3/csds.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/tap/v2alpha/common.pb.validate.go b/envoy/service/tap/v2alpha/common.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/tap/v2alpha/tap.pb.validate.go b/envoy/service/tap/v2alpha/tap.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/service/tap/v3/tap.pb.validate.go b/envoy/service/tap/v3/tap.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/hash_policy.pb.validate.go b/envoy/type/hash_policy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/http.pb.validate.go b/envoy/type/http.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/http/v3/cookie.pb.validate.go b/envoy/type/http/v3/cookie.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/http/v3/path_transformation.pb.validate.go b/envoy/type/http/v3/path_transformation.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/http_status.pb.validate.go b/envoy/type/http_status.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/metadata.pb.validate.go b/envoy/type/matcher/metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/node.pb.validate.go b/envoy/type/matcher/node.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/number.pb.validate.go b/envoy/type/matcher/number.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/path.pb.validate.go b/envoy/type/matcher/path.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/regex.pb.validate.go b/envoy/type/matcher/regex.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/string.pb.validate.go b/envoy/type/matcher/string.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/struct.pb.validate.go b/envoy/type/matcher/struct.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/v3/address.pb.validate.go b/envoy/type/matcher/v3/address.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/v3/filter_state.pb.validate.go b/envoy/type/matcher/v3/filter_state.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/v3/http_inputs.pb.validate.go b/envoy/type/matcher/v3/http_inputs.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/v3/metadata.pb.validate.go b/envoy/type/matcher/v3/metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/v3/node.pb.validate.go b/envoy/type/matcher/v3/node.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/v3/number.pb.validate.go b/envoy/type/matcher/v3/number.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/v3/path.pb.validate.go b/envoy/type/matcher/v3/path.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/v3/regex.pb.validate.go b/envoy/type/matcher/v3/regex.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/v3/status_code_input.pb.validate.go b/envoy/type/matcher/v3/status_code_input.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/v3/string.pb.validate.go b/envoy/type/matcher/v3/string.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/v3/struct.pb.validate.go b/envoy/type/matcher/v3/struct.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/v3/value.pb.validate.go b/envoy/type/matcher/v3/value.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/matcher/value.pb.validate.go b/envoy/type/matcher/value.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/metadata/v2/metadata.pb.validate.go b/envoy/type/metadata/v2/metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/metadata/v3/metadata.pb.validate.go b/envoy/type/metadata/v3/metadata.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/percent.pb.validate.go b/envoy/type/percent.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/range.pb.validate.go b/envoy/type/range.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/semantic_version.pb.validate.go b/envoy/type/semantic_version.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/token_bucket.pb.validate.go b/envoy/type/token_bucket.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/tracing/v2/custom_tag.pb.validate.go b/envoy/type/tracing/v2/custom_tag.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/tracing/v3/custom_tag.pb.validate.go b/envoy/type/tracing/v3/custom_tag.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/v3/hash_policy.pb.validate.go b/envoy/type/v3/hash_policy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/v3/http.pb.validate.go b/envoy/type/v3/http.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/v3/http_status.pb.validate.go b/envoy/type/v3/http_status.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/v3/percent.pb.validate.go b/envoy/type/v3/percent.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/v3/range.pb.validate.go b/envoy/type/v3/range.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/v3/ratelimit_strategy.pb.validate.go b/envoy/type/v3/ratelimit_strategy.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/v3/ratelimit_unit.pb.validate.go b/envoy/type/v3/ratelimit_unit.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/v3/semantic_version.pb.validate.go b/envoy/type/v3/semantic_version.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/type/v3/token_bucket.pb.validate.go b/envoy/type/v3/token_bucket.pb.validate.go
old mode 100755
new mode 100644
diff --git a/envoy/watchdog/v3/abort_action.pb.validate.go b/envoy/watchdog/v3/abort_action.pb.validate.go
old mode 100755
new mode 100644