diff --git a/envoy b/envoy
index 9c1980af8b..e4ae2259ad 160000
--- a/envoy
+++ b/envoy
@@ -1 +1 @@
-Subproject commit 9c1980af8bd5268a94d5e3a1e992e4b91ec7f6fc
+Subproject commit e4ae2259add5a327c4d67de18a82df5d78a801b4
diff --git a/envoy_build_config/BUILD b/envoy_build_config/BUILD
index 5dd9dacadd..9d540e6ea3 100644
--- a/envoy_build_config/BUILD
+++ b/envoy_build_config/BUILD
@@ -15,7 +15,7 @@ envoy_cc_library(
         "extension_registry_platform_additions",
         "@envoy//source/common/network:socket_lib",
         "@envoy//source/common/router:upstream_codec_filter_lib",
-        "@envoy//source/common/upstream:logical_dns_cluster_lib",
+        "@envoy//source/extensions/clusters/logical_dns:logical_dns_cluster_lib",
         "@envoy//source/extensions/clusters/dynamic_forward_proxy:cluster",
         "@envoy//source/extensions/compression/brotli/decompressor:config",
         "@envoy//source/extensions/compression/gzip/decompressor:config",
diff --git a/envoy_build_config/extension_registry.cc b/envoy_build_config/extension_registry.cc
index 8e24d20547..316f608b93 100644
--- a/envoy_build_config/extension_registry.cc
+++ b/envoy_build_config/extension_registry.cc
@@ -3,8 +3,8 @@
 #include "source/common/network/default_client_connection_factory.h"
 #include "source/common/network/socket_interface_impl.h"
 #include "source/common/router/upstream_codec_filter.h"
-#include "source/common/upstream/logical_dns_cluster.h"
 #include "source/extensions/clusters/dynamic_forward_proxy/cluster.h"
+#include "source/extensions/clusters/logical_dns/logical_dns_cluster.h"
 #include "source/extensions/compression/brotli/decompressor/config.h"
 #include "source/extensions/compression/gzip/decompressor/config.h"
 #include "source/extensions/filters/http/alternate_protocols_cache/config.h"
diff --git a/envoy_build_config/extensions_build_config.bzl b/envoy_build_config/extensions_build_config.bzl
index c5159c1495..9cfada670d 100644
--- a/envoy_build_config/extensions_build_config.bzl
+++ b/envoy_build_config/extensions_build_config.bzl
@@ -3,6 +3,7 @@ EXTENSION_CONFIG_VISIBILITY = ["//visibility:public"]
 EXTENSION_PACKAGE_VISIBILITY = ["//visibility:public"]
 EXTENSIONS = {
     "envoy.clusters.dynamic_forward_proxy":                "//source/extensions/clusters/dynamic_forward_proxy:cluster",
+    "envoy.clusters.logical_dns":                          "//source/extensions/clusters/logical_dns:logical_dns_cluster_lib",
     "envoy.filters.connection_pools.http.generic":         "//source/extensions/upstreams/http/generic:config",
     "envoy.filters.http.alternate_protocols_cache":        "//source/extensions/filters/http/alternate_protocols_cache:config",
     "envoy.filters.http.assertion":                        "@envoy_mobile//library/common/extensions/filters/http/assertion:config",
diff --git a/library/common/engine.h b/library/common/engine.h
index 825ae4082a..e5eb8c902c 100644
--- a/library/common/engine.h
+++ b/library/common/engine.h
@@ -3,7 +3,7 @@
 #include "envoy/server/lifecycle_notifier.h"
 
 #include "source/common/common/logger.h"
-#include "source/common/upstream/logical_dns_cluster.h"
+#include "source/extensions/clusters/logical_dns/logical_dns_cluster.h"
 
 #include "absl/base/call_once.h"
 #include "extension_registry.h"
diff --git a/library/common/extensions/key_value/platform/config.cc b/library/common/extensions/key_value/platform/config.cc
index aa605f19e1..a94a74c47a 100644
--- a/library/common/extensions/key_value/platform/config.cc
+++ b/library/common/extensions/key_value/platform/config.cc
@@ -62,9 +62,9 @@ PlatformKeyValueStore::PlatformKeyValueStore(Event::Dispatcher& dispatcher,
 
 void PlatformKeyValueStore::flush() {
   std::string output;
-  for (const auto& it : store_) {
-    absl::StrAppend(&output, it.first.length(), "\n", it.first, it.second.length(), "\n",
-                    it.second);
+  for (const auto& [key, value] : store_) {
+    std::string string_value = value.first;
+    absl::StrAppend(&output, key.length(), "\n", key, string_value.length(), "\n", string_value);
   }
   platform_interface_.save(key_, output);
 }