diff --git a/api/envoy/config/cluster/v4alpha/BUILD b/api/envoy/config/cluster/v4alpha/BUILD
index 02eb1b1917251..b5db8055b8d1e 100644
--- a/api/envoy/config/cluster/v4alpha/BUILD
+++ b/api/envoy/config/cluster/v4alpha/BUILD
@@ -8,7 +8,7 @@ api_proto_package(
     deps = [
         "//envoy/config/cluster/v3:pkg",
         "//envoy/config/core/v4alpha:pkg",
-        "//envoy/config/endpoint/v3:pkg",
+        "//envoy/config/endpoint/v4alpha:pkg",
         "//envoy/type/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
         "@com_github_cncf_udpa//xds/core/v3:pkg",
diff --git a/api/envoy/config/cluster/v4alpha/cluster.proto b/api/envoy/config/cluster/v4alpha/cluster.proto
index ebd007bca5780..9b367fe22067d 100644
--- a/api/envoy/config/cluster/v4alpha/cluster.proto
+++ b/api/envoy/config/cluster/v4alpha/cluster.proto
@@ -11,7 +11,7 @@ import "envoy/config/core/v4alpha/config_source.proto";
 import "envoy/config/core/v4alpha/extension.proto";
 import "envoy/config/core/v4alpha/health_check.proto";
 import "envoy/config/core/v4alpha/resolver.proto";
-import "envoy/config/endpoint/v3/endpoint.proto";
+import "envoy/config/endpoint/v4alpha/endpoint.proto";
 import "envoy/type/v3/percent.proto";
 
 import "google/protobuf/any.proto";
@@ -744,7 +744,7 @@ message Cluster {
   //   Setting this allows non-EDS cluster types to contain embedded EDS equivalent
   //   :ref:`endpoint assignments<envoy_v3_api_msg_config.endpoint.v3.ClusterLoadAssignment>`.
   //
-  endpoint.v3.ClusterLoadAssignment load_assignment = 33;
+  endpoint.v4alpha.ClusterLoadAssignment load_assignment = 33;
 
   // Optional :ref:`active health checking <arch_overview_health_checking>`
   // configuration for the cluster. If no
diff --git a/api/envoy/config/endpoint/v3/endpoint_components.proto b/api/envoy/config/endpoint/v3/endpoint_components.proto
index 0e10ac3b2fca7..f7a374cc1d8d7 100644
--- a/api/envoy/config/endpoint/v3/endpoint_components.proto
+++ b/api/envoy/config/endpoint/v3/endpoint_components.proto
@@ -4,10 +4,12 @@ package envoy.config.endpoint.v3;
 
 import "envoy/config/core/v3/address.proto";
 import "envoy/config/core/v3/base.proto";
+import "envoy/config/core/v3/config_source.proto";
 import "envoy/config/core/v3/health_check.proto";
 
 import "google/protobuf/wrappers.proto";
 
+import "udpa/annotations/migrate.proto";
 import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
 import "validate/validate.proto";
@@ -108,21 +110,51 @@ message LbEndpoint {
   google.protobuf.UInt32Value load_balancing_weight = 4 [(validate.rules).uint32 = {gte: 1}];
 }
 
+// [#not-implemented-hide:]
+// A configuration for a LEDS collection.
+message LedsClusterLocalityConfig {
+  // Configuration for the source of LEDS updates for a Locality.
+  core.v3.ConfigSource leds_config = 1;
+
+  // The xDS transport protocol glob collection resource name.
+  // The service is only supported in delta xDS (incremental) mode.
+  string leds_collection_name = 2;
+}
+
 // A group of endpoints belonging to a Locality.
 // One can have multiple LocalityLbEndpoints for a locality, but this is
 // generally only done if the different groups need to have different load
 // balancing weights or different priorities.
-// [#next-free-field: 7]
+// [#next-free-field: 9]
 message LocalityLbEndpoints {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.api.v2.endpoint.LocalityLbEndpoints";
 
+  // [#not-implemented-hide:]
+  // A list of endpoints of a specific locality.
+  message LbEndpointList {
+    repeated LbEndpoint lb_endpoints = 1;
+  }
+
   // Identifies location of where the upstream hosts run.
   core.v3.Locality locality = 1;
 
   // The group of endpoints belonging to the locality specified.
+  // [#comment:TODO(adisuissa): Once LEDS is implemented this field needs to be
+  // deprecated and replaced by *lb_endpoints_list*.]
   repeated LbEndpoint lb_endpoints = 2;
 
+  // [#not-implemented-hide:]
+  oneof lb_config {
+    // The group of endpoints belonging to the locality.
+    // [#comment:TODO(adisuissa): Once LEDS is implemented the *lb_endpoints* field
+    // needs to be deprecated.]
+    LbEndpointList lb_endpoints_list = 7;
+
+    // LEDS Configuration for the current locality.
+    LedsClusterLocalityConfig leds_cluster_locality_config = 8;
+  }
+
   // Optional: Per priority/region/zone/sub_zone weight; at least 1. The load
   // balancing weight for a locality is divided by the sum of the weights of all
   // localities  at the same priority level to produce the effective percentage
diff --git a/api/envoy/config/endpoint/v4alpha/BUILD b/api/envoy/config/endpoint/v4alpha/BUILD
new file mode 100644
index 0000000000000..79d52ad4cfbc6
--- /dev/null
+++ b/api/envoy/config/endpoint/v4alpha/BUILD
@@ -0,0 +1,14 @@
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
+
+load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
+
+licenses(["notice"])  # Apache 2
+
+api_proto_package(
+    deps = [
+        "//envoy/config/core/v4alpha:pkg",
+        "//envoy/config/endpoint/v3:pkg",
+        "//envoy/type/v3:pkg",
+        "@com_github_cncf_udpa//udpa/annotations:pkg",
+    ],
+)
diff --git a/api/envoy/config/endpoint/v4alpha/endpoint.proto b/api/envoy/config/endpoint/v4alpha/endpoint.proto
new file mode 100644
index 0000000000000..6c87e8ffeb6da
--- /dev/null
+++ b/api/envoy/config/endpoint/v4alpha/endpoint.proto
@@ -0,0 +1,119 @@
+syntax = "proto3";
+
+package envoy.config.endpoint.v4alpha;
+
+import "envoy/config/endpoint/v4alpha/endpoint_components.proto";
+import "envoy/type/v3/percent.proto";
+
+import "google/protobuf/duration.proto";
+import "google/protobuf/wrappers.proto";
+
+import "udpa/annotations/status.proto";
+import "udpa/annotations/versioning.proto";
+import "validate/validate.proto";
+
+option java_package = "io.envoyproxy.envoy.config.endpoint.v4alpha";
+option java_outer_classname = "EndpointProto";
+option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE;
+
+// [#protodoc-title: Endpoint configuration]
+// Endpoint discovery :ref:`architecture overview <arch_overview_service_discovery_types_eds>`
+
+// Each route from RDS will map to a single cluster or traffic split across
+// clusters using weights expressed in the RDS WeightedCluster.
+//
+// With EDS, each cluster is treated independently from a LB perspective, with
+// LB taking place between the Localities within a cluster and at a finer
+// granularity between the hosts within a locality. The percentage of traffic
+// for each endpoint is determined by both its load_balancing_weight, and the
+// load_balancing_weight of its locality. First, a locality will be selected,
+// then an endpoint within that locality will be chose based on its weight.
+// [#next-free-field: 6]
+message ClusterLoadAssignment {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.ClusterLoadAssignment";
+
+  // Load balancing policy settings.
+  // [#next-free-field: 6]
+  message Policy {
+    option (udpa.annotations.versioning).previous_message_type =
+        "envoy.config.endpoint.v3.ClusterLoadAssignment.Policy";
+
+    // [#not-implemented-hide:]
+    message DropOverload {
+      option (udpa.annotations.versioning).previous_message_type =
+          "envoy.config.endpoint.v3.ClusterLoadAssignment.Policy.DropOverload";
+
+      // Identifier for the policy specifying the drop.
+      string category = 1 [(validate.rules).string = {min_len: 1}];
+
+      // Percentage of traffic that should be dropped for the category.
+      type.v3.FractionalPercent drop_percentage = 2;
+    }
+
+    reserved 1, 5;
+
+    reserved "disable_overprovisioning";
+
+    // Action to trim the overall incoming traffic to protect the upstream
+    // hosts. This action allows protection in case the hosts are unable to
+    // recover from an outage, or unable to autoscale or unable to handle
+    // incoming traffic volume for any reason.
+    //
+    // At the client each category is applied one after the other to generate
+    // the 'actual' drop percentage on all outgoing traffic. For example:
+    //
+    // .. code-block:: json
+    //
+    //  { "drop_overloads": [
+    //      { "category": "throttle", "drop_percentage": 60 }
+    //      { "category": "lb", "drop_percentage": 50 }
+    //  ]}
+    //
+    // The actual drop percentages applied to the traffic at the clients will be
+    //    "throttle"_drop = 60%
+    //    "lb"_drop = 20%  // 50% of the remaining 'actual' load, which is 40%.
+    //    actual_outgoing_load = 20% // remaining after applying all categories.
+    // [#not-implemented-hide:]
+    repeated DropOverload drop_overloads = 2;
+
+    // Priority levels and localities are considered overprovisioned with this
+    // factor (in percentage). This means that we don't consider a priority
+    // level or locality unhealthy until the fraction of healthy hosts
+    // multiplied by the overprovisioning factor drops below 100.
+    // With the default value 140(1.4), Envoy doesn't consider a priority level
+    // or a locality unhealthy until their percentage of healthy hosts drops
+    // below 72%. For example:
+    //
+    // .. code-block:: json
+    //
+    //  { "overprovisioning_factor": 100 }
+    //
+    // Read more at :ref:`priority levels <arch_overview_load_balancing_priority_levels>` and
+    // :ref:`localities <arch_overview_load_balancing_locality_weighted_lb>`.
+    google.protobuf.UInt32Value overprovisioning_factor = 3 [(validate.rules).uint32 = {gt: 0}];
+
+    // The max time until which the endpoints from this assignment can be used.
+    // If no new assignments are received before this time expires the endpoints
+    // are considered stale and should be marked unhealthy.
+    // Defaults to 0 which means endpoints never go stale.
+    google.protobuf.Duration endpoint_stale_after = 4 [(validate.rules).duration = {gt {}}];
+  }
+
+  // Name of the cluster. This will be the :ref:`service_name
+  // <envoy_v3_api_field_config.cluster.v3.Cluster.EdsClusterConfig.service_name>` value if specified
+  // in the cluster :ref:`EdsClusterConfig
+  // <envoy_v3_api_msg_config.cluster.v3.Cluster.EdsClusterConfig>`.
+  string cluster_name = 1 [(validate.rules).string = {min_len: 1}];
+
+  // List of endpoints to load balance to.
+  repeated LocalityLbEndpoints endpoints = 2;
+
+  // Map of named endpoints that can be referenced in LocalityLbEndpoints.
+  // [#not-implemented-hide:]
+  map<string, Endpoint> named_endpoints = 5;
+
+  // Load balancing policy settings.
+  Policy policy = 4;
+}
diff --git a/api/envoy/config/endpoint/v4alpha/endpoint_components.proto b/api/envoy/config/endpoint/v4alpha/endpoint_components.proto
new file mode 100644
index 0000000000000..02357533e0a98
--- /dev/null
+++ b/api/envoy/config/endpoint/v4alpha/endpoint_components.proto
@@ -0,0 +1,195 @@
+syntax = "proto3";
+
+package envoy.config.endpoint.v4alpha;
+
+import "envoy/config/core/v4alpha/address.proto";
+import "envoy/config/core/v4alpha/base.proto";
+import "envoy/config/core/v4alpha/config_source.proto";
+import "envoy/config/core/v4alpha/health_check.proto";
+
+import "google/protobuf/wrappers.proto";
+
+import "udpa/annotations/status.proto";
+import "udpa/annotations/versioning.proto";
+import "validate/validate.proto";
+
+option java_package = "io.envoyproxy.envoy.config.endpoint.v4alpha";
+option java_outer_classname = "EndpointComponentsProto";
+option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE;
+
+// [#protodoc-title: Endpoints]
+
+// Upstream host identifier.
+message Endpoint {
+  option (udpa.annotations.versioning).previous_message_type = "envoy.config.endpoint.v3.Endpoint";
+
+  // The optional health check configuration.
+  message HealthCheckConfig {
+    option (udpa.annotations.versioning).previous_message_type =
+        "envoy.config.endpoint.v3.Endpoint.HealthCheckConfig";
+
+    // Optional alternative health check port value.
+    //
+    // By default the health check address port of an upstream host is the same
+    // as the host's serving address port. This provides an alternative health
+    // check port. Setting this with a non-zero value allows an upstream host
+    // to have different health check address port.
+    uint32 port_value = 1 [(validate.rules).uint32 = {lte: 65535}];
+
+    // By default, the host header for L7 health checks is controlled by cluster level configuration
+    // (see: :ref:`host <envoy_v3_api_field_config.core.v3.HealthCheck.HttpHealthCheck.host>` and
+    // :ref:`authority <envoy_v3_api_field_config.core.v3.HealthCheck.GrpcHealthCheck.authority>`). Setting this
+    // to a non-empty value allows overriding the cluster level configuration for a specific
+    // endpoint.
+    string hostname = 2;
+  }
+
+  // The upstream host address.
+  //
+  // .. attention::
+  //
+  //   The form of host address depends on the given cluster type. For STATIC or EDS,
+  //   it is expected to be a direct IP address (or something resolvable by the
+  //   specified :ref:`resolver <envoy_v3_api_field_config.core.v3.SocketAddress.resolver_name>`
+  //   in the Address). For LOGICAL or STRICT DNS, it is expected to be hostname,
+  //   and will be resolved via DNS.
+  core.v4alpha.Address address = 1;
+
+  // The optional health check configuration is used as configuration for the
+  // health checker to contact the health checked host.
+  //
+  // .. attention::
+  //
+  //   This takes into effect only for upstream clusters with
+  //   :ref:`active health checking <arch_overview_health_checking>` enabled.
+  HealthCheckConfig health_check_config = 2;
+
+  // The hostname associated with this endpoint. This hostname is not used for routing or address
+  // resolution. If provided, it will be associated with the endpoint, and can be used for features
+  // that require a hostname, like
+  // :ref:`auto_host_rewrite <envoy_v3_api_field_config.route.v3.RouteAction.auto_host_rewrite>`.
+  string hostname = 3;
+}
+
+// An Endpoint that Envoy can route traffic to.
+// [#next-free-field: 6]
+message LbEndpoint {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.LbEndpoint";
+
+  // Upstream host identifier or a named reference.
+  oneof host_identifier {
+    Endpoint endpoint = 1;
+
+    // [#not-implemented-hide:]
+    string endpoint_name = 5;
+  }
+
+  // Optional health status when known and supplied by EDS server.
+  core.v4alpha.HealthStatus health_status = 2;
+
+  // The endpoint metadata specifies values that may be used by the load
+  // balancer to select endpoints in a cluster for a given request. The filter
+  // name should be specified as *envoy.lb*. An example boolean key-value pair
+  // is *canary*, providing the optional canary status of the upstream host.
+  // This may be matched against in a route's
+  // :ref:`RouteAction <envoy_v3_api_msg_config.route.v3.RouteAction>` metadata_match field
+  // to subset the endpoints considered in cluster load balancing.
+  core.v4alpha.Metadata metadata = 3;
+
+  // The optional load balancing weight of the upstream host; at least 1.
+  // Envoy uses the load balancing weight in some of the built in load
+  // balancers. The load balancing weight for an endpoint is divided by the sum
+  // of the weights of all endpoints in the endpoint's locality to produce a
+  // percentage of traffic for the endpoint. This percentage is then further
+  // weighted by the endpoint's locality's load balancing weight from
+  // LocalityLbEndpoints. If unspecified, each host is presumed to have equal
+  // weight in a locality. The sum of the weights of all endpoints in the
+  // endpoint's locality must not exceed uint32_t maximal value (4294967295).
+  google.protobuf.UInt32Value load_balancing_weight = 4 [(validate.rules).uint32 = {gte: 1}];
+}
+
+// [#not-implemented-hide:]
+// A configuration for a LEDS collection.
+message LedsClusterLocalityConfig {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.LedsClusterLocalityConfig";
+
+  // Configuration for the source of LEDS updates for a Locality.
+  core.v4alpha.ConfigSource leds_config = 1;
+
+  // The xDS transport protocol glob collection resource name.
+  // The service is only supported in delta xDS (incremental) mode.
+  string leds_collection_name = 2;
+}
+
+// A group of endpoints belonging to a Locality.
+// One can have multiple LocalityLbEndpoints for a locality, but this is
+// generally only done if the different groups need to have different load
+// balancing weights or different priorities.
+// [#next-free-field: 9]
+message LocalityLbEndpoints {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.LocalityLbEndpoints";
+
+  // [#not-implemented-hide:]
+  // A list of endpoints of a specific locality.
+  message LbEndpointList {
+    option (udpa.annotations.versioning).previous_message_type =
+        "envoy.config.endpoint.v3.LocalityLbEndpoints.LbEndpointList";
+
+    repeated LbEndpoint lb_endpoints = 1;
+  }
+
+  // Identifies location of where the upstream hosts run.
+  core.v4alpha.Locality locality = 1;
+
+  // The group of endpoints belonging to the locality specified.
+  // [#comment:TODO(adisuissa): Once LEDS is implemented this field needs to be
+  // deprecated and replaced by *lb_endpoints_list*.]
+  repeated LbEndpoint lb_endpoints = 2;
+
+  // [#not-implemented-hide:]
+  oneof lb_config {
+    // The group of endpoints belonging to the locality.
+    // [#comment:TODO(adisuissa): Once LEDS is implemented the *lb_endpoints* field
+    // needs to be deprecated.]
+    LbEndpointList lb_endpoints_list = 7;
+
+    // LEDS Configuration for the current locality.
+    LedsClusterLocalityConfig leds_cluster_locality_config = 8;
+  }
+
+  // Optional: Per priority/region/zone/sub_zone weight; at least 1. The load
+  // balancing weight for a locality is divided by the sum of the weights of all
+  // localities  at the same priority level to produce the effective percentage
+  // of traffic for the locality. The sum of the weights of all localities at
+  // the same priority level must not exceed uint32_t maximal value (4294967295).
+  //
+  // Locality weights are only considered when :ref:`locality weighted load
+  // balancing <arch_overview_load_balancing_locality_weighted_lb>` is
+  // configured. These weights are ignored otherwise. If no weights are
+  // specified when locality weighted load balancing is enabled, the locality is
+  // assigned no load.
+  google.protobuf.UInt32Value load_balancing_weight = 3 [(validate.rules).uint32 = {gte: 1}];
+
+  // Optional: the priority for this LocalityLbEndpoints. If unspecified this will
+  // default to the highest priority (0).
+  //
+  // Under usual circumstances, Envoy will only select endpoints for the highest
+  // priority (0). In the event all endpoints for a particular priority are
+  // unavailable/unhealthy, Envoy will fail over to selecting endpoints for the
+  // next highest priority group.
+  //
+  // Priorities should range from 0 (highest) to N (lowest) without skipping.
+  uint32 priority = 5 [(validate.rules).uint32 = {lte: 128}];
+
+  // Optional: Per locality proximity value which indicates how close this
+  // locality is from the source locality. This value only provides ordering
+  // information (lower the value, closer it is to the source locality).
+  // This will be consumed by load balancing schemes that need proximity order
+  // to determine where to route the requests.
+  // [#not-implemented-hide:]
+  google.protobuf.UInt32Value proximity = 6;
+}
diff --git a/api/envoy/config/endpoint/v4alpha/load_report.proto b/api/envoy/config/endpoint/v4alpha/load_report.proto
new file mode 100644
index 0000000000000..e89fcdadda162
--- /dev/null
+++ b/api/envoy/config/endpoint/v4alpha/load_report.proto
@@ -0,0 +1,168 @@
+syntax = "proto3";
+
+package envoy.config.endpoint.v4alpha;
+
+import "envoy/config/core/v4alpha/address.proto";
+import "envoy/config/core/v4alpha/base.proto";
+
+import "google/protobuf/duration.proto";
+import "google/protobuf/struct.proto";
+
+import "udpa/annotations/status.proto";
+import "udpa/annotations/versioning.proto";
+import "validate/validate.proto";
+
+option java_package = "io.envoyproxy.envoy.config.endpoint.v4alpha";
+option java_outer_classname = "LoadReportProto";
+option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE;
+
+// [#protodoc-title: Load Report]
+
+// These are stats Envoy reports to the management server at a frequency defined by
+// :ref:`LoadStatsResponse.load_reporting_interval<envoy_v3_api_field_service.load_stats.v3.LoadStatsResponse.load_reporting_interval>`.
+// Stats per upstream region/zone and optionally per subzone.
+// [#next-free-field: 9]
+message UpstreamLocalityStats {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.UpstreamLocalityStats";
+
+  // Name of zone, region and optionally endpoint group these metrics were
+  // collected from. Zone and region names could be empty if unknown.
+  core.v4alpha.Locality locality = 1;
+
+  // The total number of requests successfully completed by the endpoints in the
+  // locality.
+  uint64 total_successful_requests = 2;
+
+  // The total number of unfinished requests
+  uint64 total_requests_in_progress = 3;
+
+  // The total number of requests that failed due to errors at the endpoint,
+  // aggregated over all endpoints in the locality.
+  uint64 total_error_requests = 4;
+
+  // The total number of requests that were issued by this Envoy since
+  // the last report. This information is aggregated over all the
+  // upstream endpoints in the locality.
+  uint64 total_issued_requests = 8;
+
+  // Stats for multi-dimensional load balancing.
+  repeated EndpointLoadMetricStats load_metric_stats = 5;
+
+  // Endpoint granularity stats information for this locality. This information
+  // is populated if the Server requests it by setting
+  // :ref:`LoadStatsResponse.report_endpoint_granularity<envoy_v3_api_field_service.load_stats.v3.LoadStatsResponse.report_endpoint_granularity>`.
+  repeated UpstreamEndpointStats upstream_endpoint_stats = 7;
+
+  // [#not-implemented-hide:] The priority of the endpoint group these metrics
+  // were collected from.
+  uint32 priority = 6;
+}
+
+// [#next-free-field: 8]
+message UpstreamEndpointStats {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.UpstreamEndpointStats";
+
+  // Upstream host address.
+  core.v4alpha.Address address = 1;
+
+  // Opaque and implementation dependent metadata of the
+  // endpoint. Envoy will pass this directly to the management server.
+  google.protobuf.Struct metadata = 6;
+
+  // The total number of requests successfully completed by the endpoints in the
+  // locality. These include non-5xx responses for HTTP, where errors
+  // originate at the client and the endpoint responded successfully. For gRPC,
+  // the grpc-status values are those not covered by total_error_requests below.
+  uint64 total_successful_requests = 2;
+
+  // The total number of unfinished requests for this endpoint.
+  uint64 total_requests_in_progress = 3;
+
+  // The total number of requests that failed due to errors at the endpoint.
+  // For HTTP these are responses with 5xx status codes and for gRPC the
+  // grpc-status values:
+  //
+  //   - DeadlineExceeded
+  //   - Unimplemented
+  //   - Internal
+  //   - Unavailable
+  //   - Unknown
+  //   - DataLoss
+  uint64 total_error_requests = 4;
+
+  // The total number of requests that were issued to this endpoint
+  // since the last report. A single TCP connection, HTTP or gRPC
+  // request or stream is counted as one request.
+  uint64 total_issued_requests = 7;
+
+  // Stats for multi-dimensional load balancing.
+  repeated EndpointLoadMetricStats load_metric_stats = 5;
+}
+
+message EndpointLoadMetricStats {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.EndpointLoadMetricStats";
+
+  // Name of the metric; may be empty.
+  string metric_name = 1;
+
+  // Number of calls that finished and included this metric.
+  uint64 num_requests_finished_with_metric = 2;
+
+  // Sum of metric values across all calls that finished with this metric for
+  // load_reporting_interval.
+  double total_metric_value = 3;
+}
+
+// Per cluster load stats. Envoy reports these stats a management server in a
+// :ref:`LoadStatsRequest<envoy_v3_api_msg_service.load_stats.v3.LoadStatsRequest>`
+// Next ID: 7
+// [#next-free-field: 7]
+message ClusterStats {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.ClusterStats";
+
+  message DroppedRequests {
+    option (udpa.annotations.versioning).previous_message_type =
+        "envoy.config.endpoint.v3.ClusterStats.DroppedRequests";
+
+    // Identifier for the policy specifying the drop.
+    string category = 1 [(validate.rules).string = {min_len: 1}];
+
+    // Total number of deliberately dropped requests for the category.
+    uint64 dropped_count = 2;
+  }
+
+  // The name of the cluster.
+  string cluster_name = 1 [(validate.rules).string = {min_len: 1}];
+
+  // The eds_cluster_config service_name of the cluster.
+  // It's possible that two clusters send the same service_name to EDS,
+  // in that case, the management server is supposed to do aggregation on the load reports.
+  string cluster_service_name = 6;
+
+  // Need at least one.
+  repeated UpstreamLocalityStats upstream_locality_stats = 2
+      [(validate.rules).repeated = {min_items: 1}];
+
+  // Cluster-level stats such as total_successful_requests may be computed by
+  // summing upstream_locality_stats. In addition, below there are additional
+  // cluster-wide stats.
+  //
+  // The total number of dropped requests. This covers requests
+  // deliberately dropped by the drop_overload policy and circuit breaking.
+  uint64 total_dropped_requests = 3;
+
+  // Information about deliberately dropped requests for each category specified
+  // in the DropOverload policy.
+  repeated DroppedRequests dropped_requests = 5;
+
+  // Period over which the actual load report occurred. This will be guaranteed to include every
+  // request reported. Due to system load and delays between the *LoadStatsRequest* sent from Envoy
+  // and the *LoadStatsResponse* message sent from the management server, this may be longer than
+  // the requested load reporting interval in the *LoadStatsResponse*.
+  google.protobuf.Duration load_report_interval = 4;
+}
diff --git a/api/envoy/service/endpoint/v3/leds.proto b/api/envoy/service/endpoint/v3/leds.proto
new file mode 100644
index 0000000000000..89172f487eba0
--- /dev/null
+++ b/api/envoy/service/endpoint/v3/leds.proto
@@ -0,0 +1,37 @@
+syntax = "proto3";
+
+package envoy.service.endpoint.v3;
+
+import "envoy/service/discovery/v3/discovery.proto";
+
+import "envoy/annotations/resource.proto";
+import "udpa/annotations/status.proto";
+
+option java_package = "io.envoyproxy.envoy.service.endpoint.v3";
+option java_outer_classname = "LedsProto";
+option java_multiple_files = true;
+option java_generic_services = true;
+option (udpa.annotations.file_status).package_version_status = ACTIVE;
+
+// [#not-implemented-hide:]
+// [#protodoc-title: LEDS]
+// Locality-Endpoint discovery
+// [#comment:TODO(adisuissa): Link to unified matching docs:
+// :ref:`architecture overview<arch_overview_service_discovery_types_leds>`]
+
+service LocalityEndpointDiscoveryService {
+  option (envoy.annotations.resource).type = "envoy.config.endpoint.v3.LbEndpoint";
+
+  // State-of-the-World (DiscoveryRequest) and REST are not supported.
+
+  // The resource_names_subscribe resource_names_unsubscribe fields in DeltaDiscoveryRequest
+  // specify a list of glob collections to subscribe to updates for.
+  rpc DeltaLocalityEndpoints(stream discovery.v3.DeltaDiscoveryRequest)
+      returns (stream discovery.v3.DeltaDiscoveryResponse) {
+  }
+}
+
+// [#not-implemented-hide:] Not configuration. Workaround c++ protobuf issue with importing
+// services: https://github.com/google/protobuf/issues/4221 and protoxform to upgrade the file.
+message LedsDummy {
+}
diff --git a/api/envoy/service/health/v4alpha/BUILD b/api/envoy/service/health/v4alpha/BUILD
index 60bd19511855e..ed1ef41e94009 100644
--- a/api/envoy/service/health/v4alpha/BUILD
+++ b/api/envoy/service/health/v4alpha/BUILD
@@ -9,7 +9,7 @@ api_proto_package(
     deps = [
         "//envoy/config/cluster/v4alpha:pkg",
         "//envoy/config/core/v4alpha:pkg",
-        "//envoy/config/endpoint/v3:pkg",
+        "//envoy/config/endpoint/v4alpha:pkg",
         "//envoy/service/health/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],
diff --git a/api/envoy/service/health/v4alpha/hds.proto b/api/envoy/service/health/v4alpha/hds.proto
index 9ce239f5e9cf9..52a4c4129a7eb 100644
--- a/api/envoy/service/health/v4alpha/hds.proto
+++ b/api/envoy/service/health/v4alpha/hds.proto
@@ -5,7 +5,7 @@ package envoy.service.health.v4alpha;
 import "envoy/config/cluster/v4alpha/cluster.proto";
 import "envoy/config/core/v4alpha/base.proto";
 import "envoy/config/core/v4alpha/health_check.proto";
-import "envoy/config/endpoint/v3/endpoint_components.proto";
+import "envoy/config/endpoint/v4alpha/endpoint_components.proto";
 
 import "google/api/annotations.proto";
 import "google/protobuf/duration.proto";
@@ -103,7 +103,7 @@ message EndpointHealth {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.service.health.v3.EndpointHealth";
 
-  config.endpoint.v3.Endpoint endpoint = 1;
+  config.endpoint.v4alpha.Endpoint endpoint = 1;
 
   config.core.v4alpha.HealthStatus health_status = 2;
 }
@@ -158,7 +158,7 @@ message LocalityEndpoints {
 
   config.core.v4alpha.Locality locality = 1;
 
-  repeated config.endpoint.v3.Endpoint endpoints = 2;
+  repeated config.endpoint.v4alpha.Endpoint endpoints = 2;
 }
 
 // The cluster name and locality is provided to Envoy for the endpoints that it
diff --git a/api/envoy/service/load_stats/v4alpha/BUILD b/api/envoy/service/load_stats/v4alpha/BUILD
index 91d914645041b..870673013a0e6 100644
--- a/api/envoy/service/load_stats/v4alpha/BUILD
+++ b/api/envoy/service/load_stats/v4alpha/BUILD
@@ -8,7 +8,7 @@ api_proto_package(
     has_services = True,
     deps = [
         "//envoy/config/core/v4alpha:pkg",
-        "//envoy/config/endpoint/v3:pkg",
+        "//envoy/config/endpoint/v4alpha:pkg",
         "//envoy/service/load_stats/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],
diff --git a/api/envoy/service/load_stats/v4alpha/lrs.proto b/api/envoy/service/load_stats/v4alpha/lrs.proto
index f99b6555f4a17..86bbe13186332 100644
--- a/api/envoy/service/load_stats/v4alpha/lrs.proto
+++ b/api/envoy/service/load_stats/v4alpha/lrs.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 package envoy.service.load_stats.v4alpha;
 
 import "envoy/config/core/v4alpha/base.proto";
-import "envoy/config/endpoint/v3/load_report.proto";
+import "envoy/config/endpoint/v4alpha/load_report.proto";
 
 import "google/protobuf/duration.proto";
 
@@ -68,7 +68,7 @@ message LoadStatsRequest {
   config.core.v4alpha.Node node = 1;
 
   // A list of load stats to report.
-  repeated config.endpoint.v3.ClusterStats cluster_stats = 2;
+  repeated config.endpoint.v4alpha.ClusterStats cluster_stats = 2;
 }
 
 // The management server sends envoy a LoadStatsResponse with all clusters it
diff --git a/generated_api_shadow/envoy/config/cluster/v4alpha/BUILD b/generated_api_shadow/envoy/config/cluster/v4alpha/BUILD
index 2bac8db17256c..49a44abbd4f75 100644
--- a/generated_api_shadow/envoy/config/cluster/v4alpha/BUILD
+++ b/generated_api_shadow/envoy/config/cluster/v4alpha/BUILD
@@ -9,7 +9,7 @@ api_proto_package(
         "//envoy/annotations:pkg",
         "//envoy/config/cluster/v3:pkg",
         "//envoy/config/core/v4alpha:pkg",
-        "//envoy/config/endpoint/v3:pkg",
+        "//envoy/config/endpoint/v4alpha:pkg",
         "//envoy/type/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
         "@com_github_cncf_udpa//xds/core/v3:pkg",
diff --git a/generated_api_shadow/envoy/config/cluster/v4alpha/cluster.proto b/generated_api_shadow/envoy/config/cluster/v4alpha/cluster.proto
index 3baa5c7ec0ac9..5f8eeac2f67f7 100644
--- a/generated_api_shadow/envoy/config/cluster/v4alpha/cluster.proto
+++ b/generated_api_shadow/envoy/config/cluster/v4alpha/cluster.proto
@@ -12,7 +12,7 @@ import "envoy/config/core/v4alpha/extension.proto";
 import "envoy/config/core/v4alpha/health_check.proto";
 import "envoy/config/core/v4alpha/protocol.proto";
 import "envoy/config/core/v4alpha/resolver.proto";
-import "envoy/config/endpoint/v3/endpoint.proto";
+import "envoy/config/endpoint/v4alpha/endpoint.proto";
 import "envoy/type/v3/percent.proto";
 
 import "google/protobuf/any.proto";
@@ -743,7 +743,7 @@ message Cluster {
   //   Setting this allows non-EDS cluster types to contain embedded EDS equivalent
   //   :ref:`endpoint assignments<envoy_v3_api_msg_config.endpoint.v3.ClusterLoadAssignment>`.
   //
-  endpoint.v3.ClusterLoadAssignment load_assignment = 33;
+  endpoint.v4alpha.ClusterLoadAssignment load_assignment = 33;
 
   // Optional :ref:`active health checking <arch_overview_health_checking>`
   // configuration for the cluster. If no
diff --git a/generated_api_shadow/envoy/config/endpoint/v3/endpoint_components.proto b/generated_api_shadow/envoy/config/endpoint/v3/endpoint_components.proto
index 0e10ac3b2fca7..f7a374cc1d8d7 100644
--- a/generated_api_shadow/envoy/config/endpoint/v3/endpoint_components.proto
+++ b/generated_api_shadow/envoy/config/endpoint/v3/endpoint_components.proto
@@ -4,10 +4,12 @@ package envoy.config.endpoint.v3;
 
 import "envoy/config/core/v3/address.proto";
 import "envoy/config/core/v3/base.proto";
+import "envoy/config/core/v3/config_source.proto";
 import "envoy/config/core/v3/health_check.proto";
 
 import "google/protobuf/wrappers.proto";
 
+import "udpa/annotations/migrate.proto";
 import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
 import "validate/validate.proto";
@@ -108,21 +110,51 @@ message LbEndpoint {
   google.protobuf.UInt32Value load_balancing_weight = 4 [(validate.rules).uint32 = {gte: 1}];
 }
 
+// [#not-implemented-hide:]
+// A configuration for a LEDS collection.
+message LedsClusterLocalityConfig {
+  // Configuration for the source of LEDS updates for a Locality.
+  core.v3.ConfigSource leds_config = 1;
+
+  // The xDS transport protocol glob collection resource name.
+  // The service is only supported in delta xDS (incremental) mode.
+  string leds_collection_name = 2;
+}
+
 // A group of endpoints belonging to a Locality.
 // One can have multiple LocalityLbEndpoints for a locality, but this is
 // generally only done if the different groups need to have different load
 // balancing weights or different priorities.
-// [#next-free-field: 7]
+// [#next-free-field: 9]
 message LocalityLbEndpoints {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.api.v2.endpoint.LocalityLbEndpoints";
 
+  // [#not-implemented-hide:]
+  // A list of endpoints of a specific locality.
+  message LbEndpointList {
+    repeated LbEndpoint lb_endpoints = 1;
+  }
+
   // Identifies location of where the upstream hosts run.
   core.v3.Locality locality = 1;
 
   // The group of endpoints belonging to the locality specified.
+  // [#comment:TODO(adisuissa): Once LEDS is implemented this field needs to be
+  // deprecated and replaced by *lb_endpoints_list*.]
   repeated LbEndpoint lb_endpoints = 2;
 
+  // [#not-implemented-hide:]
+  oneof lb_config {
+    // The group of endpoints belonging to the locality.
+    // [#comment:TODO(adisuissa): Once LEDS is implemented the *lb_endpoints* field
+    // needs to be deprecated.]
+    LbEndpointList lb_endpoints_list = 7;
+
+    // LEDS Configuration for the current locality.
+    LedsClusterLocalityConfig leds_cluster_locality_config = 8;
+  }
+
   // Optional: Per priority/region/zone/sub_zone weight; at least 1. The load
   // balancing weight for a locality is divided by the sum of the weights of all
   // localities  at the same priority level to produce the effective percentage
diff --git a/generated_api_shadow/envoy/config/endpoint/v4alpha/BUILD b/generated_api_shadow/envoy/config/endpoint/v4alpha/BUILD
new file mode 100644
index 0000000000000..79d52ad4cfbc6
--- /dev/null
+++ b/generated_api_shadow/envoy/config/endpoint/v4alpha/BUILD
@@ -0,0 +1,14 @@
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
+
+load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
+
+licenses(["notice"])  # Apache 2
+
+api_proto_package(
+    deps = [
+        "//envoy/config/core/v4alpha:pkg",
+        "//envoy/config/endpoint/v3:pkg",
+        "//envoy/type/v3:pkg",
+        "@com_github_cncf_udpa//udpa/annotations:pkg",
+    ],
+)
diff --git a/generated_api_shadow/envoy/config/endpoint/v4alpha/endpoint.proto b/generated_api_shadow/envoy/config/endpoint/v4alpha/endpoint.proto
new file mode 100644
index 0000000000000..6c87e8ffeb6da
--- /dev/null
+++ b/generated_api_shadow/envoy/config/endpoint/v4alpha/endpoint.proto
@@ -0,0 +1,119 @@
+syntax = "proto3";
+
+package envoy.config.endpoint.v4alpha;
+
+import "envoy/config/endpoint/v4alpha/endpoint_components.proto";
+import "envoy/type/v3/percent.proto";
+
+import "google/protobuf/duration.proto";
+import "google/protobuf/wrappers.proto";
+
+import "udpa/annotations/status.proto";
+import "udpa/annotations/versioning.proto";
+import "validate/validate.proto";
+
+option java_package = "io.envoyproxy.envoy.config.endpoint.v4alpha";
+option java_outer_classname = "EndpointProto";
+option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE;
+
+// [#protodoc-title: Endpoint configuration]
+// Endpoint discovery :ref:`architecture overview <arch_overview_service_discovery_types_eds>`
+
+// Each route from RDS will map to a single cluster or traffic split across
+// clusters using weights expressed in the RDS WeightedCluster.
+//
+// With EDS, each cluster is treated independently from a LB perspective, with
+// LB taking place between the Localities within a cluster and at a finer
+// granularity between the hosts within a locality. The percentage of traffic
+// for each endpoint is determined by both its load_balancing_weight, and the
+// load_balancing_weight of its locality. First, a locality will be selected,
+// then an endpoint within that locality will be chose based on its weight.
+// [#next-free-field: 6]
+message ClusterLoadAssignment {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.ClusterLoadAssignment";
+
+  // Load balancing policy settings.
+  // [#next-free-field: 6]
+  message Policy {
+    option (udpa.annotations.versioning).previous_message_type =
+        "envoy.config.endpoint.v3.ClusterLoadAssignment.Policy";
+
+    // [#not-implemented-hide:]
+    message DropOverload {
+      option (udpa.annotations.versioning).previous_message_type =
+          "envoy.config.endpoint.v3.ClusterLoadAssignment.Policy.DropOverload";
+
+      // Identifier for the policy specifying the drop.
+      string category = 1 [(validate.rules).string = {min_len: 1}];
+
+      // Percentage of traffic that should be dropped for the category.
+      type.v3.FractionalPercent drop_percentage = 2;
+    }
+
+    reserved 1, 5;
+
+    reserved "disable_overprovisioning";
+
+    // Action to trim the overall incoming traffic to protect the upstream
+    // hosts. This action allows protection in case the hosts are unable to
+    // recover from an outage, or unable to autoscale or unable to handle
+    // incoming traffic volume for any reason.
+    //
+    // At the client each category is applied one after the other to generate
+    // the 'actual' drop percentage on all outgoing traffic. For example:
+    //
+    // .. code-block:: json
+    //
+    //  { "drop_overloads": [
+    //      { "category": "throttle", "drop_percentage": 60 }
+    //      { "category": "lb", "drop_percentage": 50 }
+    //  ]}
+    //
+    // The actual drop percentages applied to the traffic at the clients will be
+    //    "throttle"_drop = 60%
+    //    "lb"_drop = 20%  // 50% of the remaining 'actual' load, which is 40%.
+    //    actual_outgoing_load = 20% // remaining after applying all categories.
+    // [#not-implemented-hide:]
+    repeated DropOverload drop_overloads = 2;
+
+    // Priority levels and localities are considered overprovisioned with this
+    // factor (in percentage). This means that we don't consider a priority
+    // level or locality unhealthy until the fraction of healthy hosts
+    // multiplied by the overprovisioning factor drops below 100.
+    // With the default value 140(1.4), Envoy doesn't consider a priority level
+    // or a locality unhealthy until their percentage of healthy hosts drops
+    // below 72%. For example:
+    //
+    // .. code-block:: json
+    //
+    //  { "overprovisioning_factor": 100 }
+    //
+    // Read more at :ref:`priority levels <arch_overview_load_balancing_priority_levels>` and
+    // :ref:`localities <arch_overview_load_balancing_locality_weighted_lb>`.
+    google.protobuf.UInt32Value overprovisioning_factor = 3 [(validate.rules).uint32 = {gt: 0}];
+
+    // The max time until which the endpoints from this assignment can be used.
+    // If no new assignments are received before this time expires the endpoints
+    // are considered stale and should be marked unhealthy.
+    // Defaults to 0 which means endpoints never go stale.
+    google.protobuf.Duration endpoint_stale_after = 4 [(validate.rules).duration = {gt {}}];
+  }
+
+  // Name of the cluster. This will be the :ref:`service_name
+  // <envoy_v3_api_field_config.cluster.v3.Cluster.EdsClusterConfig.service_name>` value if specified
+  // in the cluster :ref:`EdsClusterConfig
+  // <envoy_v3_api_msg_config.cluster.v3.Cluster.EdsClusterConfig>`.
+  string cluster_name = 1 [(validate.rules).string = {min_len: 1}];
+
+  // List of endpoints to load balance to.
+  repeated LocalityLbEndpoints endpoints = 2;
+
+  // Map of named endpoints that can be referenced in LocalityLbEndpoints.
+  // [#not-implemented-hide:]
+  map<string, Endpoint> named_endpoints = 5;
+
+  // Load balancing policy settings.
+  Policy policy = 4;
+}
diff --git a/generated_api_shadow/envoy/config/endpoint/v4alpha/endpoint_components.proto b/generated_api_shadow/envoy/config/endpoint/v4alpha/endpoint_components.proto
new file mode 100644
index 0000000000000..02357533e0a98
--- /dev/null
+++ b/generated_api_shadow/envoy/config/endpoint/v4alpha/endpoint_components.proto
@@ -0,0 +1,195 @@
+syntax = "proto3";
+
+package envoy.config.endpoint.v4alpha;
+
+import "envoy/config/core/v4alpha/address.proto";
+import "envoy/config/core/v4alpha/base.proto";
+import "envoy/config/core/v4alpha/config_source.proto";
+import "envoy/config/core/v4alpha/health_check.proto";
+
+import "google/protobuf/wrappers.proto";
+
+import "udpa/annotations/status.proto";
+import "udpa/annotations/versioning.proto";
+import "validate/validate.proto";
+
+option java_package = "io.envoyproxy.envoy.config.endpoint.v4alpha";
+option java_outer_classname = "EndpointComponentsProto";
+option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE;
+
+// [#protodoc-title: Endpoints]
+
+// Upstream host identifier.
+message Endpoint {
+  option (udpa.annotations.versioning).previous_message_type = "envoy.config.endpoint.v3.Endpoint";
+
+  // The optional health check configuration.
+  message HealthCheckConfig {
+    option (udpa.annotations.versioning).previous_message_type =
+        "envoy.config.endpoint.v3.Endpoint.HealthCheckConfig";
+
+    // Optional alternative health check port value.
+    //
+    // By default the health check address port of an upstream host is the same
+    // as the host's serving address port. This provides an alternative health
+    // check port. Setting this with a non-zero value allows an upstream host
+    // to have different health check address port.
+    uint32 port_value = 1 [(validate.rules).uint32 = {lte: 65535}];
+
+    // By default, the host header for L7 health checks is controlled by cluster level configuration
+    // (see: :ref:`host <envoy_v3_api_field_config.core.v3.HealthCheck.HttpHealthCheck.host>` and
+    // :ref:`authority <envoy_v3_api_field_config.core.v3.HealthCheck.GrpcHealthCheck.authority>`). Setting this
+    // to a non-empty value allows overriding the cluster level configuration for a specific
+    // endpoint.
+    string hostname = 2;
+  }
+
+  // The upstream host address.
+  //
+  // .. attention::
+  //
+  //   The form of host address depends on the given cluster type. For STATIC or EDS,
+  //   it is expected to be a direct IP address (or something resolvable by the
+  //   specified :ref:`resolver <envoy_v3_api_field_config.core.v3.SocketAddress.resolver_name>`
+  //   in the Address). For LOGICAL or STRICT DNS, it is expected to be hostname,
+  //   and will be resolved via DNS.
+  core.v4alpha.Address address = 1;
+
+  // The optional health check configuration is used as configuration for the
+  // health checker to contact the health checked host.
+  //
+  // .. attention::
+  //
+  //   This takes into effect only for upstream clusters with
+  //   :ref:`active health checking <arch_overview_health_checking>` enabled.
+  HealthCheckConfig health_check_config = 2;
+
+  // The hostname associated with this endpoint. This hostname is not used for routing or address
+  // resolution. If provided, it will be associated with the endpoint, and can be used for features
+  // that require a hostname, like
+  // :ref:`auto_host_rewrite <envoy_v3_api_field_config.route.v3.RouteAction.auto_host_rewrite>`.
+  string hostname = 3;
+}
+
+// An Endpoint that Envoy can route traffic to.
+// [#next-free-field: 6]
+message LbEndpoint {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.LbEndpoint";
+
+  // Upstream host identifier or a named reference.
+  oneof host_identifier {
+    Endpoint endpoint = 1;
+
+    // [#not-implemented-hide:]
+    string endpoint_name = 5;
+  }
+
+  // Optional health status when known and supplied by EDS server.
+  core.v4alpha.HealthStatus health_status = 2;
+
+  // The endpoint metadata specifies values that may be used by the load
+  // balancer to select endpoints in a cluster for a given request. The filter
+  // name should be specified as *envoy.lb*. An example boolean key-value pair
+  // is *canary*, providing the optional canary status of the upstream host.
+  // This may be matched against in a route's
+  // :ref:`RouteAction <envoy_v3_api_msg_config.route.v3.RouteAction>` metadata_match field
+  // to subset the endpoints considered in cluster load balancing.
+  core.v4alpha.Metadata metadata = 3;
+
+  // The optional load balancing weight of the upstream host; at least 1.
+  // Envoy uses the load balancing weight in some of the built in load
+  // balancers. The load balancing weight for an endpoint is divided by the sum
+  // of the weights of all endpoints in the endpoint's locality to produce a
+  // percentage of traffic for the endpoint. This percentage is then further
+  // weighted by the endpoint's locality's load balancing weight from
+  // LocalityLbEndpoints. If unspecified, each host is presumed to have equal
+  // weight in a locality. The sum of the weights of all endpoints in the
+  // endpoint's locality must not exceed uint32_t maximal value (4294967295).
+  google.protobuf.UInt32Value load_balancing_weight = 4 [(validate.rules).uint32 = {gte: 1}];
+}
+
+// [#not-implemented-hide:]
+// A configuration for a LEDS collection.
+message LedsClusterLocalityConfig {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.LedsClusterLocalityConfig";
+
+  // Configuration for the source of LEDS updates for a Locality.
+  core.v4alpha.ConfigSource leds_config = 1;
+
+  // The xDS transport protocol glob collection resource name.
+  // The service is only supported in delta xDS (incremental) mode.
+  string leds_collection_name = 2;
+}
+
+// A group of endpoints belonging to a Locality.
+// One can have multiple LocalityLbEndpoints for a locality, but this is
+// generally only done if the different groups need to have different load
+// balancing weights or different priorities.
+// [#next-free-field: 9]
+message LocalityLbEndpoints {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.LocalityLbEndpoints";
+
+  // [#not-implemented-hide:]
+  // A list of endpoints of a specific locality.
+  message LbEndpointList {
+    option (udpa.annotations.versioning).previous_message_type =
+        "envoy.config.endpoint.v3.LocalityLbEndpoints.LbEndpointList";
+
+    repeated LbEndpoint lb_endpoints = 1;
+  }
+
+  // Identifies location of where the upstream hosts run.
+  core.v4alpha.Locality locality = 1;
+
+  // The group of endpoints belonging to the locality specified.
+  // [#comment:TODO(adisuissa): Once LEDS is implemented this field needs to be
+  // deprecated and replaced by *lb_endpoints_list*.]
+  repeated LbEndpoint lb_endpoints = 2;
+
+  // [#not-implemented-hide:]
+  oneof lb_config {
+    // The group of endpoints belonging to the locality.
+    // [#comment:TODO(adisuissa): Once LEDS is implemented the *lb_endpoints* field
+    // needs to be deprecated.]
+    LbEndpointList lb_endpoints_list = 7;
+
+    // LEDS Configuration for the current locality.
+    LedsClusterLocalityConfig leds_cluster_locality_config = 8;
+  }
+
+  // Optional: Per priority/region/zone/sub_zone weight; at least 1. The load
+  // balancing weight for a locality is divided by the sum of the weights of all
+  // localities  at the same priority level to produce the effective percentage
+  // of traffic for the locality. The sum of the weights of all localities at
+  // the same priority level must not exceed uint32_t maximal value (4294967295).
+  //
+  // Locality weights are only considered when :ref:`locality weighted load
+  // balancing <arch_overview_load_balancing_locality_weighted_lb>` is
+  // configured. These weights are ignored otherwise. If no weights are
+  // specified when locality weighted load balancing is enabled, the locality is
+  // assigned no load.
+  google.protobuf.UInt32Value load_balancing_weight = 3 [(validate.rules).uint32 = {gte: 1}];
+
+  // Optional: the priority for this LocalityLbEndpoints. If unspecified this will
+  // default to the highest priority (0).
+  //
+  // Under usual circumstances, Envoy will only select endpoints for the highest
+  // priority (0). In the event all endpoints for a particular priority are
+  // unavailable/unhealthy, Envoy will fail over to selecting endpoints for the
+  // next highest priority group.
+  //
+  // Priorities should range from 0 (highest) to N (lowest) without skipping.
+  uint32 priority = 5 [(validate.rules).uint32 = {lte: 128}];
+
+  // Optional: Per locality proximity value which indicates how close this
+  // locality is from the source locality. This value only provides ordering
+  // information (lower the value, closer it is to the source locality).
+  // This will be consumed by load balancing schemes that need proximity order
+  // to determine where to route the requests.
+  // [#not-implemented-hide:]
+  google.protobuf.UInt32Value proximity = 6;
+}
diff --git a/generated_api_shadow/envoy/config/endpoint/v4alpha/load_report.proto b/generated_api_shadow/envoy/config/endpoint/v4alpha/load_report.proto
new file mode 100644
index 0000000000000..e89fcdadda162
--- /dev/null
+++ b/generated_api_shadow/envoy/config/endpoint/v4alpha/load_report.proto
@@ -0,0 +1,168 @@
+syntax = "proto3";
+
+package envoy.config.endpoint.v4alpha;
+
+import "envoy/config/core/v4alpha/address.proto";
+import "envoy/config/core/v4alpha/base.proto";
+
+import "google/protobuf/duration.proto";
+import "google/protobuf/struct.proto";
+
+import "udpa/annotations/status.proto";
+import "udpa/annotations/versioning.proto";
+import "validate/validate.proto";
+
+option java_package = "io.envoyproxy.envoy.config.endpoint.v4alpha";
+option java_outer_classname = "LoadReportProto";
+option java_multiple_files = true;
+option (udpa.annotations.file_status).package_version_status = NEXT_MAJOR_VERSION_CANDIDATE;
+
+// [#protodoc-title: Load Report]
+
+// These are stats Envoy reports to the management server at a frequency defined by
+// :ref:`LoadStatsResponse.load_reporting_interval<envoy_v3_api_field_service.load_stats.v3.LoadStatsResponse.load_reporting_interval>`.
+// Stats per upstream region/zone and optionally per subzone.
+// [#next-free-field: 9]
+message UpstreamLocalityStats {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.UpstreamLocalityStats";
+
+  // Name of zone, region and optionally endpoint group these metrics were
+  // collected from. Zone and region names could be empty if unknown.
+  core.v4alpha.Locality locality = 1;
+
+  // The total number of requests successfully completed by the endpoints in the
+  // locality.
+  uint64 total_successful_requests = 2;
+
+  // The total number of unfinished requests
+  uint64 total_requests_in_progress = 3;
+
+  // The total number of requests that failed due to errors at the endpoint,
+  // aggregated over all endpoints in the locality.
+  uint64 total_error_requests = 4;
+
+  // The total number of requests that were issued by this Envoy since
+  // the last report. This information is aggregated over all the
+  // upstream endpoints in the locality.
+  uint64 total_issued_requests = 8;
+
+  // Stats for multi-dimensional load balancing.
+  repeated EndpointLoadMetricStats load_metric_stats = 5;
+
+  // Endpoint granularity stats information for this locality. This information
+  // is populated if the Server requests it by setting
+  // :ref:`LoadStatsResponse.report_endpoint_granularity<envoy_v3_api_field_service.load_stats.v3.LoadStatsResponse.report_endpoint_granularity>`.
+  repeated UpstreamEndpointStats upstream_endpoint_stats = 7;
+
+  // [#not-implemented-hide:] The priority of the endpoint group these metrics
+  // were collected from.
+  uint32 priority = 6;
+}
+
+// [#next-free-field: 8]
+message UpstreamEndpointStats {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.UpstreamEndpointStats";
+
+  // Upstream host address.
+  core.v4alpha.Address address = 1;
+
+  // Opaque and implementation dependent metadata of the
+  // endpoint. Envoy will pass this directly to the management server.
+  google.protobuf.Struct metadata = 6;
+
+  // The total number of requests successfully completed by the endpoints in the
+  // locality. These include non-5xx responses for HTTP, where errors
+  // originate at the client and the endpoint responded successfully. For gRPC,
+  // the grpc-status values are those not covered by total_error_requests below.
+  uint64 total_successful_requests = 2;
+
+  // The total number of unfinished requests for this endpoint.
+  uint64 total_requests_in_progress = 3;
+
+  // The total number of requests that failed due to errors at the endpoint.
+  // For HTTP these are responses with 5xx status codes and for gRPC the
+  // grpc-status values:
+  //
+  //   - DeadlineExceeded
+  //   - Unimplemented
+  //   - Internal
+  //   - Unavailable
+  //   - Unknown
+  //   - DataLoss
+  uint64 total_error_requests = 4;
+
+  // The total number of requests that were issued to this endpoint
+  // since the last report. A single TCP connection, HTTP or gRPC
+  // request or stream is counted as one request.
+  uint64 total_issued_requests = 7;
+
+  // Stats for multi-dimensional load balancing.
+  repeated EndpointLoadMetricStats load_metric_stats = 5;
+}
+
+message EndpointLoadMetricStats {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.EndpointLoadMetricStats";
+
+  // Name of the metric; may be empty.
+  string metric_name = 1;
+
+  // Number of calls that finished and included this metric.
+  uint64 num_requests_finished_with_metric = 2;
+
+  // Sum of metric values across all calls that finished with this metric for
+  // load_reporting_interval.
+  double total_metric_value = 3;
+}
+
+// Per cluster load stats. Envoy reports these stats a management server in a
+// :ref:`LoadStatsRequest<envoy_v3_api_msg_service.load_stats.v3.LoadStatsRequest>`
+// Next ID: 7
+// [#next-free-field: 7]
+message ClusterStats {
+  option (udpa.annotations.versioning).previous_message_type =
+      "envoy.config.endpoint.v3.ClusterStats";
+
+  message DroppedRequests {
+    option (udpa.annotations.versioning).previous_message_type =
+        "envoy.config.endpoint.v3.ClusterStats.DroppedRequests";
+
+    // Identifier for the policy specifying the drop.
+    string category = 1 [(validate.rules).string = {min_len: 1}];
+
+    // Total number of deliberately dropped requests for the category.
+    uint64 dropped_count = 2;
+  }
+
+  // The name of the cluster.
+  string cluster_name = 1 [(validate.rules).string = {min_len: 1}];
+
+  // The eds_cluster_config service_name of the cluster.
+  // It's possible that two clusters send the same service_name to EDS,
+  // in that case, the management server is supposed to do aggregation on the load reports.
+  string cluster_service_name = 6;
+
+  // Need at least one.
+  repeated UpstreamLocalityStats upstream_locality_stats = 2
+      [(validate.rules).repeated = {min_items: 1}];
+
+  // Cluster-level stats such as total_successful_requests may be computed by
+  // summing upstream_locality_stats. In addition, below there are additional
+  // cluster-wide stats.
+  //
+  // The total number of dropped requests. This covers requests
+  // deliberately dropped by the drop_overload policy and circuit breaking.
+  uint64 total_dropped_requests = 3;
+
+  // Information about deliberately dropped requests for each category specified
+  // in the DropOverload policy.
+  repeated DroppedRequests dropped_requests = 5;
+
+  // Period over which the actual load report occurred. This will be guaranteed to include every
+  // request reported. Due to system load and delays between the *LoadStatsRequest* sent from Envoy
+  // and the *LoadStatsResponse* message sent from the management server, this may be longer than
+  // the requested load reporting interval in the *LoadStatsResponse*.
+  google.protobuf.Duration load_report_interval = 4;
+}
diff --git a/generated_api_shadow/envoy/service/endpoint/v3/leds.proto b/generated_api_shadow/envoy/service/endpoint/v3/leds.proto
new file mode 100644
index 0000000000000..89172f487eba0
--- /dev/null
+++ b/generated_api_shadow/envoy/service/endpoint/v3/leds.proto
@@ -0,0 +1,37 @@
+syntax = "proto3";
+
+package envoy.service.endpoint.v3;
+
+import "envoy/service/discovery/v3/discovery.proto";
+
+import "envoy/annotations/resource.proto";
+import "udpa/annotations/status.proto";
+
+option java_package = "io.envoyproxy.envoy.service.endpoint.v3";
+option java_outer_classname = "LedsProto";
+option java_multiple_files = true;
+option java_generic_services = true;
+option (udpa.annotations.file_status).package_version_status = ACTIVE;
+
+// [#not-implemented-hide:]
+// [#protodoc-title: LEDS]
+// Locality-Endpoint discovery
+// [#comment:TODO(adisuissa): Link to unified matching docs:
+// :ref:`architecture overview<arch_overview_service_discovery_types_leds>`]
+
+service LocalityEndpointDiscoveryService {
+  option (envoy.annotations.resource).type = "envoy.config.endpoint.v3.LbEndpoint";
+
+  // State-of-the-World (DiscoveryRequest) and REST are not supported.
+
+  // The resource_names_subscribe resource_names_unsubscribe fields in DeltaDiscoveryRequest
+  // specify a list of glob collections to subscribe to updates for.
+  rpc DeltaLocalityEndpoints(stream discovery.v3.DeltaDiscoveryRequest)
+      returns (stream discovery.v3.DeltaDiscoveryResponse) {
+  }
+}
+
+// [#not-implemented-hide:] Not configuration. Workaround c++ protobuf issue with importing
+// services: https://github.com/google/protobuf/issues/4221 and protoxform to upgrade the file.
+message LedsDummy {
+}
diff --git a/generated_api_shadow/envoy/service/health/v4alpha/BUILD b/generated_api_shadow/envoy/service/health/v4alpha/BUILD
index 37c2608f7c182..dc88ee92239b0 100644
--- a/generated_api_shadow/envoy/service/health/v4alpha/BUILD
+++ b/generated_api_shadow/envoy/service/health/v4alpha/BUILD
@@ -10,7 +10,7 @@ api_proto_package(
         "//envoy/annotations:pkg",
         "//envoy/config/cluster/v4alpha:pkg",
         "//envoy/config/core/v4alpha:pkg",
-        "//envoy/config/endpoint/v3:pkg",
+        "//envoy/config/endpoint/v4alpha:pkg",
         "//envoy/service/health/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],
diff --git a/generated_api_shadow/envoy/service/health/v4alpha/hds.proto b/generated_api_shadow/envoy/service/health/v4alpha/hds.proto
index 1b2446b109d8b..f9428b6381ae3 100644
--- a/generated_api_shadow/envoy/service/health/v4alpha/hds.proto
+++ b/generated_api_shadow/envoy/service/health/v4alpha/hds.proto
@@ -5,7 +5,7 @@ package envoy.service.health.v4alpha;
 import "envoy/config/cluster/v4alpha/cluster.proto";
 import "envoy/config/core/v4alpha/base.proto";
 import "envoy/config/core/v4alpha/health_check.proto";
-import "envoy/config/endpoint/v3/endpoint_components.proto";
+import "envoy/config/endpoint/v4alpha/endpoint_components.proto";
 
 import "google/api/annotations.proto";
 import "google/protobuf/duration.proto";
@@ -104,7 +104,7 @@ message EndpointHealth {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.service.health.v3.EndpointHealth";
 
-  config.endpoint.v3.Endpoint endpoint = 1;
+  config.endpoint.v4alpha.Endpoint endpoint = 1;
 
   config.core.v4alpha.HealthStatus health_status = 2;
 }
@@ -159,7 +159,7 @@ message LocalityEndpoints {
 
   config.core.v4alpha.Locality locality = 1;
 
-  repeated config.endpoint.v3.Endpoint endpoints = 2;
+  repeated config.endpoint.v4alpha.Endpoint endpoints = 2;
 }
 
 // The cluster name and locality is provided to Envoy for the endpoints that it
diff --git a/generated_api_shadow/envoy/service/load_stats/v4alpha/BUILD b/generated_api_shadow/envoy/service/load_stats/v4alpha/BUILD
index 91d914645041b..870673013a0e6 100644
--- a/generated_api_shadow/envoy/service/load_stats/v4alpha/BUILD
+++ b/generated_api_shadow/envoy/service/load_stats/v4alpha/BUILD
@@ -8,7 +8,7 @@ api_proto_package(
     has_services = True,
     deps = [
         "//envoy/config/core/v4alpha:pkg",
-        "//envoy/config/endpoint/v3:pkg",
+        "//envoy/config/endpoint/v4alpha:pkg",
         "//envoy/service/load_stats/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],
diff --git a/generated_api_shadow/envoy/service/load_stats/v4alpha/lrs.proto b/generated_api_shadow/envoy/service/load_stats/v4alpha/lrs.proto
index f99b6555f4a17..86bbe13186332 100644
--- a/generated_api_shadow/envoy/service/load_stats/v4alpha/lrs.proto
+++ b/generated_api_shadow/envoy/service/load_stats/v4alpha/lrs.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 package envoy.service.load_stats.v4alpha;
 
 import "envoy/config/core/v4alpha/base.proto";
-import "envoy/config/endpoint/v3/load_report.proto";
+import "envoy/config/endpoint/v4alpha/load_report.proto";
 
 import "google/protobuf/duration.proto";
 
@@ -68,7 +68,7 @@ message LoadStatsRequest {
   config.core.v4alpha.Node node = 1;
 
   // A list of load stats to report.
-  repeated config.endpoint.v3.ClusterStats cluster_stats = 2;
+  repeated config.endpoint.v4alpha.ClusterStats cluster_stats = 2;
 }
 
 // The management server sends envoy a LoadStatsResponse with all clusters it
diff --git a/tools/spelling/spelling_dictionary.txt b/tools/spelling/spelling_dictionary.txt
index cf48779ec8bac..726136a4ff301 100644
--- a/tools/spelling/spelling_dictionary.txt
+++ b/tools/spelling/spelling_dictionary.txt
@@ -183,6 +183,7 @@ Kille
 LBs
 LC
 LDS
+LEDS
 LEV
 LF
 LHS