diff --git a/.bazelrc b/.bazelrc
index 315d5e69a..fa147f107 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -54,6 +54,10 @@ build:linux --features=per_object_debug_info
 build:linux --action_env=BAZEL_LINKLIBS=-l%:libstdc++.a
 build:linux --action_env=BAZEL_LINKOPTS=-lm
 
+# TODO(keith): remove once https://github.com/DataDog/dd-opentracing-cpp/pull/252 is integrated
+# this avoids warnings/errors on arm64 Linux builds
+build:linux --per_file_copt=external/com_github_datadog_dd_opentracing_cpp/.*.cpp@-Wno-type-limits
+
 # We already have absl in the build, define absl=1 to tell googletest to use absl for backtrace.
 build --define absl=1
 
@@ -384,6 +388,7 @@ build:windows --define tcmalloc=disabled
 build:windows --define wasm=disabled
 build:windows --define manual_stamp=manual_stamp
 build:windows --cxxopt="/std:c++17"
+build:windows --output_groups=+pdb_file
 
 # TODO(wrowe,sunjayBhatia): Resolve bugs upstream in curl and rules_foreign_cc
 # See issue https://github.com/bazelbuild/rules_foreign_cc/issues/301
diff --git a/.bazelversion b/.bazelversion
index 9f2e85218..ba8bc581b 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.0.0-pre.20220706.4
+6.0.0rc1
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index b5dc07f14..506fb623e 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -1,7 +1,7 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-ENVOY_COMMIT = "6b7c95d16667b757110df0f7dd234b4be6d914bf"
-ENVOY_SHA = "d6aeb870b55011e07190405098e2c1395d1fd8c96b691d243072ef17bb12cfd8"
+ENVOY_COMMIT = "77709fee8ccf4e6e24572c38d10b6fe880b68d0d"
+ENVOY_SHA = "fb2dfee46db50913e2aa1a67ca284e3eee7bca3bf292db33f6a5fd8d70e04548"
 
 HDR_HISTOGRAM_C_VERSION = "0.11.2"  # October 12th, 2020
 HDR_HISTOGRAM_C_SHA = "637f28b5f64de2e268131e4e34e6eef0b91cf5ff99167db447d9b2825eae6bad"
diff --git a/ci/run_envoy_docker.sh b/ci/run_envoy_docker.sh
index 79f32c540..60624df64 100755
--- a/ci/run_envoy_docker.sh
+++ b/ci/run_envoy_docker.sh
@@ -41,8 +41,9 @@ else
   BUILD_DIR_MOUNT_DEST=/build
   SOURCE_DIR="${PWD}"
   SOURCE_DIR_MOUNT_DEST=/source
-  START_COMMAND=("/bin/bash" "-lc" "groupadd --gid $(id -g) -f envoygroup \
-    && useradd -o --uid $(id -u) --gid $(id -g) --no-create-home --home-dir /build envoybuild \
+  DOCKER_GID="$(stat -c %g /var/run/docker.sock 2>/dev/null || stat -f %g /var/run/docker.sock)"
+  START_COMMAND=("/bin/bash" "-lc" "groupadd --gid ${DOCKER_GID} -f envoygroup \
+    && useradd -o --uid $(id -u) --gid ${DOCKER_GID} --no-create-home --home-dir /build envoybuild \
     && usermod -a -G pcap envoybuild \
     && chown envoybuild:envoygroup /build \
     && sudo -EHs -u envoybuild bash -c 'cd /source && $*'")
diff --git a/extensions_build_config.bzl b/extensions_build_config.bzl
index 2bf88eb84..db0d13a2e 100644
--- a/extensions_build_config.bzl
+++ b/extensions_build_config.bzl
@@ -17,3 +17,6 @@ DISABLED_BY_DEFAULT_EXTENSIONS = {
 EXTENSION_CONFIG_VISIBILITY = ["//visibility:public"]
 EXTENSION_PACKAGE_VISIBILITY = ["//visibility:public"]
 CONTRIB_EXTENSION_PACKAGE_VISIBILITY = ["//:contrib_library"]
+
+# Set this variable to true to disable alwayslink for envoy_cc_library.
+LEGACY_ALWAYSLINK = 1
diff --git a/tools/code_format/config.yaml b/tools/code_format/config.yaml
index 3ec8524d0..9bc4ff65c 100644
--- a/tools/code_format/config.yaml
+++ b/tools/code_format/config.yaml
@@ -304,6 +304,7 @@ unsorted_flags:
 # https://github.com/envoyproxy/envoy/issues/9953
 # PLEASE DO NOT ADD FILES TO THIS LIST WITHOUT SENIOR MAINTAINER APPROVAL
 visibility_excludes:
+- source/extensions/clusters/original_dst/
 - source/extensions/early_data/BUILD
 - source/extensions/filters/http/buffer/BUILD
 - source/extensions/filters/network/common/BUILD