diff --git a/envoy b/envoy
index 57a85315f4..82b1f66df2 160000
--- a/envoy
+++ b/envoy
@@ -1 +1 @@
-Subproject commit 57a85315f4ff34a2931b2eeea275578bccf23dd3
+Subproject commit 82b1f66df20d9577a24ea632f149481ba2f99edd
diff --git a/library/common/config/config.cc b/library/common/config/config.cc
index 7b0cd6081b..189b9eaff9 100644
--- a/library/common/config/config.cc
+++ b/library/common/config/config.cc
@@ -418,6 +418,7 @@ stats_sinks: *stats_sinks
         envoy:
           reloadable_features:
             allow_multiple_dns_addresses: *dns_multiple_addresses
+            override_request_timeout_by_gateway_timeout: false
 )"
 // Needed due to warning in
 // https://github.com/envoyproxy/envoy/blob/6eb7e642d33f5a55b63c367188f09819925fca34/source/server/server.cc#L546
diff --git a/library/common/engine.cc b/library/common/engine.cc
index 2d22285c12..8e460c11e3 100644
--- a/library/common/engine.cc
+++ b/library/common/engine.cc
@@ -270,7 +270,7 @@ envoy_status_t Engine::makeAdminCall(absl::string_view path, absl::string_view m
   std::string body;
   const auto code = server_->admin().request(path, method, *response_headers, body);
   if (code != Http::Code::OK) {
-    ENVOY_LOG(warn, "admin call failed with status {} body {}", code, body);
+    ENVOY_LOG(warn, "admin call failed with status {} body {}", static_cast<uint64_t>(code), body);
     return ENVOY_FAILURE;
   }
 
diff --git a/library/common/extensions/filters/http/local_error/filter.cc b/library/common/extensions/filters/http/local_error/filter.cc
index bc5ae4999d..0f6bd20bf4 100644
--- a/library/common/extensions/filters/http/local_error/filter.cc
+++ b/library/common/extensions/filters/http/local_error/filter.cc
@@ -8,7 +8,8 @@ namespace HttpFilters {
 namespace LocalError {
 
 Http::LocalErrorStatus LocalErrorFilter::onLocalReply(const LocalReplyData& reply) {
-  ENVOY_LOG(trace, "LocalErrorFilter::onLocalReply({}, {})", reply.code_, reply.details_);
+  ENVOY_LOG(trace, "LocalErrorFilter::onLocalReply({}, {})", static_cast<uint64_t>(reply.code_),
+            reply.details_);
   ASSERT(decoder_callbacks_);
   auto& info = decoder_callbacks_->streamInfo();
   // TODO(goaway): set responseCode in upstream Envoy when responseCodDetails are set.
diff --git a/test/swift/integration/IdleTimeoutTest.swift b/test/swift/integration/IdleTimeoutTest.swift
index cff72888e7..fd31bde902 100644
--- a/test/swift/integration/IdleTimeoutTest.swift
+++ b/test/swift/integration/IdleTimeoutTest.swift
@@ -81,6 +81,13 @@ static_resources:
         - endpoint:
             address:
               socket_address: { address: 127.0.0.1, port_value: \(remotePort) }
+layered_runtime:
+  layers:
+    - name: static_layer_0
+      static_layer:
+        envoy:
+          reloadable_features:
+            override_request_timeout_by_gateway_timeout: false
 """
 
     class IdleTimeoutValidationFilter: AsyncResponseFilter, ResponseFilter {