diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 8349d412a70..fea3b6be721 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -12,7 +12,7 @@
 ---
 # TODO(yannic): Ideally, we should also enable buildifier and all platforms should test `//...`.
 tasks:
-  ubuntu1804:
+  ubuntu2004:
     build_targets:
       - //:all
       - //src/proto/...
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2f760473574..14a883c7cdc 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,13 +1,11 @@
-# Auto-generated by the tools/mkowners/mkowners.py tool
-# Uses OWNERS files in different modules throughout the
-# repository as the source of truth for module ownership.
 /**/OWNERS @markdroth @a11r
-/bazel/** @jtattermusch @veblush @gnossen
-/cmake/** @jtattermusch @apolcyn
+/bazel/** @veblush @gnossen
+/bazel/experiments.yaml
+/cmake/** @veblush @apolcyn
 /src/core/ext/filters/client_channel/** @markdroth
 /src/core/ext/transport/chttp2/transport/** @ctiller
 /src/core/ext/xds/** @markdroth
 /src/core/lib/resolver/** @markdroth
 /src/core/lib/service_config/** @markdroth
-/tools/dockerfile/** @jtattermusch @apolcyn
+/tools/dockerfile/** @drfloob @apolcyn @gnossen
 /tools/run_tests/xds_k8s_test_driver/** @sergiitk @XuanWang-Amos @gnossen
diff --git a/.github/ISSUE_TEMPLATE/bug_report_csharp.md b/.github/ISSUE_TEMPLATE/bug_report_csharp.md
index e8317fa5678..7fcf3c46d31 100644
--- a/.github/ISSUE_TEMPLATE/bug_report_csharp.md
+++ b/.github/ISSUE_TEMPLATE/bug_report_csharp.md
@@ -2,7 +2,7 @@
 name: Report a gRPC C# bug
 about: Create a report to help us improve
 labels: kind/bug, priority/P2, lang/C#
-assignees: jtattermusch
+assignees: apolcyn
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request_csharp.md b/.github/ISSUE_TEMPLATE/feature_request_csharp.md
index e91d06eb4ca..5428d1f9658 100644
--- a/.github/ISSUE_TEMPLATE/feature_request_csharp.md
+++ b/.github/ISSUE_TEMPLATE/feature_request_csharp.md
@@ -2,7 +2,7 @@
 name: Request a gRPC C# feature
 about: Suggest an idea for this project
 labels: kind/enhancement, priority/P2, lang/C#
-assignees: jtattermusch
+assignees: apolcyn
 
 ---
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29bff9ed840..4455b799b10 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -883,6 +883,7 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx avl_test)
   add_dependencies(buildtests_cxx aws_request_signer_test)
   add_dependencies(buildtests_cxx b64_test)
+  add_dependencies(buildtests_cxx backend_metrics_lb_policy_test)
   add_dependencies(buildtests_cxx backoff_test)
   add_dependencies(buildtests_cxx bad_ping_test)
   add_dependencies(buildtests_cxx bad_server_response_test)
@@ -961,8 +962,6 @@ if(gRPC_BUILD_TESTS)
     add_dependencies(buildtests_cxx client_ssl_test)
   endif()
   add_dependencies(buildtests_cxx client_streaming_test)
-  add_dependencies(buildtests_cxx client_transport_error_test)
-  add_dependencies(buildtests_cxx client_transport_test)
   add_dependencies(buildtests_cxx cmdline_test)
   add_dependencies(buildtests_cxx codegen_test_full)
   add_dependencies(buildtests_cxx codegen_test_minimal)
@@ -1047,7 +1046,7 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx forkable_test)
   add_dependencies(buildtests_cxx format_request_test)
   add_dependencies(buildtests_cxx frame_handler_test)
-  add_dependencies(buildtests_cxx frame_header_test)
+  add_dependencies(buildtests_cxx frame_test)
   if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_POSIX)
     add_dependencies(buildtests_cxx fuzzing_event_engine_test)
   endif()
@@ -1197,7 +1196,6 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx percent_encoding_test)
   add_dependencies(buildtests_cxx periodic_update_test)
   add_dependencies(buildtests_cxx pick_first_test)
-  add_dependencies(buildtests_cxx pid_controller_test)
   add_dependencies(buildtests_cxx ping_abuse_policy_test)
   add_dependencies(buildtests_cxx ping_callbacks_test)
   add_dependencies(buildtests_cxx ping_configuration_test)
@@ -1375,6 +1373,7 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx streams_not_seen_test)
   add_dependencies(buildtests_cxx string_ref_test)
   add_dependencies(buildtests_cxx string_test)
+  add_dependencies(buildtests_cxx switch_test)
   add_dependencies(buildtests_cxx sync_test)
   add_dependencies(buildtests_cxx system_roots_test)
   add_dependencies(buildtests_cxx table_test)
@@ -1405,8 +1404,6 @@ if(gRPC_BUILD_TESTS)
   add_dependencies(buildtests_cxx test_core_security_ssl_credentials_test)
   add_dependencies(buildtests_cxx test_core_slice_slice_buffer_test)
   add_dependencies(buildtests_cxx test_core_slice_slice_test)
-  add_dependencies(buildtests_cxx test_core_transport_chaotic_good_frame_test)
-  add_dependencies(buildtests_cxx test_core_transport_chttp2_frame_test)
   add_dependencies(buildtests_cxx test_cpp_client_credentials_test)
   add_dependencies(buildtests_cxx test_cpp_end2end_ssl_credentials_test)
   add_dependencies(buildtests_cxx test_cpp_server_credentials_test)
@@ -2257,7 +2254,7 @@ add_library(grpc
   src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
   src/core/lib/event_engine/posix_engine/internal_errqueue.cc
   src/core/lib/event_engine/posix_engine/lockfree_event.cc
-  src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
+  src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc
   src/core/lib/event_engine/posix_engine/posix_endpoint.cc
   src/core/lib/event_engine/posix_engine/posix_engine.cc
   src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -2284,6 +2281,7 @@ add_library(grpc
   src/core/lib/event_engine/utils.cc
   src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
   src/core/lib/event_engine/windows/iocp.cc
+  src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
   src/core/lib/event_engine/windows/win_socket.cc
   src/core/lib/event_engine/windows/windows_endpoint.cc
   src/core/lib/event_engine/windows/windows_engine.cc
@@ -2509,7 +2507,6 @@ add_library(grpc
   src/core/lib/transport/http_connect_handshaker.cc
   src/core/lib/transport/metadata_batch.cc
   src/core/lib/transport/parsed_metadata.cc
-  src/core/lib/transport/pid_controller.cc
   src/core/lib/transport/status_conversion.cc
   src/core/lib/transport/tcp_connect_handshaker.cc
   src/core/lib/transport/timeout_encoding.cc
@@ -2989,7 +2986,7 @@ add_library(grpc_unsecure
   src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
   src/core/lib/event_engine/posix_engine/internal_errqueue.cc
   src/core/lib/event_engine/posix_engine/lockfree_event.cc
-  src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
+  src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc
   src/core/lib/event_engine/posix_engine/posix_endpoint.cc
   src/core/lib/event_engine/posix_engine/posix_engine.cc
   src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -3016,6 +3013,7 @@ add_library(grpc_unsecure
   src/core/lib/event_engine/utils.cc
   src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
   src/core/lib/event_engine/windows/iocp.cc
+  src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
   src/core/lib/event_engine/windows/win_socket.cc
   src/core/lib/event_engine/windows/windows_endpoint.cc
   src/core/lib/event_engine/windows/windows_engine.cc
@@ -3202,7 +3200,6 @@ add_library(grpc_unsecure
   src/core/lib/transport/http_connect_handshaker.cc
   src/core/lib/transport/metadata_batch.cc
   src/core/lib/transport/parsed_metadata.cc
-  src/core/lib/transport/pid_controller.cc
   src/core/lib/transport/status_conversion.cc
   src/core/lib/transport/tcp_connect_handshaker.cc
   src/core/lib/transport/timeout_encoding.cc
@@ -4979,7 +4976,7 @@ add_library(grpc_authorization_provider
   src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
   src/core/lib/event_engine/posix_engine/internal_errqueue.cc
   src/core/lib/event_engine/posix_engine/lockfree_event.cc
-  src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
+  src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc
   src/core/lib/event_engine/posix_engine/posix_endpoint.cc
   src/core/lib/event_engine/posix_engine/posix_engine.cc
   src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -5006,6 +5003,7 @@ add_library(grpc_authorization_provider
   src/core/lib/event_engine/utils.cc
   src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
   src/core/lib/event_engine/windows/iocp.cc
+  src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
   src/core/lib/event_engine/windows/win_socket.cc
   src/core/lib/event_engine/windows/windows_endpoint.cc
   src/core/lib/event_engine/windows/windows_engine.cc
@@ -6856,6 +6854,55 @@ target_link_libraries(b64_test
 )
 
 
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(backend_metrics_lb_policy_test
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/empty.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/messages.grpc.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.cc
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.pb.h
+  ${_gRPC_PROTO_GENS_DIR}/src/proto/grpc/testing/test.grpc.pb.h
+  src/cpp/server/orca/orca_service.cc
+  test/cpp/interop/backend_metrics_lb_policy.cc
+  test/cpp/interop/backend_metrics_lb_policy_test.cc
+)
+target_compile_features(backend_metrics_lb_policy_test PUBLIC cxx_std_14)
+target_include_directories(backend_metrics_lb_policy_test
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+    ${_gRPC_RE2_INCLUDE_DIR}
+    ${_gRPC_SSL_INCLUDE_DIR}
+    ${_gRPC_UPB_GENERATED_DIR}
+    ${_gRPC_UPB_GRPC_GENERATED_DIR}
+    ${_gRPC_UPB_INCLUDE_DIR}
+    ${_gRPC_XXHASH_INCLUDE_DIR}
+    ${_gRPC_ZLIB_INCLUDE_DIR}
+    third_party/googletest/googletest/include
+    third_party/googletest/googletest
+    third_party/googletest/googlemock/include
+    third_party/googletest/googlemock
+    ${_gRPC_PROTO_GENS_DIR}
+)
+
+target_link_libraries(backend_metrics_lb_policy_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  grpc++
+  grpc_test_util
+  grpc++_test_config
+)
+
+
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -9532,92 +9579,6 @@ target_link_libraries(client_streaming_test
 )
 
 
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(client_transport_error_test
-  ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.grpc.pb.h
-  src/core/ext/transport/chaotic_good/client_transport.cc
-  src/core/ext/transport/chaotic_good/frame.cc
-  src/core/ext/transport/chaotic_good/frame_header.cc
-  src/core/lib/transport/promise_endpoint.cc
-  test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
-  test/core/transport/chaotic_good/client_transport_error_test.cc
-)
-target_compile_features(client_transport_error_test PUBLIC cxx_std_14)
-target_include_directories(client_transport_error_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(client_transport_error_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  ${_gRPC_PROTOBUF_LIBRARIES}
-  grpc_test_util
-)
-
-
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(client_transport_test
-  ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.grpc.pb.cc
-  ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h
-  ${_gRPC_PROTO_GENS_DIR}/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.grpc.pb.h
-  src/core/ext/transport/chaotic_good/client_transport.cc
-  src/core/ext/transport/chaotic_good/frame.cc
-  src/core/ext/transport/chaotic_good/frame_header.cc
-  src/core/lib/transport/promise_endpoint.cc
-  test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
-  test/core/transport/chaotic_good/client_transport_test.cc
-)
-target_compile_features(client_transport_test PUBLIC cxx_std_14)
-target_include_directories(client_transport_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(client_transport_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  ${_gRPC_PROTOBUF_LIBRARIES}
-  grpc_test_util
-)
-
-
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -12234,7 +12195,6 @@ add_executable(flow_control_test
   src/core/lib/slice/slice_refcount.cc
   src/core/lib/slice/slice_string_helpers.cc
   src/core/lib/transport/bdp_estimator.cc
-  src/core/lib/transport/pid_controller.cc
   test/core/transport/chttp2/flow_control_test.cc
   third_party/upb/upb/hash/common.c
   third_party/upb/upb/message/accessors.c
@@ -12528,12 +12488,17 @@ target_link_libraries(frame_handler_test
 endif()
 if(gRPC_BUILD_TESTS)
 
-add_executable(frame_header_test
-  src/core/ext/transport/chaotic_good/frame_header.cc
-  test/core/transport/chaotic_good/frame_header_test.cc
+add_executable(frame_test
+  src/core/ext/transport/chttp2/transport/frame.cc
+  src/core/lib/debug/trace.cc
+  src/core/lib/slice/slice.cc
+  src/core/lib/slice/slice_buffer.cc
+  src/core/lib/slice/slice_refcount.cc
+  src/core/lib/slice/slice_string_helpers.cc
+  test/core/transport/chttp2/frame_test.cc
 )
-target_compile_features(frame_header_test PUBLIC cxx_std_14)
-target_include_directories(frame_header_test
+target_compile_features(frame_test PUBLIC cxx_std_14)
+target_include_directories(frame_test
   PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -12552,10 +12517,12 @@ target_include_directories(frame_header_test
     ${_gRPC_PROTO_GENS_DIR}
 )
 
-target_link_libraries(frame_header_test
+target_link_libraries(frame_test
   ${_gRPC_ALLTARGETS_LIBRARIES}
   gtest
+  absl::hash
   absl::statusor
+  absl::span
   gpr
 )
 
@@ -17809,49 +17776,6 @@ target_link_libraries(pick_first_test
 )
 
 
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(pid_controller_test
-  test/core/transport/pid_controller_test.cc
-  test/core/util/cmdline.cc
-  test/core/util/fuzzer_util.cc
-  test/core/util/grpc_profiler.cc
-  test/core/util/histogram.cc
-  test/core/util/mock_endpoint.cc
-  test/core/util/parse_hexstring.cc
-  test/core/util/passthru_endpoint.cc
-  test/core/util/resolve_localhost_ip46.cc
-  test/core/util/slice_splitter.cc
-  test/core/util/tracer_util.cc
-)
-target_compile_features(pid_controller_test PUBLIC cxx_std_14)
-target_include_directories(pid_controller_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(pid_controller_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  grpc_test_util
-)
-
-
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -23776,6 +23700,41 @@ target_link_libraries(string_test
 )
 
 
+endif()
+if(gRPC_BUILD_TESTS)
+
+add_executable(switch_test
+  test/core/promise/switch_test.cc
+)
+target_compile_features(switch_test PUBLIC cxx_std_14)
+target_include_directories(switch_test
+  PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/include
+    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
+    ${_gRPC_RE2_INCLUDE_DIR}
+    ${_gRPC_SSL_INCLUDE_DIR}
+    ${_gRPC_UPB_GENERATED_DIR}
+    ${_gRPC_UPB_GRPC_GENERATED_DIR}
+    ${_gRPC_UPB_INCLUDE_DIR}
+    ${_gRPC_XXHASH_INCLUDE_DIR}
+    ${_gRPC_ZLIB_INCLUDE_DIR}
+    third_party/googletest/googletest/include
+    third_party/googletest/googletest
+    third_party/googletest/googlemock/include
+    third_party/googletest/googlemock
+    ${_gRPC_PROTO_GENS_DIR}
+)
+
+target_link_libraries(switch_test
+  ${_gRPC_ALLTARGETS_LIBRARIES}
+  gtest
+  absl::type_traits
+  absl::statusor
+  gpr
+)
+
+
 endif()
 if(gRPC_BUILD_TESTS)
 
@@ -24635,359 +24594,6 @@ target_link_libraries(test_core_slice_slice_test
 )
 
 
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(test_core_transport_chaotic_good_frame_test
-  src/core/ext/transport/chaotic_good/frame.cc
-  src/core/ext/transport/chaotic_good/frame_header.cc
-  src/core/ext/transport/chttp2/transport/bin_encoder.cc
-  src/core/ext/transport/chttp2/transport/decode_huff.cc
-  src/core/ext/transport/chttp2/transport/hpack_encoder.cc
-  src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc
-  src/core/ext/transport/chttp2/transport/hpack_parse_result.cc
-  src/core/ext/transport/chttp2/transport/hpack_parser.cc
-  src/core/ext/transport/chttp2/transport/hpack_parser_table.cc
-  src/core/ext/transport/chttp2/transport/http_trace.cc
-  src/core/ext/transport/chttp2/transport/huffsyms.cc
-  src/core/ext/transport/chttp2/transport/varint.cc
-  src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
-  src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
-  src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
-  src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
-  src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c
-  src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c
-  src/core/lib/address_utils/parse_address.cc
-  src/core/lib/address_utils/sockaddr_utils.cc
-  src/core/lib/backoff/backoff.cc
-  src/core/lib/backoff/random_early_detection.cc
-  src/core/lib/channel/call_tracer.cc
-  src/core/lib/channel/channel_args.cc
-  src/core/lib/channel/channel_args_preconditioning.cc
-  src/core/lib/channel/channel_stack.cc
-  src/core/lib/channel/channel_stack_builder.cc
-  src/core/lib/channel/channel_stack_builder_impl.cc
-  src/core/lib/channel/channel_stack_trace.cc
-  src/core/lib/channel/channel_trace.cc
-  src/core/lib/channel/channelz.cc
-  src/core/lib/channel/channelz_registry.cc
-  src/core/lib/channel/connected_channel.cc
-  src/core/lib/channel/promise_based_filter.cc
-  src/core/lib/channel/server_call_tracer_filter.cc
-  src/core/lib/channel/status_util.cc
-  src/core/lib/compression/compression.cc
-  src/core/lib/compression/compression_internal.cc
-  src/core/lib/compression/message_compress.cc
-  src/core/lib/config/core_configuration.cc
-  src/core/lib/debug/event_log.cc
-  src/core/lib/debug/histogram_view.cc
-  src/core/lib/debug/stats.cc
-  src/core/lib/debug/stats_data.cc
-  src/core/lib/debug/trace.cc
-  src/core/lib/event_engine/ares_resolver.cc
-  src/core/lib/event_engine/cf_engine/cf_engine.cc
-  src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
-  src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
-  src/core/lib/event_engine/channel_args_endpoint_config.cc
-  src/core/lib/event_engine/default_event_engine.cc
-  src/core/lib/event_engine/default_event_engine_factory.cc
-  src/core/lib/event_engine/event_engine.cc
-  src/core/lib/event_engine/forkable.cc
-  src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
-  src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
-  src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
-  src/core/lib/event_engine/posix_engine/internal_errqueue.cc
-  src/core/lib/event_engine/posix_engine/lockfree_event.cc
-  src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
-  src/core/lib/event_engine/posix_engine/posix_endpoint.cc
-  src/core/lib/event_engine/posix_engine/posix_engine.cc
-  src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
-  src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc
-  src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc
-  src/core/lib/event_engine/posix_engine/timer.cc
-  src/core/lib/event_engine/posix_engine/timer_heap.cc
-  src/core/lib/event_engine/posix_engine/timer_manager.cc
-  src/core/lib/event_engine/posix_engine/traced_buffer_list.cc
-  src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc
-  src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc
-  src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc
-  src/core/lib/event_engine/resolved_address.cc
-  src/core/lib/event_engine/shim.cc
-  src/core/lib/event_engine/slice.cc
-  src/core/lib/event_engine/slice_buffer.cc
-  src/core/lib/event_engine/tcp_socket_utils.cc
-  src/core/lib/event_engine/thread_pool/thread_count.cc
-  src/core/lib/event_engine/thread_pool/thread_pool_factory.cc
-  src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc
-  src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc
-  src/core/lib/event_engine/time_util.cc
-  src/core/lib/event_engine/trace.cc
-  src/core/lib/event_engine/utils.cc
-  src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
-  src/core/lib/event_engine/windows/iocp.cc
-  src/core/lib/event_engine/windows/win_socket.cc
-  src/core/lib/event_engine/windows/windows_endpoint.cc
-  src/core/lib/event_engine/windows/windows_engine.cc
-  src/core/lib/event_engine/windows/windows_listener.cc
-  src/core/lib/event_engine/work_queue/basic_work_queue.cc
-  src/core/lib/experiments/config.cc
-  src/core/lib/experiments/experiments.cc
-  src/core/lib/gprpp/load_file.cc
-  src/core/lib/gprpp/per_cpu.cc
-  src/core/lib/gprpp/ref_counted_string.cc
-  src/core/lib/gprpp/status_helper.cc
-  src/core/lib/gprpp/time.cc
-  src/core/lib/gprpp/time_averaged_stats.cc
-  src/core/lib/gprpp/validation_errors.cc
-  src/core/lib/gprpp/work_serializer.cc
-  src/core/lib/handshaker/proxy_mapper_registry.cc
-  src/core/lib/iomgr/buffer_list.cc
-  src/core/lib/iomgr/call_combiner.cc
-  src/core/lib/iomgr/cfstream_handle.cc
-  src/core/lib/iomgr/closure.cc
-  src/core/lib/iomgr/combiner.cc
-  src/core/lib/iomgr/dualstack_socket_posix.cc
-  src/core/lib/iomgr/endpoint.cc
-  src/core/lib/iomgr/endpoint_cfstream.cc
-  src/core/lib/iomgr/endpoint_pair_posix.cc
-  src/core/lib/iomgr/endpoint_pair_windows.cc
-  src/core/lib/iomgr/error.cc
-  src/core/lib/iomgr/error_cfstream.cc
-  src/core/lib/iomgr/ev_apple.cc
-  src/core/lib/iomgr/ev_epoll1_linux.cc
-  src/core/lib/iomgr/ev_poll_posix.cc
-  src/core/lib/iomgr/ev_posix.cc
-  src/core/lib/iomgr/ev_windows.cc
-  src/core/lib/iomgr/event_engine_shims/closure.cc
-  src/core/lib/iomgr/event_engine_shims/endpoint.cc
-  src/core/lib/iomgr/event_engine_shims/tcp_client.cc
-  src/core/lib/iomgr/exec_ctx.cc
-  src/core/lib/iomgr/executor.cc
-  src/core/lib/iomgr/fork_posix.cc
-  src/core/lib/iomgr/fork_windows.cc
-  src/core/lib/iomgr/gethostname_fallback.cc
-  src/core/lib/iomgr/gethostname_host_name_max.cc
-  src/core/lib/iomgr/gethostname_sysconf.cc
-  src/core/lib/iomgr/grpc_if_nametoindex_posix.cc
-  src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc
-  src/core/lib/iomgr/internal_errqueue.cc
-  src/core/lib/iomgr/iocp_windows.cc
-  src/core/lib/iomgr/iomgr.cc
-  src/core/lib/iomgr/iomgr_internal.cc
-  src/core/lib/iomgr/iomgr_posix.cc
-  src/core/lib/iomgr/iomgr_posix_cfstream.cc
-  src/core/lib/iomgr/iomgr_windows.cc
-  src/core/lib/iomgr/load_file.cc
-  src/core/lib/iomgr/lockfree_event.cc
-  src/core/lib/iomgr/polling_entity.cc
-  src/core/lib/iomgr/pollset.cc
-  src/core/lib/iomgr/pollset_set.cc
-  src/core/lib/iomgr/pollset_set_windows.cc
-  src/core/lib/iomgr/pollset_windows.cc
-  src/core/lib/iomgr/resolve_address.cc
-  src/core/lib/iomgr/resolve_address_posix.cc
-  src/core/lib/iomgr/resolve_address_windows.cc
-  src/core/lib/iomgr/sockaddr_utils_posix.cc
-  src/core/lib/iomgr/socket_factory_posix.cc
-  src/core/lib/iomgr/socket_mutator.cc
-  src/core/lib/iomgr/socket_utils_common_posix.cc
-  src/core/lib/iomgr/socket_utils_linux.cc
-  src/core/lib/iomgr/socket_utils_posix.cc
-  src/core/lib/iomgr/socket_utils_windows.cc
-  src/core/lib/iomgr/socket_windows.cc
-  src/core/lib/iomgr/systemd_utils.cc
-  src/core/lib/iomgr/tcp_client.cc
-  src/core/lib/iomgr/tcp_client_cfstream.cc
-  src/core/lib/iomgr/tcp_client_posix.cc
-  src/core/lib/iomgr/tcp_client_windows.cc
-  src/core/lib/iomgr/tcp_posix.cc
-  src/core/lib/iomgr/tcp_server.cc
-  src/core/lib/iomgr/tcp_server_posix.cc
-  src/core/lib/iomgr/tcp_server_utils_posix_common.cc
-  src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc
-  src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc
-  src/core/lib/iomgr/tcp_server_windows.cc
-  src/core/lib/iomgr/tcp_windows.cc
-  src/core/lib/iomgr/timer.cc
-  src/core/lib/iomgr/timer_generic.cc
-  src/core/lib/iomgr/timer_heap.cc
-  src/core/lib/iomgr/timer_manager.cc
-  src/core/lib/iomgr/unix_sockets_posix.cc
-  src/core/lib/iomgr/unix_sockets_posix_noop.cc
-  src/core/lib/iomgr/vsock.cc
-  src/core/lib/iomgr/wakeup_fd_eventfd.cc
-  src/core/lib/iomgr/wakeup_fd_nospecial.cc
-  src/core/lib/iomgr/wakeup_fd_pipe.cc
-  src/core/lib/iomgr/wakeup_fd_posix.cc
-  src/core/lib/json/json_writer.cc
-  src/core/lib/load_balancing/lb_policy.cc
-  src/core/lib/load_balancing/lb_policy_registry.cc
-  src/core/lib/promise/activity.cc
-  src/core/lib/promise/party.cc
-  src/core/lib/promise/trace.cc
-  src/core/lib/resolver/endpoint_addresses.cc
-  src/core/lib/resolver/resolver.cc
-  src/core/lib/resolver/resolver_registry.cc
-  src/core/lib/resource_quota/api.cc
-  src/core/lib/resource_quota/arena.cc
-  src/core/lib/resource_quota/memory_quota.cc
-  src/core/lib/resource_quota/periodic_update.cc
-  src/core/lib/resource_quota/resource_quota.cc
-  src/core/lib/resource_quota/thread_quota.cc
-  src/core/lib/resource_quota/trace.cc
-  src/core/lib/security/certificate_provider/certificate_provider_registry.cc
-  src/core/lib/security/credentials/alts/check_gcp_environment.cc
-  src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc
-  src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc
-  src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-  src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc
-  src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc
-  src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc
-  src/core/lib/service_config/service_config_parser.cc
-  src/core/lib/slice/b64.cc
-  src/core/lib/slice/percent_encoding.cc
-  src/core/lib/slice/slice.cc
-  src/core/lib/slice/slice_buffer.cc
-  src/core/lib/slice/slice_refcount.cc
-  src/core/lib/slice/slice_string_helpers.cc
-  src/core/lib/surface/api_trace.cc
-  src/core/lib/surface/builtins.cc
-  src/core/lib/surface/byte_buffer.cc
-  src/core/lib/surface/byte_buffer_reader.cc
-  src/core/lib/surface/call.cc
-  src/core/lib/surface/call_details.cc
-  src/core/lib/surface/call_log_batch.cc
-  src/core/lib/surface/call_trace.cc
-  src/core/lib/surface/channel.cc
-  src/core/lib/surface/channel_init.cc
-  src/core/lib/surface/channel_ping.cc
-  src/core/lib/surface/channel_stack_type.cc
-  src/core/lib/surface/completion_queue.cc
-  src/core/lib/surface/completion_queue_factory.cc
-  src/core/lib/surface/event_string.cc
-  src/core/lib/surface/init_internally.cc
-  src/core/lib/surface/lame_client.cc
-  src/core/lib/surface/metadata_array.cc
-  src/core/lib/surface/server.cc
-  src/core/lib/surface/validate_metadata.cc
-  src/core/lib/surface/version.cc
-  src/core/lib/transport/batch_builder.cc
-  src/core/lib/transport/connectivity_state.cc
-  src/core/lib/transport/error_utils.cc
-  src/core/lib/transport/handshaker_registry.cc
-  src/core/lib/transport/metadata_batch.cc
-  src/core/lib/transport/parsed_metadata.cc
-  src/core/lib/transport/status_conversion.cc
-  src/core/lib/transport/timeout_encoding.cc
-  src/core/lib/transport/transport.cc
-  src/core/lib/transport/transport_op_string.cc
-  src/core/lib/uri/uri_parser.cc
-  src/core/tsi/alts/handshaker/transport_security_common_api.cc
-  test/core/transport/chaotic_good/frame_test.cc
-  third_party/upb/upb/hash/common.c
-  third_party/upb/upb/message/accessors.c
-  third_party/upb/upb/message/array.c
-  third_party/upb/upb/message/map.c
-  third_party/upb/upb/message/map_sorter.c
-  third_party/upb/upb/message/message.c
-  third_party/upb/upb/mini_descriptor/build_enum.c
-  third_party/upb/upb/mini_descriptor/decode.c
-  third_party/upb/upb/mini_descriptor/internal/base92.c
-  third_party/upb/upb/mini_descriptor/internal/encode.c
-  third_party/upb/upb/mini_descriptor/link.c
-  third_party/upb/upb/mini_table/extension_registry.c
-  third_party/upb/upb/mini_table/internal/message.c
-  third_party/upb/upb/mini_table/message.c
-  third_party/upb/upb/wire/decode.c
-  third_party/upb/upb/wire/decode_fast.c
-  third_party/upb/upb/wire/encode.c
-  third_party/upb/upb/wire/eps_copy_input_stream.c
-  third_party/upb/upb/wire/reader.c
-)
-target_compile_features(test_core_transport_chaotic_good_frame_test PUBLIC cxx_std_14)
-target_include_directories(test_core_transport_chaotic_good_frame_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(test_core_transport_chaotic_good_frame_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  upb
-  utf8_range_lib
-  ${_gRPC_ZLIB_LIBRARIES}
-  absl::cleanup
-  absl::flat_hash_map
-  absl::inlined_vector
-  absl::function_ref
-  absl::hash
-  absl::type_traits
-  absl::random_bit_gen_ref
-  absl::random_distributions
-  absl::statusor
-  absl::span
-  absl::utility
-  ${_gRPC_CARES_LIBRARIES}
-  gpr
-)
-
-
-endif()
-if(gRPC_BUILD_TESTS)
-
-add_executable(test_core_transport_chttp2_frame_test
-  src/core/ext/transport/chttp2/transport/frame.cc
-  src/core/lib/debug/trace.cc
-  src/core/lib/slice/slice.cc
-  src/core/lib/slice/slice_buffer.cc
-  src/core/lib/slice/slice_refcount.cc
-  src/core/lib/slice/slice_string_helpers.cc
-  test/core/transport/chttp2/frame_test.cc
-)
-target_compile_features(test_core_transport_chttp2_frame_test PUBLIC cxx_std_14)
-target_include_directories(test_core_transport_chttp2_frame_test
-  PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${_gRPC_ADDRESS_SORTING_INCLUDE_DIR}
-    ${_gRPC_RE2_INCLUDE_DIR}
-    ${_gRPC_SSL_INCLUDE_DIR}
-    ${_gRPC_UPB_GENERATED_DIR}
-    ${_gRPC_UPB_GRPC_GENERATED_DIR}
-    ${_gRPC_UPB_INCLUDE_DIR}
-    ${_gRPC_XXHASH_INCLUDE_DIR}
-    ${_gRPC_ZLIB_INCLUDE_DIR}
-    third_party/googletest/googletest/include
-    third_party/googletest/googletest
-    third_party/googletest/googlemock/include
-    third_party/googletest/googlemock
-    ${_gRPC_PROTO_GENS_DIR}
-)
-
-target_link_libraries(test_core_transport_chttp2_frame_test
-  ${_gRPC_ALLTARGETS_LIBRARIES}
-  gtest
-  absl::hash
-  absl::statusor
-  absl::span
-  gpr
-)
-
-
 endif()
 if(gRPC_BUILD_TESTS)
 
diff --git a/Makefile b/Makefile
index 1a7be6843e5..1d547978b3d 100644
--- a/Makefile
+++ b/Makefile
@@ -1455,7 +1455,7 @@ LIBGRPC_SRC = \
     src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc \
     src/core/lib/event_engine/posix_engine/internal_errqueue.cc \
     src/core/lib/event_engine/posix_engine/lockfree_event.cc \
-    src/core/lib/event_engine/posix_engine/native_dns_resolver.cc \
+    src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc \
     src/core/lib/event_engine/posix_engine/posix_endpoint.cc \
     src/core/lib/event_engine/posix_engine/posix_engine.cc \
     src/core/lib/event_engine/posix_engine/posix_engine_listener.cc \
@@ -1482,6 +1482,7 @@ LIBGRPC_SRC = \
     src/core/lib/event_engine/utils.cc \
     src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc \
     src/core/lib/event_engine/windows/iocp.cc \
+    src/core/lib/event_engine/windows/native_windows_dns_resolver.cc \
     src/core/lib/event_engine/windows/win_socket.cc \
     src/core/lib/event_engine/windows/windows_endpoint.cc \
     src/core/lib/event_engine/windows/windows_engine.cc \
@@ -1707,7 +1708,6 @@ LIBGRPC_SRC = \
     src/core/lib/transport/http_connect_handshaker.cc \
     src/core/lib/transport/metadata_batch.cc \
     src/core/lib/transport/parsed_metadata.cc \
-    src/core/lib/transport/pid_controller.cc \
     src/core/lib/transport/status_conversion.cc \
     src/core/lib/transport/tcp_connect_handshaker.cc \
     src/core/lib/transport/timeout_encoding.cc \
@@ -2037,7 +2037,7 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc \
     src/core/lib/event_engine/posix_engine/internal_errqueue.cc \
     src/core/lib/event_engine/posix_engine/lockfree_event.cc \
-    src/core/lib/event_engine/posix_engine/native_dns_resolver.cc \
+    src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc \
     src/core/lib/event_engine/posix_engine/posix_endpoint.cc \
     src/core/lib/event_engine/posix_engine/posix_engine.cc \
     src/core/lib/event_engine/posix_engine/posix_engine_listener.cc \
@@ -2064,6 +2064,7 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/lib/event_engine/utils.cc \
     src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc \
     src/core/lib/event_engine/windows/iocp.cc \
+    src/core/lib/event_engine/windows/native_windows_dns_resolver.cc \
     src/core/lib/event_engine/windows/win_socket.cc \
     src/core/lib/event_engine/windows/windows_endpoint.cc \
     src/core/lib/event_engine/windows/windows_engine.cc \
@@ -2250,7 +2251,6 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/lib/transport/http_connect_handshaker.cc \
     src/core/lib/transport/metadata_batch.cc \
     src/core/lib/transport/parsed_metadata.cc \
-    src/core/lib/transport/pid_controller.cc \
     src/core/lib/transport/status_conversion.cc \
     src/core/lib/transport/tcp_connect_handshaker.cc \
     src/core/lib/transport/timeout_encoding.cc \
diff --git a/Package.swift b/Package.swift
index 28c12d76d09..909c493af11 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1289,8 +1289,8 @@ let package = Package(
         "src/core/lib/event_engine/posix_engine/internal_errqueue.h",
         "src/core/lib/event_engine/posix_engine/lockfree_event.cc",
         "src/core/lib/event_engine/posix_engine/lockfree_event.h",
-        "src/core/lib/event_engine/posix_engine/native_dns_resolver.cc",
-        "src/core/lib/event_engine/posix_engine/native_dns_resolver.h",
+        "src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc",
+        "src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h",
         "src/core/lib/event_engine/posix_engine/posix_endpoint.cc",
         "src/core/lib/event_engine/posix_engine/posix_endpoint.h",
         "src/core/lib/event_engine/posix_engine/posix_engine.cc",
@@ -1346,6 +1346,8 @@ let package = Package(
         "src/core/lib/event_engine/windows/grpc_polled_fd_windows.h",
         "src/core/lib/event_engine/windows/iocp.cc",
         "src/core/lib/event_engine/windows/iocp.h",
+        "src/core/lib/event_engine/windows/native_windows_dns_resolver.cc",
+        "src/core/lib/event_engine/windows/native_windows_dns_resolver.h",
         "src/core/lib/event_engine/windows/win_socket.cc",
         "src/core/lib/event_engine/windows/win_socket.h",
         "src/core/lib/event_engine/windows/windows_endpoint.cc",
@@ -1903,8 +1905,6 @@ let package = Package(
         "src/core/lib/transport/metadata_compression_traits.h",
         "src/core/lib/transport/parsed_metadata.cc",
         "src/core/lib/transport/parsed_metadata.h",
-        "src/core/lib/transport/pid_controller.cc",
-        "src/core/lib/transport/pid_controller.h",
         "src/core/lib/transport/simple_slice_based_metadata.h",
         "src/core/lib/transport/status_conversion.cc",
         "src/core/lib/transport/status_conversion.h",
diff --git a/bazel/experiments.bzl b/bazel/experiments.bzl
index 29a091e12d7..a41430e9d7c 100644
--- a/bazel/experiments.bzl
+++ b/bazel/experiments.bzl
@@ -28,16 +28,13 @@ EXPERIMENT_ENABLES = {
     "http2_stats_fix": "http2_stats_fix",
     "keepalive_fix": "keepalive_fix",
     "keepalive_server_fix": "keepalive_server_fix",
-    "memory_pressure_controller": "memory_pressure_controller",
     "monitoring_experiment": "monitoring_experiment",
     "multiping": "multiping",
-    "overload_protection": "overload_protection",
     "peer_state_based_framing": "peer_state_based_framing",
     "pending_queue_cap": "pending_queue_cap",
     "pick_first_happy_eyeballs": "pick_first_happy_eyeballs",
     "promise_based_client_call": "promise_based_client_call",
     "promise_based_server_call": "promise_based_server_call",
-    "red_max_concurrent_streams": "red_max_concurrent_streams",
     "registered_method_lookup_in_transport": "registered_method_lookup_in_transport",
     "promise_based_inproc_transport": "promise_based_client_call,promise_based_inproc_transport,promise_based_server_call,registered_method_lookup_in_transport",
     "registered_methods_map": "registered_methods_map",
@@ -50,6 +47,7 @@ EXPERIMENT_ENABLES = {
     "tcp_rcv_lowat": "tcp_rcv_lowat",
     "trace_record_callops": "trace_record_callops",
     "unconstrained_max_quota_buffer_size": "unconstrained_max_quota_buffer_size",
+    "v3_backend_metric_filter": "v3_backend_metric_filter",
     "v3_channel_idle_filters": "v3_channel_idle_filters",
     "v3_compression_filter": "v3_compression_filter",
     "v3_server_auth_filter": "v3_server_auth_filter",
@@ -87,7 +85,6 @@ EXPERIMENTS = {
             "flow_control_test": [
                 "multiping",
                 "peer_state_based_framing",
-                "red_max_concurrent_streams",
                 "rstpit",
                 "tcp_frame_size_tuning",
                 "tcp_rcv_lowat",
@@ -103,7 +100,6 @@ EXPERIMENTS = {
             ],
             "resource_quota_test": [
                 "free_large_allocator",
-                "memory_pressure_controller",
                 "unconstrained_max_quota_buffer_size",
             ],
             "xds_end2end_test": [
@@ -124,7 +120,6 @@ EXPERIMENTS = {
                 "event_engine_listener",
             ],
             "flow_control_test": [
-                "overload_protection",
                 "write_size_cap",
                 "write_size_policy",
             ],
@@ -169,7 +164,6 @@ EXPERIMENTS = {
             "flow_control_test": [
                 "multiping",
                 "peer_state_based_framing",
-                "red_max_concurrent_streams",
                 "rstpit",
                 "tcp_frame_size_tuning",
                 "tcp_rcv_lowat",
@@ -185,7 +179,6 @@ EXPERIMENTS = {
             ],
             "resource_quota_test": [
                 "free_large_allocator",
-                "memory_pressure_controller",
                 "unconstrained_max_quota_buffer_size",
             ],
             "xds_end2end_test": [
@@ -200,7 +193,6 @@ EXPERIMENTS = {
                 "wrr_delegate_to_pick_first",
             ],
             "flow_control_test": [
-                "overload_protection",
                 "write_size_cap",
                 "write_size_policy",
             ],
@@ -252,7 +244,6 @@ EXPERIMENTS = {
             "flow_control_test": [
                 "multiping",
                 "peer_state_based_framing",
-                "red_max_concurrent_streams",
                 "rstpit",
                 "tcp_frame_size_tuning",
                 "tcp_rcv_lowat",
@@ -271,7 +262,6 @@ EXPERIMENTS = {
             ],
             "resource_quota_test": [
                 "free_large_allocator",
-                "memory_pressure_controller",
                 "unconstrained_max_quota_buffer_size",
             ],
             "xds_end2end_test": [
@@ -292,7 +282,6 @@ EXPERIMENTS = {
                 "event_engine_listener",
             ],
             "flow_control_test": [
-                "overload_protection",
                 "write_size_cap",
                 "write_size_policy",
             ],
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 939610bfc29..aa1179bd3e5 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -886,7 +886,7 @@ libs:
   - src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h
   - src/core/lib/event_engine/posix_engine/internal_errqueue.h
   - src/core/lib/event_engine/posix_engine/lockfree_event.h
-  - src/core/lib/event_engine/posix_engine/native_dns_resolver.h
+  - src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h
   - src/core/lib/event_engine/posix_engine/posix_endpoint.h
   - src/core/lib/event_engine/posix_engine/posix_engine.h
   - src/core/lib/event_engine/posix_engine/posix_engine_closure.h
@@ -914,6 +914,7 @@ libs:
   - src/core/lib/event_engine/utils.h
   - src/core/lib/event_engine/windows/grpc_polled_fd_windows.h
   - src/core/lib/event_engine/windows/iocp.h
+  - src/core/lib/event_engine/windows/native_windows_dns_resolver.h
   - src/core/lib/event_engine/windows/win_socket.h
   - src/core/lib/event_engine/windows/windows_endpoint.h
   - src/core/lib/event_engine/windows/windows_engine.h
@@ -1178,7 +1179,6 @@ libs:
   - src/core/lib/transport/metadata_batch.h
   - src/core/lib/transport/metadata_compression_traits.h
   - src/core/lib/transport/parsed_metadata.h
-  - src/core/lib/transport/pid_controller.h
   - src/core/lib/transport/simple_slice_based_metadata.h
   - src/core/lib/transport/status_conversion.h
   - src/core/lib/transport/tcp_connect_handshaker.h
@@ -1718,7 +1718,7 @@ libs:
   - src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
   - src/core/lib/event_engine/posix_engine/internal_errqueue.cc
   - src/core/lib/event_engine/posix_engine/lockfree_event.cc
-  - src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
+  - src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc
   - src/core/lib/event_engine/posix_engine/posix_endpoint.cc
   - src/core/lib/event_engine/posix_engine/posix_engine.cc
   - src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -1745,6 +1745,7 @@ libs:
   - src/core/lib/event_engine/utils.cc
   - src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
   - src/core/lib/event_engine/windows/iocp.cc
+  - src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
   - src/core/lib/event_engine/windows/win_socket.cc
   - src/core/lib/event_engine/windows/windows_endpoint.cc
   - src/core/lib/event_engine/windows/windows_engine.cc
@@ -1970,7 +1971,6 @@ libs:
   - src/core/lib/transport/http_connect_handshaker.cc
   - src/core/lib/transport/metadata_batch.cc
   - src/core/lib/transport/parsed_metadata.cc
-  - src/core/lib/transport/pid_controller.cc
   - src/core/lib/transport/status_conversion.cc
   - src/core/lib/transport/tcp_connect_handshaker.cc
   - src/core/lib/transport/timeout_encoding.cc
@@ -2355,7 +2355,7 @@ libs:
   - src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h
   - src/core/lib/event_engine/posix_engine/internal_errqueue.h
   - src/core/lib/event_engine/posix_engine/lockfree_event.h
-  - src/core/lib/event_engine/posix_engine/native_dns_resolver.h
+  - src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h
   - src/core/lib/event_engine/posix_engine/posix_endpoint.h
   - src/core/lib/event_engine/posix_engine/posix_engine.h
   - src/core/lib/event_engine/posix_engine/posix_engine_closure.h
@@ -2383,6 +2383,7 @@ libs:
   - src/core/lib/event_engine/utils.h
   - src/core/lib/event_engine/windows/grpc_polled_fd_windows.h
   - src/core/lib/event_engine/windows/iocp.h
+  - src/core/lib/event_engine/windows/native_windows_dns_resolver.h
   - src/core/lib/event_engine/windows/win_socket.h
   - src/core/lib/event_engine/windows/windows_endpoint.h
   - src/core/lib/event_engine/windows/windows_engine.h
@@ -2611,7 +2612,6 @@ libs:
   - src/core/lib/transport/metadata_batch.h
   - src/core/lib/transport/metadata_compression_traits.h
   - src/core/lib/transport/parsed_metadata.h
-  - src/core/lib/transport/pid_controller.h
   - src/core/lib/transport/simple_slice_based_metadata.h
   - src/core/lib/transport/status_conversion.h
   - src/core/lib/transport/tcp_connect_handshaker.h
@@ -2808,7 +2808,7 @@ libs:
   - src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
   - src/core/lib/event_engine/posix_engine/internal_errqueue.cc
   - src/core/lib/event_engine/posix_engine/lockfree_event.cc
-  - src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
+  - src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc
   - src/core/lib/event_engine/posix_engine/posix_endpoint.cc
   - src/core/lib/event_engine/posix_engine/posix_engine.cc
   - src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -2835,6 +2835,7 @@ libs:
   - src/core/lib/event_engine/utils.cc
   - src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
   - src/core/lib/event_engine/windows/iocp.cc
+  - src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
   - src/core/lib/event_engine/windows/win_socket.cc
   - src/core/lib/event_engine/windows/windows_endpoint.cc
   - src/core/lib/event_engine/windows/windows_engine.cc
@@ -3021,7 +3022,6 @@ libs:
   - src/core/lib/transport/http_connect_handshaker.cc
   - src/core/lib/transport/metadata_batch.cc
   - src/core/lib/transport/parsed_metadata.cc
-  - src/core/lib/transport/pid_controller.cc
   - src/core/lib/transport/status_conversion.cc
   - src/core/lib/transport/tcp_connect_handshaker.cc
   - src/core/lib/transport/timeout_encoding.cc
@@ -4499,7 +4499,7 @@ libs:
   - src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h
   - src/core/lib/event_engine/posix_engine/internal_errqueue.h
   - src/core/lib/event_engine/posix_engine/lockfree_event.h
-  - src/core/lib/event_engine/posix_engine/native_dns_resolver.h
+  - src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h
   - src/core/lib/event_engine/posix_engine/posix_endpoint.h
   - src/core/lib/event_engine/posix_engine/posix_engine.h
   - src/core/lib/event_engine/posix_engine/posix_engine_closure.h
@@ -4527,6 +4527,7 @@ libs:
   - src/core/lib/event_engine/utils.h
   - src/core/lib/event_engine/windows/grpc_polled_fd_windows.h
   - src/core/lib/event_engine/windows/iocp.h
+  - src/core/lib/event_engine/windows/native_windows_dns_resolver.h
   - src/core/lib/event_engine/windows/win_socket.h
   - src/core/lib/event_engine/windows/windows_endpoint.h
   - src/core/lib/event_engine/windows/windows_engine.h
@@ -4857,7 +4858,7 @@ libs:
   - src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
   - src/core/lib/event_engine/posix_engine/internal_errqueue.cc
   - src/core/lib/event_engine/posix_engine/lockfree_event.cc
-  - src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
+  - src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc
   - src/core/lib/event_engine/posix_engine/posix_endpoint.cc
   - src/core/lib/event_engine/posix_engine/posix_engine.cc
   - src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
@@ -4884,6 +4885,7 @@ libs:
   - src/core/lib/event_engine/utils.cc
   - src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
   - src/core/lib/event_engine/windows/iocp.cc
+  - src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
   - src/core/lib/event_engine/windows/win_socket.cc
   - src/core/lib/event_engine/windows/windows_endpoint.cc
   - src/core/lib/event_engine/windows/windows_engine.cc
@@ -5852,6 +5854,24 @@ targets:
   - gtest
   - grpc_test_util
   uses_polling: false
+- name: backend_metrics_lb_policy_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - test/cpp/interop/backend_metrics_lb_policy.h
+  src:
+  - src/proto/grpc/testing/empty.proto
+  - src/proto/grpc/testing/messages.proto
+  - src/proto/grpc/testing/test.proto
+  - src/cpp/server/orca/orca_service.cc
+  - test/cpp/interop/backend_metrics_lb_policy.cc
+  - test/cpp/interop/backend_metrics_lb_policy_test.cc
+  deps:
+  - gtest
+  - grpc++
+  - grpc_test_util
+  - grpc++_test_config
 - name: backoff_test
   gtest: true
   build: test
@@ -7650,62 +7670,6 @@ targets:
   - grpc_authorization_provider
   - grpc_unsecure
   - grpc_test_util
-- name: client_transport_error_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/transport/chaotic_good/client_transport.h
-  - src/core/ext/transport/chaotic_good/frame.h
-  - src/core/ext/transport/chaotic_good/frame_header.h
-  - src/core/lib/promise/event_engine_wakeup_scheduler.h
-  - src/core/lib/promise/inter_activity_pipe.h
-  - src/core/lib/promise/join.h
-  - src/core/lib/promise/mpsc.h
-  - src/core/lib/promise/wait_set.h
-  - src/core/lib/transport/promise_endpoint.h
-  - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
-  src:
-  - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.proto
-  - src/core/ext/transport/chaotic_good/client_transport.cc
-  - src/core/ext/transport/chaotic_good/frame.cc
-  - src/core/ext/transport/chaotic_good/frame_header.cc
-  - src/core/lib/transport/promise_endpoint.cc
-  - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
-  - test/core/transport/chaotic_good/client_transport_error_test.cc
-  deps:
-  - gtest
-  - protobuf
-  - grpc_test_util
-  uses_polling: false
-- name: client_transport_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/transport/chaotic_good/client_transport.h
-  - src/core/ext/transport/chaotic_good/frame.h
-  - src/core/ext/transport/chaotic_good/frame_header.h
-  - src/core/lib/promise/event_engine_wakeup_scheduler.h
-  - src/core/lib/promise/inter_activity_pipe.h
-  - src/core/lib/promise/join.h
-  - src/core/lib/promise/mpsc.h
-  - src/core/lib/promise/wait_set.h
-  - src/core/lib/transport/promise_endpoint.h
-  - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h
-  src:
-  - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.proto
-  - src/core/ext/transport/chaotic_good/client_transport.cc
-  - src/core/ext/transport/chaotic_good/frame.cc
-  - src/core/ext/transport/chaotic_good/frame_header.cc
-  - src/core/lib/transport/promise_endpoint.cc
-  - test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
-  - test/core/transport/chaotic_good/client_transport_test.cc
-  deps:
-  - gtest
-  - protobuf
-  - grpc_test_util
-  uses_polling: false
 - name: cmdline_test
   gtest: true
   build: test
@@ -9288,7 +9252,6 @@ targets:
   - src/core/lib/slice/slice_string_helpers.h
   - src/core/lib/transport/bdp_estimator.h
   - src/core/lib/transport/http2_errors.h
-  - src/core/lib/transport/pid_controller.h
   - third_party/upb/upb/base/internal/log2.h
   - third_party/upb/upb/generated_code_support.h
   - third_party/upb/upb/hash/common.h
@@ -9370,7 +9333,6 @@ targets:
   - src/core/lib/slice/slice_refcount.cc
   - src/core/lib/slice/slice_string_helpers.cc
   - src/core/lib/transport/bdp_estimator.cc
-  - src/core/lib/transport/pid_controller.cc
   - test/core/transport/chttp2/flow_control_test.cc
   - third_party/upb/upb/hash/common.c
   - third_party/upb/upb/message/accessors.c
@@ -9653,20 +9615,34 @@ targets:
   deps:
   - gtest
   - grpc_test_util
-- name: frame_header_test
+- name: frame_test
   gtest: true
   build: test
   language: c++
   headers:
-  - src/core/ext/transport/chaotic_good/frame_header.h
-  - src/core/lib/gprpp/bitset.h
+  - src/core/ext/transport/chttp2/transport/frame.h
+  - src/core/lib/debug/trace.h
+  - src/core/lib/slice/slice.h
+  - src/core/lib/slice/slice_buffer.h
+  - src/core/lib/slice/slice_internal.h
+  - src/core/lib/slice/slice_refcount.h
+  - src/core/lib/slice/slice_string_helpers.h
+  - src/core/lib/transport/http2_errors.h
   src:
-  - src/core/ext/transport/chaotic_good/frame_header.cc
-  - test/core/transport/chaotic_good/frame_header_test.cc
+  - src/core/ext/transport/chttp2/transport/frame.cc
+  - src/core/lib/debug/trace.cc
+  - src/core/lib/slice/slice.cc
+  - src/core/lib/slice/slice_buffer.cc
+  - src/core/lib/slice/slice_refcount.cc
+  - src/core/lib/slice/slice_string_helpers.cc
+  - test/core/transport/chttp2/frame_test.cc
   deps:
   - gtest
+  - absl/hash:hash
   - absl/status:statusor
+  - absl/types:span
   - gpr
+  uses_polling: false
 - name: fuzzing_event_engine_test
   gtest: true
   build: test
@@ -12717,38 +12693,6 @@ targets:
   - protobuf
   - grpc_test_util
   uses_polling: false
-- name: pid_controller_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - test/core/util/cmdline.h
-  - test/core/util/evaluate_args_test_util.h
-  - test/core/util/fuzzer_util.h
-  - test/core/util/grpc_profiler.h
-  - test/core/util/histogram.h
-  - test/core/util/mock_authorization_endpoint.h
-  - test/core/util/mock_endpoint.h
-  - test/core/util/parse_hexstring.h
-  - test/core/util/passthru_endpoint.h
-  - test/core/util/resolve_localhost_ip46.h
-  - test/core/util/slice_splitter.h
-  - test/core/util/tracer_util.h
-  src:
-  - test/core/transport/pid_controller_test.cc
-  - test/core/util/cmdline.cc
-  - test/core/util/fuzzer_util.cc
-  - test/core/util/grpc_profiler.cc
-  - test/core/util/histogram.cc
-  - test/core/util/mock_endpoint.cc
-  - test/core/util/parse_hexstring.cc
-  - test/core/util/passthru_endpoint.cc
-  - test/core/util/resolve_localhost_ip46.cc
-  - test/core/util/slice_splitter.cc
-  - test/core/util/tracer_util.cc
-  deps:
-  - gtest
-  - grpc_test_util
 - name: ping_abuse_policy_test
   gtest: true
   build: test
@@ -16287,6 +16231,24 @@ targets:
   - gtest
   - grpc_test_util
   uses_polling: false
+- name: switch_test
+  gtest: true
+  build: test
+  language: c++
+  headers:
+  - src/core/lib/promise/detail/promise_factory.h
+  - src/core/lib/promise/detail/promise_like.h
+  - src/core/lib/promise/if.h
+  - src/core/lib/promise/poll.h
+  - src/core/lib/promise/switch.h
+  src:
+  - test/core/promise/switch_test.cc
+  deps:
+  - gtest
+  - absl/meta:type_traits
+  - absl/status:statusor
+  - gpr
+  uses_polling: false
 - name: sync_test
   gtest: true
   build: test
@@ -16795,680 +16757,6 @@ targets:
   - gtest
   - grpc
   uses_polling: false
-- name: test_core_transport_chaotic_good_frame_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h
-  - src/core/ext/transport/chaotic_good/frame.h
-  - src/core/ext/transport/chaotic_good/frame_header.h
-  - src/core/ext/transport/chttp2/transport/bin_encoder.h
-  - src/core/ext/transport/chttp2/transport/decode_huff.h
-  - src/core/ext/transport/chttp2/transport/hpack_constants.h
-  - src/core/ext/transport/chttp2/transport/hpack_encoder.h
-  - src/core/ext/transport/chttp2/transport/hpack_encoder_table.h
-  - src/core/ext/transport/chttp2/transport/hpack_parse_result.h
-  - src/core/ext/transport/chttp2/transport/hpack_parser.h
-  - src/core/ext/transport/chttp2/transport/hpack_parser_table.h
-  - src/core/ext/transport/chttp2/transport/http_trace.h
-  - src/core/ext/transport/chttp2/transport/huffsyms.h
-  - src/core/ext/transport/chttp2/transport/legacy_frame.h
-  - src/core/ext/transport/chttp2/transport/varint.h
-  - src/core/ext/upb-gen/google/protobuf/any.upb.h
-  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.h
-  - src/core/ext/upb-gen/google/protobuf/descriptor.upb.h
-  - src/core/ext/upb-gen/google/rpc/status.upb.h
-  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.h
-  - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb.h
-  - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.h
-  - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb.h
-  - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.h
-  - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb.h
-  - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.h
-  - src/core/lib/address_utils/parse_address.h
-  - src/core/lib/address_utils/sockaddr_utils.h
-  - src/core/lib/avl/avl.h
-  - src/core/lib/backoff/backoff.h
-  - src/core/lib/backoff/random_early_detection.h
-  - src/core/lib/channel/call_finalization.h
-  - src/core/lib/channel/call_tracer.h
-  - src/core/lib/channel/channel_args.h
-  - src/core/lib/channel/channel_args_preconditioning.h
-  - src/core/lib/channel/channel_fwd.h
-  - src/core/lib/channel/channel_stack.h
-  - src/core/lib/channel/channel_stack_builder.h
-  - src/core/lib/channel/channel_stack_builder_impl.h
-  - src/core/lib/channel/channel_stack_trace.h
-  - src/core/lib/channel/channel_trace.h
-  - src/core/lib/channel/channelz.h
-  - src/core/lib/channel/channelz_registry.h
-  - src/core/lib/channel/connected_channel.h
-  - src/core/lib/channel/context.h
-  - src/core/lib/channel/promise_based_filter.h
-  - src/core/lib/channel/status_util.h
-  - src/core/lib/channel/tcp_tracer.h
-  - src/core/lib/compression/compression_internal.h
-  - src/core/lib/compression/message_compress.h
-  - src/core/lib/config/core_configuration.h
-  - src/core/lib/debug/event_log.h
-  - src/core/lib/debug/histogram_view.h
-  - src/core/lib/debug/stats.h
-  - src/core/lib/debug/stats_data.h
-  - src/core/lib/debug/trace.h
-  - src/core/lib/event_engine/ares_resolver.h
-  - src/core/lib/event_engine/cf_engine/cf_engine.h
-  - src/core/lib/event_engine/cf_engine/cfstream_endpoint.h
-  - src/core/lib/event_engine/cf_engine/cftype_unique_ref.h
-  - src/core/lib/event_engine/cf_engine/dns_service_resolver.h
-  - src/core/lib/event_engine/channel_args_endpoint_config.h
-  - src/core/lib/event_engine/common_closures.h
-  - src/core/lib/event_engine/default_event_engine.h
-  - src/core/lib/event_engine/default_event_engine_factory.h
-  - src/core/lib/event_engine/forkable.h
-  - src/core/lib/event_engine/grpc_polled_fd.h
-  - src/core/lib/event_engine/handle_containers.h
-  - src/core/lib/event_engine/memory_allocator_factory.h
-  - src/core/lib/event_engine/nameser.h
-  - src/core/lib/event_engine/poller.h
-  - src/core/lib/event_engine/posix.h
-  - src/core/lib/event_engine/posix_engine/ev_epoll1_linux.h
-  - src/core/lib/event_engine/posix_engine/ev_poll_posix.h
-  - src/core/lib/event_engine/posix_engine/event_poller.h
-  - src/core/lib/event_engine/posix_engine/event_poller_posix_default.h
-  - src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h
-  - src/core/lib/event_engine/posix_engine/internal_errqueue.h
-  - src/core/lib/event_engine/posix_engine/lockfree_event.h
-  - src/core/lib/event_engine/posix_engine/native_dns_resolver.h
-  - src/core/lib/event_engine/posix_engine/posix_endpoint.h
-  - src/core/lib/event_engine/posix_engine/posix_engine.h
-  - src/core/lib/event_engine/posix_engine/posix_engine_closure.h
-  - src/core/lib/event_engine/posix_engine/posix_engine_listener.h
-  - src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.h
-  - src/core/lib/event_engine/posix_engine/tcp_socket_utils.h
-  - src/core/lib/event_engine/posix_engine/timer.h
-  - src/core/lib/event_engine/posix_engine/timer_heap.h
-  - src/core/lib/event_engine/posix_engine/timer_manager.h
-  - src/core/lib/event_engine/posix_engine/traced_buffer_list.h
-  - src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h
-  - src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h
-  - src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h
-  - src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.h
-  - src/core/lib/event_engine/ref_counted_dns_resolver_interface.h
-  - src/core/lib/event_engine/resolved_address_internal.h
-  - src/core/lib/event_engine/shim.h
-  - src/core/lib/event_engine/tcp_socket_utils.h
-  - src/core/lib/event_engine/thread_pool/thread_count.h
-  - src/core/lib/event_engine/thread_pool/thread_pool.h
-  - src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.h
-  - src/core/lib/event_engine/thready_event_engine/thready_event_engine.h
-  - src/core/lib/event_engine/time_util.h
-  - src/core/lib/event_engine/trace.h
-  - src/core/lib/event_engine/utils.h
-  - src/core/lib/event_engine/windows/grpc_polled_fd_windows.h
-  - src/core/lib/event_engine/windows/iocp.h
-  - src/core/lib/event_engine/windows/win_socket.h
-  - src/core/lib/event_engine/windows/windows_endpoint.h
-  - src/core/lib/event_engine/windows/windows_engine.h
-  - src/core/lib/event_engine/windows/windows_listener.h
-  - src/core/lib/event_engine/work_queue/basic_work_queue.h
-  - src/core/lib/event_engine/work_queue/work_queue.h
-  - src/core/lib/experiments/config.h
-  - src/core/lib/experiments/experiments.h
-  - src/core/lib/gpr/spinlock.h
-  - src/core/lib/gprpp/atomic_utils.h
-  - src/core/lib/gprpp/bitset.h
-  - src/core/lib/gprpp/chunked_vector.h
-  - src/core/lib/gprpp/cpp_impl_of.h
-  - src/core/lib/gprpp/dual_ref_counted.h
-  - src/core/lib/gprpp/if_list.h
-  - src/core/lib/gprpp/load_file.h
-  - src/core/lib/gprpp/manual_constructor.h
-  - src/core/lib/gprpp/match.h
-  - src/core/lib/gprpp/notification.h
-  - src/core/lib/gprpp/orphanable.h
-  - src/core/lib/gprpp/overload.h
-  - src/core/lib/gprpp/packed_table.h
-  - src/core/lib/gprpp/per_cpu.h
-  - src/core/lib/gprpp/ref_counted.h
-  - src/core/lib/gprpp/ref_counted_ptr.h
-  - src/core/lib/gprpp/ref_counted_string.h
-  - src/core/lib/gprpp/sorted_pack.h
-  - src/core/lib/gprpp/status_helper.h
-  - src/core/lib/gprpp/table.h
-  - src/core/lib/gprpp/time.h
-  - src/core/lib/gprpp/time_averaged_stats.h
-  - src/core/lib/gprpp/type_list.h
-  - src/core/lib/gprpp/unique_type_name.h
-  - src/core/lib/gprpp/validation_errors.h
-  - src/core/lib/gprpp/work_serializer.h
-  - src/core/lib/handshaker/proxy_mapper.h
-  - src/core/lib/handshaker/proxy_mapper_registry.h
-  - src/core/lib/iomgr/block_annotate.h
-  - src/core/lib/iomgr/buffer_list.h
-  - src/core/lib/iomgr/call_combiner.h
-  - src/core/lib/iomgr/cfstream_handle.h
-  - src/core/lib/iomgr/closure.h
-  - src/core/lib/iomgr/combiner.h
-  - src/core/lib/iomgr/dynamic_annotations.h
-  - src/core/lib/iomgr/endpoint.h
-  - src/core/lib/iomgr/endpoint_cfstream.h
-  - src/core/lib/iomgr/endpoint_pair.h
-  - src/core/lib/iomgr/error.h
-  - src/core/lib/iomgr/error_cfstream.h
-  - src/core/lib/iomgr/ev_apple.h
-  - src/core/lib/iomgr/ev_epoll1_linux.h
-  - src/core/lib/iomgr/ev_poll_posix.h
-  - src/core/lib/iomgr/ev_posix.h
-  - src/core/lib/iomgr/event_engine_shims/closure.h
-  - src/core/lib/iomgr/event_engine_shims/endpoint.h
-  - src/core/lib/iomgr/event_engine_shims/tcp_client.h
-  - src/core/lib/iomgr/exec_ctx.h
-  - src/core/lib/iomgr/executor.h
-  - src/core/lib/iomgr/gethostname.h
-  - src/core/lib/iomgr/grpc_if_nametoindex.h
-  - src/core/lib/iomgr/internal_errqueue.h
-  - src/core/lib/iomgr/iocp_windows.h
-  - src/core/lib/iomgr/iomgr.h
-  - src/core/lib/iomgr/iomgr_fwd.h
-  - src/core/lib/iomgr/iomgr_internal.h
-  - src/core/lib/iomgr/load_file.h
-  - src/core/lib/iomgr/lockfree_event.h
-  - src/core/lib/iomgr/nameser.h
-  - src/core/lib/iomgr/polling_entity.h
-  - src/core/lib/iomgr/pollset.h
-  - src/core/lib/iomgr/pollset_set.h
-  - src/core/lib/iomgr/pollset_set_windows.h
-  - src/core/lib/iomgr/pollset_windows.h
-  - src/core/lib/iomgr/port.h
-  - src/core/lib/iomgr/python_util.h
-  - src/core/lib/iomgr/resolve_address.h
-  - src/core/lib/iomgr/resolve_address_impl.h
-  - src/core/lib/iomgr/resolve_address_posix.h
-  - src/core/lib/iomgr/resolve_address_windows.h
-  - src/core/lib/iomgr/resolved_address.h
-  - src/core/lib/iomgr/sockaddr.h
-  - src/core/lib/iomgr/sockaddr_posix.h
-  - src/core/lib/iomgr/sockaddr_windows.h
-  - src/core/lib/iomgr/socket_factory_posix.h
-  - src/core/lib/iomgr/socket_mutator.h
-  - src/core/lib/iomgr/socket_utils.h
-  - src/core/lib/iomgr/socket_utils_posix.h
-  - src/core/lib/iomgr/socket_windows.h
-  - src/core/lib/iomgr/systemd_utils.h
-  - src/core/lib/iomgr/tcp_client.h
-  - src/core/lib/iomgr/tcp_client_posix.h
-  - src/core/lib/iomgr/tcp_posix.h
-  - src/core/lib/iomgr/tcp_server.h
-  - src/core/lib/iomgr/tcp_server_utils_posix.h
-  - src/core/lib/iomgr/tcp_windows.h
-  - src/core/lib/iomgr/timer.h
-  - src/core/lib/iomgr/timer_generic.h
-  - src/core/lib/iomgr/timer_heap.h
-  - src/core/lib/iomgr/timer_manager.h
-  - src/core/lib/iomgr/unix_sockets_posix.h
-  - src/core/lib/iomgr/vsock.h
-  - src/core/lib/iomgr/wakeup_fd_pipe.h
-  - src/core/lib/iomgr/wakeup_fd_posix.h
-  - src/core/lib/json/json.h
-  - src/core/lib/json/json_args.h
-  - src/core/lib/json/json_writer.h
-  - src/core/lib/load_balancing/lb_policy.h
-  - src/core/lib/load_balancing/lb_policy_factory.h
-  - src/core/lib/load_balancing/lb_policy_registry.h
-  - src/core/lib/load_balancing/subchannel_interface.h
-  - src/core/lib/promise/activity.h
-  - src/core/lib/promise/all_ok.h
-  - src/core/lib/promise/arena_promise.h
-  - src/core/lib/promise/cancel_callback.h
-  - src/core/lib/promise/context.h
-  - src/core/lib/promise/detail/basic_seq.h
-  - src/core/lib/promise/detail/join_state.h
-  - src/core/lib/promise/detail/promise_factory.h
-  - src/core/lib/promise/detail/promise_like.h
-  - src/core/lib/promise/detail/seq_state.h
-  - src/core/lib/promise/detail/status.h
-  - src/core/lib/promise/exec_ctx_wakeup_scheduler.h
-  - src/core/lib/promise/for_each.h
-  - src/core/lib/promise/if.h
-  - src/core/lib/promise/interceptor_list.h
-  - src/core/lib/promise/latch.h
-  - src/core/lib/promise/loop.h
-  - src/core/lib/promise/map.h
-  - src/core/lib/promise/party.h
-  - src/core/lib/promise/pipe.h
-  - src/core/lib/promise/poll.h
-  - src/core/lib/promise/promise.h
-  - src/core/lib/promise/race.h
-  - src/core/lib/promise/seq.h
-  - src/core/lib/promise/status_flag.h
-  - src/core/lib/promise/trace.h
-  - src/core/lib/promise/try_join.h
-  - src/core/lib/promise/try_seq.h
-  - src/core/lib/resolver/endpoint_addresses.h
-  - src/core/lib/resolver/resolver.h
-  - src/core/lib/resolver/resolver_factory.h
-  - src/core/lib/resolver/resolver_registry.h
-  - src/core/lib/resolver/server_address.h
-  - src/core/lib/resource_quota/api.h
-  - src/core/lib/resource_quota/arena.h
-  - src/core/lib/resource_quota/memory_quota.h
-  - src/core/lib/resource_quota/periodic_update.h
-  - src/core/lib/resource_quota/resource_quota.h
-  - src/core/lib/resource_quota/thread_quota.h
-  - src/core/lib/resource_quota/trace.h
-  - src/core/lib/security/certificate_provider/certificate_provider_factory.h
-  - src/core/lib/security/certificate_provider/certificate_provider_registry.h
-  - src/core/lib/security/credentials/alts/check_gcp_environment.h
-  - src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h
-  - src/core/lib/security/credentials/channel_creds_registry.h
-  - src/core/lib/service_config/service_config.h
-  - src/core/lib/service_config/service_config_call_data.h
-  - src/core/lib/service_config/service_config_parser.h
-  - src/core/lib/slice/b64.h
-  - src/core/lib/slice/percent_encoding.h
-  - src/core/lib/slice/slice.h
-  - src/core/lib/slice/slice_buffer.h
-  - src/core/lib/slice/slice_internal.h
-  - src/core/lib/slice/slice_refcount.h
-  - src/core/lib/slice/slice_string_helpers.h
-  - src/core/lib/surface/api_trace.h
-  - src/core/lib/surface/builtins.h
-  - src/core/lib/surface/call.h
-  - src/core/lib/surface/call_test_only.h
-  - src/core/lib/surface/call_trace.h
-  - src/core/lib/surface/channel.h
-  - src/core/lib/surface/channel_init.h
-  - src/core/lib/surface/channel_stack_type.h
-  - src/core/lib/surface/completion_queue.h
-  - src/core/lib/surface/completion_queue_factory.h
-  - src/core/lib/surface/event_string.h
-  - src/core/lib/surface/init.h
-  - src/core/lib/surface/init_internally.h
-  - src/core/lib/surface/lame_client.h
-  - src/core/lib/surface/server.h
-  - src/core/lib/surface/validate_metadata.h
-  - src/core/lib/surface/wait_for_cq_end_op.h
-  - src/core/lib/transport/batch_builder.h
-  - src/core/lib/transport/connectivity_state.h
-  - src/core/lib/transport/custom_metadata.h
-  - src/core/lib/transport/error_utils.h
-  - src/core/lib/transport/handshaker_factory.h
-  - src/core/lib/transport/handshaker_registry.h
-  - src/core/lib/transport/http2_errors.h
-  - src/core/lib/transport/metadata_batch.h
-  - src/core/lib/transport/metadata_compression_traits.h
-  - src/core/lib/transport/parsed_metadata.h
-  - src/core/lib/transport/simple_slice_based_metadata.h
-  - src/core/lib/transport/status_conversion.h
-  - src/core/lib/transport/timeout_encoding.h
-  - src/core/lib/transport/transport.h
-  - src/core/lib/transport/transport_fwd.h
-  - src/core/lib/uri/uri_parser.h
-  - src/core/tsi/alts/handshaker/transport_security_common_api.h
-  - third_party/upb/upb/base/internal/log2.h
-  - third_party/upb/upb/generated_code_support.h
-  - third_party/upb/upb/hash/common.h
-  - third_party/upb/upb/hash/int_table.h
-  - third_party/upb/upb/hash/str_table.h
-  - third_party/upb/upb/message/accessors.h
-  - third_party/upb/upb/message/array.h
-  - third_party/upb/upb/message/internal/accessors.h
-  - third_party/upb/upb/message/internal/array.h
-  - third_party/upb/upb/message/internal/extension.h
-  - third_party/upb/upb/message/internal/map.h
-  - third_party/upb/upb/message/internal/map_entry.h
-  - third_party/upb/upb/message/internal/map_sorter.h
-  - third_party/upb/upb/message/internal/message.h
-  - third_party/upb/upb/message/internal/types.h
-  - third_party/upb/upb/message/map.h
-  - third_party/upb/upb/message/map_gencode_util.h
-  - third_party/upb/upb/message/message.h
-  - third_party/upb/upb/message/tagged_ptr.h
-  - third_party/upb/upb/message/types.h
-  - third_party/upb/upb/message/value.h
-  - third_party/upb/upb/mini_descriptor/build_enum.h
-  - third_party/upb/upb/mini_descriptor/decode.h
-  - third_party/upb/upb/mini_descriptor/internal/base92.h
-  - third_party/upb/upb/mini_descriptor/internal/decoder.h
-  - third_party/upb/upb/mini_descriptor/internal/encode.h
-  - third_party/upb/upb/mini_descriptor/internal/encode.hpp
-  - third_party/upb/upb/mini_descriptor/internal/modifiers.h
-  - third_party/upb/upb/mini_descriptor/internal/wire_constants.h
-  - third_party/upb/upb/mini_descriptor/link.h
-  - third_party/upb/upb/mini_table/enum.h
-  - third_party/upb/upb/mini_table/extension.h
-  - third_party/upb/upb/mini_table/extension_registry.h
-  - third_party/upb/upb/mini_table/field.h
-  - third_party/upb/upb/mini_table/file.h
-  - third_party/upb/upb/mini_table/internal/enum.h
-  - third_party/upb/upb/mini_table/internal/extension.h
-  - third_party/upb/upb/mini_table/internal/field.h
-  - third_party/upb/upb/mini_table/internal/file.h
-  - third_party/upb/upb/mini_table/internal/message.h
-  - third_party/upb/upb/mini_table/internal/sub.h
-  - third_party/upb/upb/mini_table/message.h
-  - third_party/upb/upb/mini_table/sub.h
-  - third_party/upb/upb/wire/decode.h
-  - third_party/upb/upb/wire/decode_fast.h
-  - third_party/upb/upb/wire/encode.h
-  - third_party/upb/upb/wire/eps_copy_input_stream.h
-  - third_party/upb/upb/wire/internal/constants.h
-  - third_party/upb/upb/wire/internal/decode.h
-  - third_party/upb/upb/wire/internal/swap.h
-  - third_party/upb/upb/wire/reader.h
-  - third_party/upb/upb/wire/types.h
-  src:
-  - src/core/ext/transport/chaotic_good/frame.cc
-  - src/core/ext/transport/chaotic_good/frame_header.cc
-  - src/core/ext/transport/chttp2/transport/bin_encoder.cc
-  - src/core/ext/transport/chttp2/transport/decode_huff.cc
-  - src/core/ext/transport/chttp2/transport/hpack_encoder.cc
-  - src/core/ext/transport/chttp2/transport/hpack_encoder_table.cc
-  - src/core/ext/transport/chttp2/transport/hpack_parse_result.cc
-  - src/core/ext/transport/chttp2/transport/hpack_parser.cc
-  - src/core/ext/transport/chttp2/transport/hpack_parser_table.cc
-  - src/core/ext/transport/chttp2/transport/http_trace.cc
-  - src/core/ext/transport/chttp2/transport/huffsyms.cc
-  - src/core/ext/transport/chttp2/transport/varint.cc
-  - src/core/ext/upb-gen/google/protobuf/any.upb_minitable.c
-  - src/core/ext/upb-gen/google/protobuf/descriptor.upb_minitable.c
-  - src/core/ext/upb-gen/google/rpc/status.upb_minitable.c
-  - src/core/ext/upb-gen/src/proto/grpc/gcp/altscontext.upb_minitable.c
-  - src/core/ext/upb-gen/src/proto/grpc/gcp/handshaker.upb_minitable.c
-  - src/core/ext/upb-gen/src/proto/grpc/gcp/transport_security_common.upb_minitable.c
-  - src/core/lib/address_utils/parse_address.cc
-  - src/core/lib/address_utils/sockaddr_utils.cc
-  - src/core/lib/backoff/backoff.cc
-  - src/core/lib/backoff/random_early_detection.cc
-  - src/core/lib/channel/call_tracer.cc
-  - src/core/lib/channel/channel_args.cc
-  - src/core/lib/channel/channel_args_preconditioning.cc
-  - src/core/lib/channel/channel_stack.cc
-  - src/core/lib/channel/channel_stack_builder.cc
-  - src/core/lib/channel/channel_stack_builder_impl.cc
-  - src/core/lib/channel/channel_stack_trace.cc
-  - src/core/lib/channel/channel_trace.cc
-  - src/core/lib/channel/channelz.cc
-  - src/core/lib/channel/channelz_registry.cc
-  - src/core/lib/channel/connected_channel.cc
-  - src/core/lib/channel/promise_based_filter.cc
-  - src/core/lib/channel/server_call_tracer_filter.cc
-  - src/core/lib/channel/status_util.cc
-  - src/core/lib/compression/compression.cc
-  - src/core/lib/compression/compression_internal.cc
-  - src/core/lib/compression/message_compress.cc
-  - src/core/lib/config/core_configuration.cc
-  - src/core/lib/debug/event_log.cc
-  - src/core/lib/debug/histogram_view.cc
-  - src/core/lib/debug/stats.cc
-  - src/core/lib/debug/stats_data.cc
-  - src/core/lib/debug/trace.cc
-  - src/core/lib/event_engine/ares_resolver.cc
-  - src/core/lib/event_engine/cf_engine/cf_engine.cc
-  - src/core/lib/event_engine/cf_engine/cfstream_endpoint.cc
-  - src/core/lib/event_engine/cf_engine/dns_service_resolver.cc
-  - src/core/lib/event_engine/channel_args_endpoint_config.cc
-  - src/core/lib/event_engine/default_event_engine.cc
-  - src/core/lib/event_engine/default_event_engine_factory.cc
-  - src/core/lib/event_engine/event_engine.cc
-  - src/core/lib/event_engine/forkable.cc
-  - src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc
-  - src/core/lib/event_engine/posix_engine/ev_poll_posix.cc
-  - src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc
-  - src/core/lib/event_engine/posix_engine/internal_errqueue.cc
-  - src/core/lib/event_engine/posix_engine/lockfree_event.cc
-  - src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
-  - src/core/lib/event_engine/posix_engine/posix_endpoint.cc
-  - src/core/lib/event_engine/posix_engine/posix_engine.cc
-  - src/core/lib/event_engine/posix_engine/posix_engine_listener.cc
-  - src/core/lib/event_engine/posix_engine/posix_engine_listener_utils.cc
-  - src/core/lib/event_engine/posix_engine/tcp_socket_utils.cc
-  - src/core/lib/event_engine/posix_engine/timer.cc
-  - src/core/lib/event_engine/posix_engine/timer_heap.cc
-  - src/core/lib/event_engine/posix_engine/timer_manager.cc
-  - src/core/lib/event_engine/posix_engine/traced_buffer_list.cc
-  - src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.cc
-  - src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.cc
-  - src/core/lib/event_engine/posix_engine/wakeup_fd_posix_default.cc
-  - src/core/lib/event_engine/resolved_address.cc
-  - src/core/lib/event_engine/shim.cc
-  - src/core/lib/event_engine/slice.cc
-  - src/core/lib/event_engine/slice_buffer.cc
-  - src/core/lib/event_engine/tcp_socket_utils.cc
-  - src/core/lib/event_engine/thread_pool/thread_count.cc
-  - src/core/lib/event_engine/thread_pool/thread_pool_factory.cc
-  - src/core/lib/event_engine/thread_pool/work_stealing_thread_pool.cc
-  - src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc
-  - src/core/lib/event_engine/time_util.cc
-  - src/core/lib/event_engine/trace.cc
-  - src/core/lib/event_engine/utils.cc
-  - src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc
-  - src/core/lib/event_engine/windows/iocp.cc
-  - src/core/lib/event_engine/windows/win_socket.cc
-  - src/core/lib/event_engine/windows/windows_endpoint.cc
-  - src/core/lib/event_engine/windows/windows_engine.cc
-  - src/core/lib/event_engine/windows/windows_listener.cc
-  - src/core/lib/event_engine/work_queue/basic_work_queue.cc
-  - src/core/lib/experiments/config.cc
-  - src/core/lib/experiments/experiments.cc
-  - src/core/lib/gprpp/load_file.cc
-  - src/core/lib/gprpp/per_cpu.cc
-  - src/core/lib/gprpp/ref_counted_string.cc
-  - src/core/lib/gprpp/status_helper.cc
-  - src/core/lib/gprpp/time.cc
-  - src/core/lib/gprpp/time_averaged_stats.cc
-  - src/core/lib/gprpp/validation_errors.cc
-  - src/core/lib/gprpp/work_serializer.cc
-  - src/core/lib/handshaker/proxy_mapper_registry.cc
-  - src/core/lib/iomgr/buffer_list.cc
-  - src/core/lib/iomgr/call_combiner.cc
-  - src/core/lib/iomgr/cfstream_handle.cc
-  - src/core/lib/iomgr/closure.cc
-  - src/core/lib/iomgr/combiner.cc
-  - src/core/lib/iomgr/dualstack_socket_posix.cc
-  - src/core/lib/iomgr/endpoint.cc
-  - src/core/lib/iomgr/endpoint_cfstream.cc
-  - src/core/lib/iomgr/endpoint_pair_posix.cc
-  - src/core/lib/iomgr/endpoint_pair_windows.cc
-  - src/core/lib/iomgr/error.cc
-  - src/core/lib/iomgr/error_cfstream.cc
-  - src/core/lib/iomgr/ev_apple.cc
-  - src/core/lib/iomgr/ev_epoll1_linux.cc
-  - src/core/lib/iomgr/ev_poll_posix.cc
-  - src/core/lib/iomgr/ev_posix.cc
-  - src/core/lib/iomgr/ev_windows.cc
-  - src/core/lib/iomgr/event_engine_shims/closure.cc
-  - src/core/lib/iomgr/event_engine_shims/endpoint.cc
-  - src/core/lib/iomgr/event_engine_shims/tcp_client.cc
-  - src/core/lib/iomgr/exec_ctx.cc
-  - src/core/lib/iomgr/executor.cc
-  - src/core/lib/iomgr/fork_posix.cc
-  - src/core/lib/iomgr/fork_windows.cc
-  - src/core/lib/iomgr/gethostname_fallback.cc
-  - src/core/lib/iomgr/gethostname_host_name_max.cc
-  - src/core/lib/iomgr/gethostname_sysconf.cc
-  - src/core/lib/iomgr/grpc_if_nametoindex_posix.cc
-  - src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc
-  - src/core/lib/iomgr/internal_errqueue.cc
-  - src/core/lib/iomgr/iocp_windows.cc
-  - src/core/lib/iomgr/iomgr.cc
-  - src/core/lib/iomgr/iomgr_internal.cc
-  - src/core/lib/iomgr/iomgr_posix.cc
-  - src/core/lib/iomgr/iomgr_posix_cfstream.cc
-  - src/core/lib/iomgr/iomgr_windows.cc
-  - src/core/lib/iomgr/load_file.cc
-  - src/core/lib/iomgr/lockfree_event.cc
-  - src/core/lib/iomgr/polling_entity.cc
-  - src/core/lib/iomgr/pollset.cc
-  - src/core/lib/iomgr/pollset_set.cc
-  - src/core/lib/iomgr/pollset_set_windows.cc
-  - src/core/lib/iomgr/pollset_windows.cc
-  - src/core/lib/iomgr/resolve_address.cc
-  - src/core/lib/iomgr/resolve_address_posix.cc
-  - src/core/lib/iomgr/resolve_address_windows.cc
-  - src/core/lib/iomgr/sockaddr_utils_posix.cc
-  - src/core/lib/iomgr/socket_factory_posix.cc
-  - src/core/lib/iomgr/socket_mutator.cc
-  - src/core/lib/iomgr/socket_utils_common_posix.cc
-  - src/core/lib/iomgr/socket_utils_linux.cc
-  - src/core/lib/iomgr/socket_utils_posix.cc
-  - src/core/lib/iomgr/socket_utils_windows.cc
-  - src/core/lib/iomgr/socket_windows.cc
-  - src/core/lib/iomgr/systemd_utils.cc
-  - src/core/lib/iomgr/tcp_client.cc
-  - src/core/lib/iomgr/tcp_client_cfstream.cc
-  - src/core/lib/iomgr/tcp_client_posix.cc
-  - src/core/lib/iomgr/tcp_client_windows.cc
-  - src/core/lib/iomgr/tcp_posix.cc
-  - src/core/lib/iomgr/tcp_server.cc
-  - src/core/lib/iomgr/tcp_server_posix.cc
-  - src/core/lib/iomgr/tcp_server_utils_posix_common.cc
-  - src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc
-  - src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc
-  - src/core/lib/iomgr/tcp_server_windows.cc
-  - src/core/lib/iomgr/tcp_windows.cc
-  - src/core/lib/iomgr/timer.cc
-  - src/core/lib/iomgr/timer_generic.cc
-  - src/core/lib/iomgr/timer_heap.cc
-  - src/core/lib/iomgr/timer_manager.cc
-  - src/core/lib/iomgr/unix_sockets_posix.cc
-  - src/core/lib/iomgr/unix_sockets_posix_noop.cc
-  - src/core/lib/iomgr/vsock.cc
-  - src/core/lib/iomgr/wakeup_fd_eventfd.cc
-  - src/core/lib/iomgr/wakeup_fd_nospecial.cc
-  - src/core/lib/iomgr/wakeup_fd_pipe.cc
-  - src/core/lib/iomgr/wakeup_fd_posix.cc
-  - src/core/lib/json/json_writer.cc
-  - src/core/lib/load_balancing/lb_policy.cc
-  - src/core/lib/load_balancing/lb_policy_registry.cc
-  - src/core/lib/promise/activity.cc
-  - src/core/lib/promise/party.cc
-  - src/core/lib/promise/trace.cc
-  - src/core/lib/resolver/endpoint_addresses.cc
-  - src/core/lib/resolver/resolver.cc
-  - src/core/lib/resolver/resolver_registry.cc
-  - src/core/lib/resource_quota/api.cc
-  - src/core/lib/resource_quota/arena.cc
-  - src/core/lib/resource_quota/memory_quota.cc
-  - src/core/lib/resource_quota/periodic_update.cc
-  - src/core/lib/resource_quota/resource_quota.cc
-  - src/core/lib/resource_quota/thread_quota.cc
-  - src/core/lib/resource_quota/trace.cc
-  - src/core/lib/security/certificate_provider/certificate_provider_registry.cc
-  - src/core/lib/security/credentials/alts/check_gcp_environment.cc
-  - src/core/lib/security/credentials/alts/check_gcp_environment_linux.cc
-  - src/core/lib/security/credentials/alts/check_gcp_environment_no_op.cc
-  - src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc
-  - src/core/lib/security/credentials/alts/grpc_alts_credentials_client_options.cc
-  - src/core/lib/security/credentials/alts/grpc_alts_credentials_options.cc
-  - src/core/lib/security/credentials/alts/grpc_alts_credentials_server_options.cc
-  - src/core/lib/service_config/service_config_parser.cc
-  - src/core/lib/slice/b64.cc
-  - src/core/lib/slice/percent_encoding.cc
-  - src/core/lib/slice/slice.cc
-  - src/core/lib/slice/slice_buffer.cc
-  - src/core/lib/slice/slice_refcount.cc
-  - src/core/lib/slice/slice_string_helpers.cc
-  - src/core/lib/surface/api_trace.cc
-  - src/core/lib/surface/builtins.cc
-  - src/core/lib/surface/byte_buffer.cc
-  - src/core/lib/surface/byte_buffer_reader.cc
-  - src/core/lib/surface/call.cc
-  - src/core/lib/surface/call_details.cc
-  - src/core/lib/surface/call_log_batch.cc
-  - src/core/lib/surface/call_trace.cc
-  - src/core/lib/surface/channel.cc
-  - src/core/lib/surface/channel_init.cc
-  - src/core/lib/surface/channel_ping.cc
-  - src/core/lib/surface/channel_stack_type.cc
-  - src/core/lib/surface/completion_queue.cc
-  - src/core/lib/surface/completion_queue_factory.cc
-  - src/core/lib/surface/event_string.cc
-  - src/core/lib/surface/init_internally.cc
-  - src/core/lib/surface/lame_client.cc
-  - src/core/lib/surface/metadata_array.cc
-  - src/core/lib/surface/server.cc
-  - src/core/lib/surface/validate_metadata.cc
-  - src/core/lib/surface/version.cc
-  - src/core/lib/transport/batch_builder.cc
-  - src/core/lib/transport/connectivity_state.cc
-  - src/core/lib/transport/error_utils.cc
-  - src/core/lib/transport/handshaker_registry.cc
-  - src/core/lib/transport/metadata_batch.cc
-  - src/core/lib/transport/parsed_metadata.cc
-  - src/core/lib/transport/status_conversion.cc
-  - src/core/lib/transport/timeout_encoding.cc
-  - src/core/lib/transport/transport.cc
-  - src/core/lib/transport/transport_op_string.cc
-  - src/core/lib/uri/uri_parser.cc
-  - src/core/tsi/alts/handshaker/transport_security_common_api.cc
-  - test/core/transport/chaotic_good/frame_test.cc
-  - third_party/upb/upb/hash/common.c
-  - third_party/upb/upb/message/accessors.c
-  - third_party/upb/upb/message/array.c
-  - third_party/upb/upb/message/map.c
-  - third_party/upb/upb/message/map_sorter.c
-  - third_party/upb/upb/message/message.c
-  - third_party/upb/upb/mini_descriptor/build_enum.c
-  - third_party/upb/upb/mini_descriptor/decode.c
-  - third_party/upb/upb/mini_descriptor/internal/base92.c
-  - third_party/upb/upb/mini_descriptor/internal/encode.c
-  - third_party/upb/upb/mini_descriptor/link.c
-  - third_party/upb/upb/mini_table/extension_registry.c
-  - third_party/upb/upb/mini_table/internal/message.c
-  - third_party/upb/upb/mini_table/message.c
-  - third_party/upb/upb/wire/decode.c
-  - third_party/upb/upb/wire/decode_fast.c
-  - third_party/upb/upb/wire/encode.c
-  - third_party/upb/upb/wire/eps_copy_input_stream.c
-  - third_party/upb/upb/wire/reader.c
-  deps:
-  - gtest
-  - upb
-  - utf8_range_lib
-  - z
-  - absl/cleanup:cleanup
-  - absl/container:flat_hash_map
-  - absl/container:inlined_vector
-  - absl/functional:function_ref
-  - absl/hash:hash
-  - absl/meta:type_traits
-  - absl/random:bit_gen_ref
-  - absl/random:distributions
-  - absl/status:statusor
-  - absl/types:span
-  - absl/utility:utility
-  - cares
-  - gpr
-- name: test_core_transport_chttp2_frame_test
-  gtest: true
-  build: test
-  language: c++
-  headers:
-  - src/core/ext/transport/chttp2/transport/frame.h
-  - src/core/lib/debug/trace.h
-  - src/core/lib/slice/slice.h
-  - src/core/lib/slice/slice_buffer.h
-  - src/core/lib/slice/slice_internal.h
-  - src/core/lib/slice/slice_refcount.h
-  - src/core/lib/slice/slice_string_helpers.h
-  - src/core/lib/transport/http2_errors.h
-  src:
-  - src/core/ext/transport/chttp2/transport/frame.cc
-  - src/core/lib/debug/trace.cc
-  - src/core/lib/slice/slice.cc
-  - src/core/lib/slice/slice_buffer.cc
-  - src/core/lib/slice/slice_refcount.cc
-  - src/core/lib/slice/slice_string_helpers.cc
-  - test/core/transport/chttp2/frame_test.cc
-  deps:
-  - gtest
-  - absl/hash:hash
-  - absl/status:statusor
-  - absl/types:span
-  - gpr
-  uses_polling: false
 - name: test_cpp_client_credentials_test
   gtest: true
   build: test
diff --git a/config.m4 b/config.m4
index 5c15f9f5793..eaafbe168f0 100644
--- a/config.m4
+++ b/config.m4
@@ -544,7 +544,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc \
     src/core/lib/event_engine/posix_engine/internal_errqueue.cc \
     src/core/lib/event_engine/posix_engine/lockfree_event.cc \
-    src/core/lib/event_engine/posix_engine/native_dns_resolver.cc \
+    src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc \
     src/core/lib/event_engine/posix_engine/posix_endpoint.cc \
     src/core/lib/event_engine/posix_engine/posix_engine.cc \
     src/core/lib/event_engine/posix_engine/posix_engine_listener.cc \
@@ -572,6 +572,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/event_engine/utils.cc \
     src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc \
     src/core/lib/event_engine/windows/iocp.cc \
+    src/core/lib/event_engine/windows/native_windows_dns_resolver.cc \
     src/core/lib/event_engine/windows/win_socket.cc \
     src/core/lib/event_engine/windows/windows_endpoint.cc \
     src/core/lib/event_engine/windows/windows_engine.cc \
@@ -839,7 +840,6 @@ if test "$PHP_GRPC" != "no"; then
     src/core/lib/transport/http_connect_handshaker.cc \
     src/core/lib/transport/metadata_batch.cc \
     src/core/lib/transport/parsed_metadata.cc \
-    src/core/lib/transport/pid_controller.cc \
     src/core/lib/transport/status_conversion.cc \
     src/core/lib/transport/tcp_connect_handshaker.cc \
     src/core/lib/transport/timeout_encoding.cc \
diff --git a/config.w32 b/config.w32
index 98a307ce11d..787f9184edd 100644
--- a/config.w32
+++ b/config.w32
@@ -509,7 +509,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\event_engine\\posix_engine\\event_poller_posix_default.cc " +
     "src\\core\\lib\\event_engine\\posix_engine\\internal_errqueue.cc " +
     "src\\core\\lib\\event_engine\\posix_engine\\lockfree_event.cc " +
-    "src\\core\\lib\\event_engine\\posix_engine\\native_dns_resolver.cc " +
+    "src\\core\\lib\\event_engine\\posix_engine\\native_posix_dns_resolver.cc " +
     "src\\core\\lib\\event_engine\\posix_engine\\posix_endpoint.cc " +
     "src\\core\\lib\\event_engine\\posix_engine\\posix_engine.cc " +
     "src\\core\\lib\\event_engine\\posix_engine\\posix_engine_listener.cc " +
@@ -537,6 +537,7 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\event_engine\\utils.cc " +
     "src\\core\\lib\\event_engine\\windows\\grpc_polled_fd_windows.cc " +
     "src\\core\\lib\\event_engine\\windows\\iocp.cc " +
+    "src\\core\\lib\\event_engine\\windows\\native_windows_dns_resolver.cc " +
     "src\\core\\lib\\event_engine\\windows\\win_socket.cc " +
     "src\\core\\lib\\event_engine\\windows\\windows_endpoint.cc " +
     "src\\core\\lib\\event_engine\\windows\\windows_engine.cc " +
@@ -804,7 +805,6 @@ if (PHP_GRPC != "no") {
     "src\\core\\lib\\transport\\http_connect_handshaker.cc " +
     "src\\core\\lib\\transport\\metadata_batch.cc " +
     "src\\core\\lib\\transport\\parsed_metadata.cc " +
-    "src\\core\\lib\\transport\\pid_controller.cc " +
     "src\\core\\lib\\transport\\status_conversion.cc " +
     "src\\core\\lib\\transport\\tcp_connect_handshaker.cc " +
     "src\\core\\lib\\transport\\timeout_encoding.cc " +
diff --git a/examples/python/helloworld/helloworld_pb2.py b/examples/python/helloworld/helloworld_pb2.py
index f5b4f2d27dc..6ee31ad94a2 100644
--- a/examples/python/helloworld/helloworld_pb2.py
+++ b/examples/python/helloworld/helloworld_pb2.py
@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: helloworld.proto
+# Protobuf Python Version: 4.25.0
 """Generated protocol buffer code."""
-from google.protobuf.internal import builder as _builder
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
 from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -13,18 +14,18 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x10helloworld.proto\x12\nhelloworld\"\x1c\n\x0cHelloRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1d\n\nHelloReply\x12\x0f\n\x07message\x18\x01 \x01(\t2I\n\x07Greeter\x12>\n\x08SayHello\x12\x18.helloworld.HelloRequest\x1a\x16.helloworld.HelloReply\"\x00\x42\x36\n\x1bio.grpc.examples.helloworldB\x0fHelloWorldProtoP\x01\xa2\x02\x03HLWb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x10helloworld.proto\x12\nhelloworld\"\x1c\n\x0cHelloRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x1d\n\nHelloReply\x12\x0f\n\x07message\x18\x01 \x01(\t2\xe4\x01\n\x07Greeter\x12>\n\x08SayHello\x12\x18.helloworld.HelloRequest\x1a\x16.helloworld.HelloReply\"\x00\x12K\n\x13SayHelloStreamReply\x12\x18.helloworld.HelloRequest\x1a\x16.helloworld.HelloReply\"\x00\x30\x01\x12L\n\x12SayHelloBidiStream\x12\x18.helloworld.HelloRequest\x1a\x16.helloworld.HelloReply\"\x00(\x01\x30\x01\x42\x36\n\x1bio.grpc.examples.helloworldB\x0fHelloWorldProtoP\x01\xa2\x02\x03HLWb\x06proto3')
 
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'helloworld_pb2', globals())
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'helloworld_pb2', _globals)
 if _descriptor._USE_C_DESCRIPTORS == False:
-
-  DESCRIPTOR._options = None
-  DESCRIPTOR._serialized_options = b'\n\033io.grpc.examples.helloworldB\017HelloWorldProtoP\001\242\002\003HLW'
-  _HELLOREQUEST._serialized_start=32
-  _HELLOREQUEST._serialized_end=60
-  _HELLOREPLY._serialized_start=62
-  _HELLOREPLY._serialized_end=91
-  _GREETER._serialized_start=93
-  _GREETER._serialized_end=166
+  _globals['DESCRIPTOR']._options = None
+  _globals['DESCRIPTOR']._serialized_options = b'\n\033io.grpc.examples.helloworldB\017HelloWorldProtoP\001\242\002\003HLW'
+  _globals['_HELLOREQUEST']._serialized_start=32
+  _globals['_HELLOREQUEST']._serialized_end=60
+  _globals['_HELLOREPLY']._serialized_start=62
+  _globals['_HELLOREPLY']._serialized_end=91
+  _globals['_GREETER']._serialized_start=94
+  _globals['_GREETER']._serialized_end=322
 # @@protoc_insertion_point(module_scope)
diff --git a/examples/python/helloworld/helloworld_pb2.pyi b/examples/python/helloworld/helloworld_pb2.pyi
index 8c4b5b22805..bf0bd395ad5 100644
--- a/examples/python/helloworld/helloworld_pb2.pyi
+++ b/examples/python/helloworld/helloworld_pb2.pyi
@@ -4,14 +4,14 @@ from typing import ClassVar as _ClassVar, Optional as _Optional
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
-class HelloReply(_message.Message):
-    __slots__ = ["message"]
-    MESSAGE_FIELD_NUMBER: _ClassVar[int]
-    message: str
-    def __init__(self, message: _Optional[str] = ...) -> None: ...
-
 class HelloRequest(_message.Message):
-    __slots__ = ["name"]
+    __slots__ = ("name",)
     NAME_FIELD_NUMBER: _ClassVar[int]
     name: str
     def __init__(self, name: _Optional[str] = ...) -> None: ...
+
+class HelloReply(_message.Message):
+    __slots__ = ("message",)
+    MESSAGE_FIELD_NUMBER: _ClassVar[int]
+    message: str
+    def __init__(self, message: _Optional[str] = ...) -> None: ...
diff --git a/examples/python/helloworld/helloworld_pb2_grpc.py b/examples/python/helloworld/helloworld_pb2_grpc.py
index 47c186976e1..68bcfef1756 100644
--- a/examples/python/helloworld/helloworld_pb2_grpc.py
+++ b/examples/python/helloworld/helloworld_pb2_grpc.py
@@ -19,7 +19,17 @@ class GreeterStub(object):
                 '/helloworld.Greeter/SayHello',
                 request_serializer=helloworld__pb2.HelloRequest.SerializeToString,
                 response_deserializer=helloworld__pb2.HelloReply.FromString,
-                )
+                _registered_method=True)
+        self.SayHelloStreamReply = channel.unary_stream(
+                '/helloworld.Greeter/SayHelloStreamReply',
+                request_serializer=helloworld__pb2.HelloRequest.SerializeToString,
+                response_deserializer=helloworld__pb2.HelloReply.FromString,
+                _registered_method=True)
+        self.SayHelloBidiStream = channel.stream_stream(
+                '/helloworld.Greeter/SayHelloBidiStream',
+                request_serializer=helloworld__pb2.HelloRequest.SerializeToString,
+                response_deserializer=helloworld__pb2.HelloReply.FromString,
+                _registered_method=True)
 
 
 class GreeterServicer(object):
@@ -33,6 +43,18 @@ class GreeterServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def SayHelloStreamReply(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def SayHelloBidiStream(self, request_iterator, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
 
 def add_GreeterServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -41,6 +63,16 @@ def add_GreeterServicer_to_server(servicer, server):
                     request_deserializer=helloworld__pb2.HelloRequest.FromString,
                     response_serializer=helloworld__pb2.HelloReply.SerializeToString,
             ),
+            'SayHelloStreamReply': grpc.unary_stream_rpc_method_handler(
+                    servicer.SayHelloStreamReply,
+                    request_deserializer=helloworld__pb2.HelloRequest.FromString,
+                    response_serializer=helloworld__pb2.HelloReply.SerializeToString,
+            ),
+            'SayHelloBidiStream': grpc.stream_stream_rpc_method_handler(
+                    servicer.SayHelloBidiStream,
+                    request_deserializer=helloworld__pb2.HelloRequest.FromString,
+                    response_serializer=helloworld__pb2.HelloReply.SerializeToString,
+            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'helloworld.Greeter', rpc_method_handlers)
@@ -63,8 +95,72 @@ class Greeter(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/helloworld.Greeter/SayHello',
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/helloworld.Greeter/SayHello',
+            helloworld__pb2.HelloRequest.SerializeToString,
+            helloworld__pb2.HelloReply.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def SayHelloStreamReply(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_stream(
+            request,
+            target,
+            '/helloworld.Greeter/SayHelloStreamReply',
+            helloworld__pb2.HelloRequest.SerializeToString,
+            helloworld__pb2.HelloReply.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def SayHelloBidiStream(request_iterator,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.stream_stream(
+            request_iterator,
+            target,
+            '/helloworld.Greeter/SayHelloBidiStream',
             helloworld__pb2.HelloRequest.SerializeToString,
             helloworld__pb2.HelloReply.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 9a97eb5e7a8..3cae944ab45 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -958,7 +958,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h',
                       'src/core/lib/event_engine/posix_engine/internal_errqueue.h',
                       'src/core/lib/event_engine/posix_engine/lockfree_event.h',
-                      'src/core/lib/event_engine/posix_engine/native_dns_resolver.h',
+                      'src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h',
                       'src/core/lib/event_engine/posix_engine/posix_endpoint.h',
                       'src/core/lib/event_engine/posix_engine/posix_engine.h',
                       'src/core/lib/event_engine/posix_engine/posix_engine_closure.h',
@@ -987,6 +987,7 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/utils.h',
                       'src/core/lib/event_engine/windows/grpc_polled_fd_windows.h',
                       'src/core/lib/event_engine/windows/iocp.h',
+                      'src/core/lib/event_engine/windows/native_windows_dns_resolver.h',
                       'src/core/lib/event_engine/windows/win_socket.h',
                       'src/core/lib/event_engine/windows/windows_endpoint.h',
                       'src/core/lib/event_engine/windows/windows_engine.h',
@@ -1273,7 +1274,6 @@ Pod::Spec.new do |s|
                       'src/core/lib/transport/metadata_batch.h',
                       'src/core/lib/transport/metadata_compression_traits.h',
                       'src/core/lib/transport/parsed_metadata.h',
-                      'src/core/lib/transport/pid_controller.h',
                       'src/core/lib/transport/simple_slice_based_metadata.h',
                       'src/core/lib/transport/status_conversion.h',
                       'src/core/lib/transport/tcp_connect_handshaker.h',
@@ -2203,7 +2203,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h',
                               'src/core/lib/event_engine/posix_engine/internal_errqueue.h',
                               'src/core/lib/event_engine/posix_engine/lockfree_event.h',
-                              'src/core/lib/event_engine/posix_engine/native_dns_resolver.h',
+                              'src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h',
                               'src/core/lib/event_engine/posix_engine/posix_endpoint.h',
                               'src/core/lib/event_engine/posix_engine/posix_engine.h',
                               'src/core/lib/event_engine/posix_engine/posix_engine_closure.h',
@@ -2232,6 +2232,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/utils.h',
                               'src/core/lib/event_engine/windows/grpc_polled_fd_windows.h',
                               'src/core/lib/event_engine/windows/iocp.h',
+                              'src/core/lib/event_engine/windows/native_windows_dns_resolver.h',
                               'src/core/lib/event_engine/windows/win_socket.h',
                               'src/core/lib/event_engine/windows/windows_endpoint.h',
                               'src/core/lib/event_engine/windows/windows_engine.h',
@@ -2518,7 +2519,6 @@ Pod::Spec.new do |s|
                               'src/core/lib/transport/metadata_batch.h',
                               'src/core/lib/transport/metadata_compression_traits.h',
                               'src/core/lib/transport/parsed_metadata.h',
-                              'src/core/lib/transport/pid_controller.h',
                               'src/core/lib/transport/simple_slice_based_metadata.h',
                               'src/core/lib/transport/status_conversion.h',
                               'src/core/lib/transport/tcp_connect_handshaker.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 0f30480f59a..64a9a422c20 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -1392,8 +1392,8 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/posix_engine/internal_errqueue.h',
                       'src/core/lib/event_engine/posix_engine/lockfree_event.cc',
                       'src/core/lib/event_engine/posix_engine/lockfree_event.h',
-                      'src/core/lib/event_engine/posix_engine/native_dns_resolver.cc',
-                      'src/core/lib/event_engine/posix_engine/native_dns_resolver.h',
+                      'src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc',
+                      'src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h',
                       'src/core/lib/event_engine/posix_engine/posix_endpoint.cc',
                       'src/core/lib/event_engine/posix_engine/posix_endpoint.h',
                       'src/core/lib/event_engine/posix_engine/posix_engine.cc',
@@ -1449,6 +1449,8 @@ Pod::Spec.new do |s|
                       'src/core/lib/event_engine/windows/grpc_polled_fd_windows.h',
                       'src/core/lib/event_engine/windows/iocp.cc',
                       'src/core/lib/event_engine/windows/iocp.h',
+                      'src/core/lib/event_engine/windows/native_windows_dns_resolver.cc',
+                      'src/core/lib/event_engine/windows/native_windows_dns_resolver.h',
                       'src/core/lib/event_engine/windows/win_socket.cc',
                       'src/core/lib/event_engine/windows/win_socket.h',
                       'src/core/lib/event_engine/windows/windows_endpoint.cc',
@@ -2002,8 +2004,6 @@ Pod::Spec.new do |s|
                       'src/core/lib/transport/metadata_compression_traits.h',
                       'src/core/lib/transport/parsed_metadata.cc',
                       'src/core/lib/transport/parsed_metadata.h',
-                      'src/core/lib/transport/pid_controller.cc',
-                      'src/core/lib/transport/pid_controller.h',
                       'src/core/lib/transport/simple_slice_based_metadata.h',
                       'src/core/lib/transport/status_conversion.cc',
                       'src/core/lib/transport/status_conversion.h',
@@ -2972,7 +2972,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h',
                               'src/core/lib/event_engine/posix_engine/internal_errqueue.h',
                               'src/core/lib/event_engine/posix_engine/lockfree_event.h',
-                              'src/core/lib/event_engine/posix_engine/native_dns_resolver.h',
+                              'src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h',
                               'src/core/lib/event_engine/posix_engine/posix_endpoint.h',
                               'src/core/lib/event_engine/posix_engine/posix_engine.h',
                               'src/core/lib/event_engine/posix_engine/posix_engine_closure.h',
@@ -3001,6 +3001,7 @@ Pod::Spec.new do |s|
                               'src/core/lib/event_engine/utils.h',
                               'src/core/lib/event_engine/windows/grpc_polled_fd_windows.h',
                               'src/core/lib/event_engine/windows/iocp.h',
+                              'src/core/lib/event_engine/windows/native_windows_dns_resolver.h',
                               'src/core/lib/event_engine/windows/win_socket.h',
                               'src/core/lib/event_engine/windows/windows_endpoint.h',
                               'src/core/lib/event_engine/windows/windows_engine.h',
@@ -3287,7 +3288,6 @@ Pod::Spec.new do |s|
                               'src/core/lib/transport/metadata_batch.h',
                               'src/core/lib/transport/metadata_compression_traits.h',
                               'src/core/lib/transport/parsed_metadata.h',
-                              'src/core/lib/transport/pid_controller.h',
                               'src/core/lib/transport/simple_slice_based_metadata.h',
                               'src/core/lib/transport/status_conversion.h',
                               'src/core/lib/transport/tcp_connect_handshaker.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index d015ff295e6..7c770a8a534 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -1295,8 +1295,8 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/event_engine/posix_engine/internal_errqueue.h )
   s.files += %w( src/core/lib/event_engine/posix_engine/lockfree_event.cc )
   s.files += %w( src/core/lib/event_engine/posix_engine/lockfree_event.h )
-  s.files += %w( src/core/lib/event_engine/posix_engine/native_dns_resolver.cc )
-  s.files += %w( src/core/lib/event_engine/posix_engine/native_dns_resolver.h )
+  s.files += %w( src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc )
+  s.files += %w( src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h )
   s.files += %w( src/core/lib/event_engine/posix_engine/posix_endpoint.cc )
   s.files += %w( src/core/lib/event_engine/posix_engine/posix_endpoint.h )
   s.files += %w( src/core/lib/event_engine/posix_engine/posix_engine.cc )
@@ -1352,6 +1352,8 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/event_engine/windows/grpc_polled_fd_windows.h )
   s.files += %w( src/core/lib/event_engine/windows/iocp.cc )
   s.files += %w( src/core/lib/event_engine/windows/iocp.h )
+  s.files += %w( src/core/lib/event_engine/windows/native_windows_dns_resolver.cc )
+  s.files += %w( src/core/lib/event_engine/windows/native_windows_dns_resolver.h )
   s.files += %w( src/core/lib/event_engine/windows/win_socket.cc )
   s.files += %w( src/core/lib/event_engine/windows/win_socket.h )
   s.files += %w( src/core/lib/event_engine/windows/windows_endpoint.cc )
@@ -1905,8 +1907,6 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/lib/transport/metadata_compression_traits.h )
   s.files += %w( src/core/lib/transport/parsed_metadata.cc )
   s.files += %w( src/core/lib/transport/parsed_metadata.h )
-  s.files += %w( src/core/lib/transport/pid_controller.cc )
-  s.files += %w( src/core/lib/transport/pid_controller.h )
   s.files += %w( src/core/lib/transport/simple_slice_based_metadata.h )
   s.files += %w( src/core/lib/transport/status_conversion.cc )
   s.files += %w( src/core/lib/transport/status_conversion.h )
diff --git a/grpc.gyp b/grpc.gyp
index e8dead59a31..37f7bb50dd0 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -774,7 +774,7 @@
         'src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc',
         'src/core/lib/event_engine/posix_engine/internal_errqueue.cc',
         'src/core/lib/event_engine/posix_engine/lockfree_event.cc',
-        'src/core/lib/event_engine/posix_engine/native_dns_resolver.cc',
+        'src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc',
         'src/core/lib/event_engine/posix_engine/posix_endpoint.cc',
         'src/core/lib/event_engine/posix_engine/posix_engine.cc',
         'src/core/lib/event_engine/posix_engine/posix_engine_listener.cc',
@@ -801,6 +801,7 @@
         'src/core/lib/event_engine/utils.cc',
         'src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc',
         'src/core/lib/event_engine/windows/iocp.cc',
+        'src/core/lib/event_engine/windows/native_windows_dns_resolver.cc',
         'src/core/lib/event_engine/windows/win_socket.cc',
         'src/core/lib/event_engine/windows/windows_endpoint.cc',
         'src/core/lib/event_engine/windows/windows_engine.cc',
@@ -1026,7 +1027,6 @@
         'src/core/lib/transport/http_connect_handshaker.cc',
         'src/core/lib/transport/metadata_batch.cc',
         'src/core/lib/transport/parsed_metadata.cc',
-        'src/core/lib/transport/pid_controller.cc',
         'src/core/lib/transport/status_conversion.cc',
         'src/core/lib/transport/tcp_connect_handshaker.cc',
         'src/core/lib/transport/timeout_encoding.cc',
@@ -1297,7 +1297,7 @@
         'src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc',
         'src/core/lib/event_engine/posix_engine/internal_errqueue.cc',
         'src/core/lib/event_engine/posix_engine/lockfree_event.cc',
-        'src/core/lib/event_engine/posix_engine/native_dns_resolver.cc',
+        'src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc',
         'src/core/lib/event_engine/posix_engine/posix_endpoint.cc',
         'src/core/lib/event_engine/posix_engine/posix_engine.cc',
         'src/core/lib/event_engine/posix_engine/posix_engine_listener.cc',
@@ -1324,6 +1324,7 @@
         'src/core/lib/event_engine/utils.cc',
         'src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc',
         'src/core/lib/event_engine/windows/iocp.cc',
+        'src/core/lib/event_engine/windows/native_windows_dns_resolver.cc',
         'src/core/lib/event_engine/windows/win_socket.cc',
         'src/core/lib/event_engine/windows/windows_endpoint.cc',
         'src/core/lib/event_engine/windows/windows_engine.cc',
@@ -1510,7 +1511,6 @@
         'src/core/lib/transport/http_connect_handshaker.cc',
         'src/core/lib/transport/metadata_batch.cc',
         'src/core/lib/transport/parsed_metadata.cc',
-        'src/core/lib/transport/pid_controller.cc',
         'src/core/lib/transport/status_conversion.cc',
         'src/core/lib/transport/tcp_connect_handshaker.cc',
         'src/core/lib/transport/timeout_encoding.cc',
@@ -2077,7 +2077,7 @@
         'src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc',
         'src/core/lib/event_engine/posix_engine/internal_errqueue.cc',
         'src/core/lib/event_engine/posix_engine/lockfree_event.cc',
-        'src/core/lib/event_engine/posix_engine/native_dns_resolver.cc',
+        'src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc',
         'src/core/lib/event_engine/posix_engine/posix_endpoint.cc',
         'src/core/lib/event_engine/posix_engine/posix_engine.cc',
         'src/core/lib/event_engine/posix_engine/posix_engine_listener.cc',
@@ -2104,6 +2104,7 @@
         'src/core/lib/event_engine/utils.cc',
         'src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc',
         'src/core/lib/event_engine/windows/iocp.cc',
+        'src/core/lib/event_engine/windows/native_windows_dns_resolver.cc',
         'src/core/lib/event_engine/windows/win_socket.cc',
         'src/core/lib/event_engine/windows/windows_endpoint.cc',
         'src/core/lib/event_engine/windows/windows_engine.cc',
diff --git a/include/grpc/event_engine/internal/slice_cast.h b/include/grpc/event_engine/internal/slice_cast.h
index 8bcca60a24a..3f9593464cf 100644
--- a/include/grpc/event_engine/internal/slice_cast.h
+++ b/include/grpc/event_engine/internal/slice_cast.h
@@ -60,6 +60,18 @@ Result& SliceCast(T& value, SliceCastable<Result, T> = {}) {
   return reinterpret_cast<Result&>(value);
 }
 
+// Cast to `Result&&` from `T&&` without any runtime checks.
+// This is only valid if `sizeof(Result) == sizeof(T)`, and if `Result`, `T` are
+// opted in as compatible via `SliceCastable`.
+template <typename Result, typename T>
+Result&& SliceCast(T&& value, SliceCastable<Result, T> = {}) {
+  // Insist upon sizes being equal to catch mismatches.
+  // We assume if sizes are opted in and sizes are equal then yes, these two
+  // types are expected to be layout compatible and actually appear to be.
+  static_assert(sizeof(Result) == sizeof(T), "size mismatch");
+  return reinterpret_cast<Result&&>(value);
+}
+
 }  // namespace internal
 }  // namespace experimental
 }  // namespace grpc_event_engine
diff --git a/include/grpc/event_engine/slice.h b/include/grpc/event_engine/slice.h
index 8d49f391600..ce7693f6489 100644
--- a/include/grpc/event_engine/slice.h
+++ b/include/grpc/event_engine/slice.h
@@ -169,6 +169,11 @@ struct CopyConstructors {
     return Out(grpc_slice_from_copied_buffer(p, len));
   }
 
+  static Out FromCopiedBuffer(const uint8_t* p, size_t len) {
+    return Out(
+        grpc_slice_from_copied_buffer(reinterpret_cast<const char*>(p), len));
+  }
+
   template <typename Buffer>
   static Out FromCopiedBuffer(const Buffer& buffer) {
     return FromCopiedBuffer(reinterpret_cast<const char*>(buffer.data()),
diff --git a/include/grpc/impl/channel_arg_names.h b/include/grpc/impl/channel_arg_names.h
index 534300f22c2..b42bf7026ef 100644
--- a/include/grpc/impl/channel_arg_names.h
+++ b/include/grpc/impl/channel_arg_names.h
@@ -106,6 +106,12 @@
  */
 #define GRPC_ARG_HTTP2_MIN_RECV_PING_INTERVAL_WITHOUT_DATA_MS \
   "grpc.http2.min_ping_interval_without_data_ms"
+/** Maximum time to allow a request to be:
+    (1) received by the server, but
+    (2) not requested by a RequestCall (in the completion queue based API)
+    before the request is cancelled */
+#define GRPC_ARG_SERVER_MAX_UNREQUESTED_TIME_IN_SERVER_SECONDS \
+  "grpc.server_max_unrequested_time_in_server"
 /** Channel arg to override the http2 :scheme header */
 #define GRPC_ARG_HTTP2_SCHEME "grpc.http2_scheme"
 /** How many pings can the client send before needing to send a
diff --git a/include/grpcpp/ext/csm_observability.h b/include/grpcpp/ext/csm_observability.h
index 1212ddf62a6..58a9e96aefc 100644
--- a/include/grpcpp/ext/csm_observability.h
+++ b/include/grpcpp/ext/csm_observability.h
@@ -28,6 +28,8 @@
 #include "absl/strings/string_view.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
 
+#include <grpcpp/ext/otel_plugin.h>
+
 namespace grpc {
 
 namespace internal {
@@ -88,6 +90,18 @@ class CsmObservabilityBuilder {
   std::unique_ptr<grpc::internal::OpenTelemetryPluginBuilderImpl> builder_;
 };
 
+class OpenTelemetryPluginOption;
+
+/// Creates an OpenTelemetryPluginOption that would add additional labels on
+/// gRPC metrics to enhance observability for CSM users.
+///
+/// Sample Usage -
+/// OpenTelemetryPluginBuilder()
+///     .SetMeterProvider(provider)
+///     .AddPluginOption(MakeCsmOpenTelemetryPluginOption())
+///     .BuildAndRegisterGlobal();
+std::unique_ptr<OpenTelemetryPluginOption> MakeCsmOpenTelemetryPluginOption();
+
 }  // namespace experimental
 }  // namespace grpc
 
diff --git a/include/grpcpp/ext/otel_plugin.h b/include/grpcpp/ext/otel_plugin.h
index bdf681ec6da..acb3532c5fd 100644
--- a/include/grpcpp/ext/otel_plugin.h
+++ b/include/grpcpp/ext/otel_plugin.h
@@ -38,6 +38,11 @@ class OpenTelemetryPluginBuilderImpl;
 
 namespace experimental {
 
+class OpenTelemetryPluginOption {
+ public:
+  virtual ~OpenTelemetryPluginOption() = default;
+};
+
 /// The most common way to use this API is -
 ///
 /// OpenTelemetryPluginBuilder().SetMeterProvider(provider).BuildAndRegister();
@@ -76,6 +81,7 @@ class OpenTelemetryPluginBuilder {
           "grpc.server.call.rcvd_total_compressed_message_size";
 
   OpenTelemetryPluginBuilder();
+  ~OpenTelemetryPluginBuilder();
   /// If `SetMeterProvider()` is not called, no metrics are collected.
   OpenTelemetryPluginBuilder& SetMeterProvider(
       std::shared_ptr<opentelemetry::metrics::MeterProvider> meter_provider);
@@ -95,6 +101,12 @@ class OpenTelemetryPluginBuilder {
   OpenTelemetryPluginBuilder& SetGenericMethodAttributeFilter(
       absl::AnyInvocable<bool(absl::string_view /*generic_method*/) const>
           generic_method_attribute_filter);
+  /// Add a plugin option to add to the opentelemetry plugin being built. At
+  /// present, this type is an opaque type. Ownership of \a option is
+  /// transferred when `AddPluginOption` is invoked. A maximum of 64 plugin
+  /// options can be added.
+  OpenTelemetryPluginBuilder& AddPluginOption(
+      std::unique_ptr<OpenTelemetryPluginOption> option);
   /// Registers a global plugin that acts on all channels and servers running on
   /// the process.
   void BuildAndRegisterGlobal();
diff --git a/include/grpcpp/test/channel_test_peer.h b/include/grpcpp/test/channel_test_peer.h
index b180b8feda1..f4aad2a03b5 100644
--- a/include/grpcpp/test/channel_test_peer.h
+++ b/include/grpcpp/test/channel_test_peer.h
@@ -32,7 +32,6 @@ class ChannelTestPeer {
   /// Provide the gRPC Core channel
   grpc_channel* channel() const { return channel_->c_channel_; }
   int registered_calls() const;
-  int registration_attempts() const;
 
  private:
   Channel* channel_;  // not owned
diff --git a/package.xml b/package.xml
index 73306c5c33b..9df45c5f2ea 100644
--- a/package.xml
+++ b/package.xml
@@ -1277,8 +1277,8 @@
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/internal_errqueue.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/lockfree_event.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/lockfree_event.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/native_dns_resolver.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/native_dns_resolver.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/posix_endpoint.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/posix_endpoint.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/posix_engine/posix_engine.cc" role="src" />
@@ -1334,6 +1334,8 @@
     <file baseinstalldir="/" name="src/core/lib/event_engine/windows/grpc_polled_fd_windows.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/windows/iocp.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/windows/iocp.h" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/event_engine/windows/native_windows_dns_resolver.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/lib/event_engine/windows/native_windows_dns_resolver.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/windows/win_socket.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/windows/win_socket.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/event_engine/windows/windows_endpoint.cc" role="src" />
@@ -1887,8 +1889,6 @@
     <file baseinstalldir="/" name="src/core/lib/transport/metadata_compression_traits.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/transport/parsed_metadata.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/transport/parsed_metadata.h" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/transport/pid_controller.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/lib/transport/pid_controller.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/transport/simple_slice_based_metadata.h" role="src" />
     <file baseinstalldir="/" name="src/core/lib/transport/status_conversion.cc" role="src" />
     <file baseinstalldir="/" name="src/core/lib/transport/status_conversion.h" role="src" />
diff --git a/requirements.bazel.txt b/requirements.bazel.txt
index 0c8ec0cfbd7..e95972505d0 100644
--- a/requirements.bazel.txt
+++ b/requirements.bazel.txt
@@ -16,3 +16,5 @@ setuptools==44.1.1
 xds-protos==0.0.11
 absl-py==1.4.0
 googleapis-common-protos==1.61.0
+opentelemetry-sdk==1.21.0
+opentelemetry-api==1.21.0
diff --git a/src/compiler/python_generator.cc b/src/compiler/python_generator.cc
index 753fe1c8887..b7a3115bce0 100644
--- a/src/compiler/python_generator.cc
+++ b/src/compiler/python_generator.cc
@@ -467,7 +467,7 @@ bool PrivateGenerator::PrintStub(
           out->Print(
               method_dict,
               "response_deserializer=$ResponseModuleAndClass$.FromString,\n");
-          out->Print(")\n");
+          out->Print("_registered_method=True)\n");
         }
       }
     }
@@ -642,22 +642,27 @@ bool PrivateGenerator::PrintServiceClass(
         args_dict["ArityMethodName"] = arity_method_name;
         args_dict["PackageQualifiedService"] = package_qualified_service_name;
         args_dict["Method"] = method->name();
-        out->Print(args_dict,
-                   "return "
-                   "grpc.experimental.$ArityMethodName$($RequestParameter$, "
-                   "target, '/$PackageQualifiedService$/$Method$',\n");
+        out->Print(args_dict, "return grpc.experimental.$ArityMethodName$(\n");
         {
           IndentScope continuation_indent(out);
           StringMap serializer_dict;
+          out->Print(args_dict, "$RequestParameter$,\n");
+          out->Print("target,\n");
+          out->Print(args_dict, "'/$PackageQualifiedService$/$Method$',\n");
           serializer_dict["RequestModuleAndClass"] = request_module_and_class;
           serializer_dict["ResponseModuleAndClass"] = response_module_and_class;
           out->Print(serializer_dict,
                      "$RequestModuleAndClass$.SerializeToString,\n");
           out->Print(serializer_dict, "$ResponseModuleAndClass$.FromString,\n");
-          out->Print("options, channel_credentials,\n");
-          out->Print(
-              "insecure, call_credentials, compression, wait_for_ready, "
-              "timeout, metadata)\n");
+          out->Print("options,\n");
+          out->Print("channel_credentials,\n");
+          out->Print("insecure,\n");
+          out->Print("call_credentials,\n");
+          out->Print("compression,\n");
+          out->Print("wait_for_ready,\n");
+          out->Print("timeout,\n");
+          out->Print("metadata,\n");
+          out->Print("_registered_method=True)\n");
         }
       }
     }
diff --git a/src/core/BUILD b/src/core/BUILD
index 85432a6ce2b..284277c923d 100644
--- a/src/core/BUILD
+++ b/src/core/BUILD
@@ -619,6 +619,17 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "switch",
+    language = "c++",
+    public_hdrs = ["lib/promise/switch.h"],
+    deps = [
+        "if",
+        "promise_factory",
+        "//:gpr_platform",
+    ],
+)
+
 grpc_cc_library(
     name = "promise_status",
     external_deps = [
@@ -736,15 +747,6 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_library(
-    name = "switch",
-    language = "c++",
-    public_hdrs = [
-        "lib/promise/detail/switch.h",
-    ],
-    deps = ["//:gpr_platform"],
-)
-
 grpc_cc_library(
     name = "basic_seq",
     language = "c++",
@@ -2173,7 +2175,7 @@ grpc_cc_library(
         "forkable",
         "init_internally",
         "iomgr_port",
-        "native_dns_resolver",
+        "native_posix_dns_resolver",
         "no_destruct",
         "posix_event_engine_base_hdrs",
         "posix_event_engine_closure",
@@ -2220,6 +2222,20 @@ grpc_cc_library(
         "windows_endpoint",
         "windows_event_engine_listener",
         "windows_iocp",
+        "windows_native_resolver",
+        "//:event_engine_base_hdrs",
+        "//:gpr",
+    ],
+)
+
+grpc_cc_library(
+    name = "windows_native_resolver",
+    srcs = ["lib/event_engine/windows/native_windows_dns_resolver.cc"],
+    hdrs = ["lib/event_engine/windows/native_windows_dns_resolver.h"],
+    external_deps = ["absl/strings:str_format"],
+    deps = [
+        "error",
+        "status_helper",
         "//:event_engine_base_hdrs",
         "//:gpr",
     ],
@@ -2519,12 +2535,12 @@ grpc_cc_library(
 )
 
 grpc_cc_library(
-    name = "native_dns_resolver",
+    name = "native_posix_dns_resolver",
     srcs = [
-        "lib/event_engine/posix_engine/native_dns_resolver.cc",
+        "lib/event_engine/posix_engine/native_posix_dns_resolver.cc",
     ],
     hdrs = [
-        "lib/event_engine/posix_engine/native_dns_resolver.h",
+        "lib/event_engine/posix_engine/native_posix_dns_resolver.h",
     ],
     external_deps = [
         "absl/functional:any_invocable",
@@ -2607,20 +2623,6 @@ grpc_cc_library(
     ],
 )
 
-grpc_cc_library(
-    name = "pid_controller",
-    srcs = [
-        "lib/transport/pid_controller.cc",
-    ],
-    hdrs = [
-        "lib/transport/pid_controller.h",
-    ],
-    deps = [
-        "useful",
-        "//:gpr_platform",
-    ],
-)
-
 grpc_cc_library(
     name = "bdp_estimator",
     srcs = [
@@ -5490,6 +5492,7 @@ grpc_cc_library(
         "channel_fwd",
         "channel_stack_type",
         "context",
+        "experiments",
         "grpc_backend_metric_data",
         "grpc_backend_metric_provider",
         "map",
@@ -5908,7 +5911,6 @@ grpc_cc_library(
         "experiments",
         "http2_settings",
         "memory_quota",
-        "pid_controller",
         "time",
         "useful",
         "//:gpr",
@@ -6229,6 +6231,7 @@ grpc_cc_library(
         "bitset",
         "chaotic_good_frame_header",
         "context",
+        "match",
         "no_destruct",
         "slice",
         "slice_buffer",
@@ -6252,6 +6255,7 @@ grpc_cc_library(
     external_deps = [
         "absl/status",
         "absl/status:statusor",
+        "absl/strings",
     ],
     deps = [
         "bitset",
@@ -6384,6 +6388,29 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "chaotic_good_transport",
+    srcs = [
+        "ext/transport/chaotic_good/chaotic_good_transport.cc",
+    ],
+    hdrs = [
+        "ext/transport/chaotic_good/chaotic_good_transport.h",
+    ],
+    external_deps = ["absl/random"],
+    language = "c++",
+    deps = [
+        "chaotic_good_frame",
+        "chaotic_good_frame_header",
+        "grpc_promise_endpoint",
+        "if",
+        "try_join",
+        "try_seq",
+        "//:gpr_platform",
+        "//:hpack_encoder",
+        "//:promise",
+    ],
+)
+
 grpc_cc_library(
     name = "chaotic_good_client_transport",
     srcs = [
@@ -6394,6 +6421,7 @@ grpc_cc_library(
     ],
     external_deps = [
         "absl/base:core_headers",
+        "absl/container:flat_hash_map",
         "absl/random",
         "absl/random:bit_gen_ref",
         "absl/status",
@@ -6404,9 +6432,11 @@ grpc_cc_library(
     language = "c++",
     deps = [
         "activity",
+        "all_ok",
         "arena",
         "chaotic_good_frame",
         "chaotic_good_frame_header",
+        "chaotic_good_transport",
         "context",
         "event_engine_wakeup_scheduler",
         "for_each",
@@ -6414,6 +6444,7 @@ grpc_cc_library(
         "if",
         "inter_activity_pipe",
         "loop",
+        "map",
         "match",
         "memory_quota",
         "mpsc",
@@ -6430,6 +6461,63 @@ grpc_cc_library(
         "//:grpc_base",
         "//:hpack_encoder",
         "//:hpack_parser",
+        "//:promise",
+        "//:ref_counted_ptr",
+    ],
+)
+
+grpc_cc_library(
+    name = "chaotic_good_server_transport",
+    srcs = [
+        "ext/transport/chaotic_good/server_transport.cc",
+    ],
+    hdrs = [
+        "ext/transport/chaotic_good/server_transport.h",
+    ],
+    external_deps = [
+        "absl/base:core_headers",
+        "absl/container:flat_hash_map",
+        "absl/functional:any_invocable",
+        "absl/random",
+        "absl/random:bit_gen_ref",
+        "absl/status",
+        "absl/status:statusor",
+        "absl/types:optional",
+        "absl/types:variant",
+    ],
+    language = "c++",
+    deps = [
+        "1999",
+        "activity",
+        "arena",
+        "chaotic_good_frame",
+        "chaotic_good_frame_header",
+        "chaotic_good_transport",
+        "context",
+        "default_event_engine",
+        "event_engine_wakeup_scheduler",
+        "for_each",
+        "grpc_promise_endpoint",
+        "if",
+        "inter_activity_pipe",
+        "loop",
+        "memory_quota",
+        "mpsc",
+        "pipe",
+        "poll",
+        "resource_quota",
+        "seq",
+        "slice",
+        "slice_buffer",
+        "switch",
+        "try_join",
+        "try_seq",
+        "//:exec_ctx",
+        "//:gpr",
+        "//:gpr_platform",
+        "//:grpc_base",
+        "//:hpack_encoder",
+        "//:hpack_parser",
         "//:ref_counted_ptr",
     ],
 )
diff --git a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc
index 8b66235362a..185825cb91d 100644
--- a/src/core/ext/filters/backend_metrics/backend_metric_filter.cc
+++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.cc
@@ -37,6 +37,7 @@
 #include "src/core/lib/channel/context.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
+#include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/promise/context.h"
 #include "src/core/lib/promise/map.h"
 #include "src/core/lib/slice/slice.h"
@@ -47,8 +48,15 @@ namespace grpc_core {
 
 TraceFlag grpc_backend_metric_filter_trace(false, "backend_metric_filter");
 
-absl::optional<std::string> BackendMetricFilter::MaybeSerializeBackendMetrics(
-    BackendMetricProvider* provider) const {
+const NoInterceptor BackendMetricFilter::Call::OnClientInitialMetadata;
+const NoInterceptor BackendMetricFilter::Call::OnServerInitialMetadata;
+const NoInterceptor BackendMetricFilter::Call::OnClientToServerMessage;
+const NoInterceptor BackendMetricFilter::Call::OnServerToClientMessage;
+const NoInterceptor BackendMetricFilter::Call::OnFinalize;
+
+namespace {
+absl::optional<std::string> MaybeSerializeBackendMetrics(
+    BackendMetricProvider* provider) {
   if (provider == nullptr) return absl::nullopt;
   BackendMetricData data = provider->GetBackendMetricData();
   upb::Arena arena;
@@ -107,17 +115,27 @@ absl::optional<std::string> BackendMetricFilter::MaybeSerializeBackendMetrics(
       xds_data_orca_v3_OrcaLoadReport_serialize(response, arena.ptr(), &len);
   return std::string(buf, len);
 }
+}  // namespace
+
+const grpc_channel_filter LegacyBackendMetricFilter::kFilter =
+    MakePromiseBasedFilter<LegacyBackendMetricFilter, FilterEndpoint::kServer>(
+        "backend_metric");
 
 const grpc_channel_filter BackendMetricFilter::kFilter =
     MakePromiseBasedFilter<BackendMetricFilter, FilterEndpoint::kServer>(
         "backend_metric");
 
+absl::StatusOr<LegacyBackendMetricFilter> LegacyBackendMetricFilter::Create(
+    const ChannelArgs&, ChannelFilter::Args) {
+  return LegacyBackendMetricFilter();
+}
+
 absl::StatusOr<BackendMetricFilter> BackendMetricFilter::Create(
     const ChannelArgs&, ChannelFilter::Args) {
   return BackendMetricFilter();
 }
 
-ArenaPromise<ServerMetadataHandle> BackendMetricFilter::MakeCallPromise(
+ArenaPromise<ServerMetadataHandle> LegacyBackendMetricFilter::MakeCallPromise(
     CallArgs call_args, NextPromiseFactory next_promise_factory) {
   return ArenaPromise<ServerMetadataHandle>(Map(
       next_promise_factory(std::move(call_args)),
@@ -148,10 +166,39 @@ ArenaPromise<ServerMetadataHandle> BackendMetricFilter::MakeCallPromise(
       }));
 }
 
+void BackendMetricFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) {
+  auto* ctx = &GetContext<
+      grpc_call_context_element>()[GRPC_CONTEXT_BACKEND_METRIC_PROVIDER];
+  if (ctx == nullptr) {
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_backend_metric_filter_trace)) {
+      gpr_log(GPR_INFO, "[%p] No BackendMetricProvider.", this);
+    }
+    return;
+  }
+  absl::optional<std::string> serialized = MaybeSerializeBackendMetrics(
+      reinterpret_cast<BackendMetricProvider*>(ctx->value));
+  if (serialized.has_value() && !serialized->empty()) {
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_backend_metric_filter_trace)) {
+      gpr_log(GPR_INFO, "[%p] Backend metrics serialized. size: %" PRIuPTR,
+              this, serialized->size());
+    }
+    md.Set(EndpointLoadMetricsBinMetadata(),
+           Slice::FromCopiedString(std::move(*serialized)));
+  } else if (GRPC_TRACE_FLAG_ENABLED(grpc_backend_metric_filter_trace)) {
+    gpr_log(GPR_INFO, "[%p] No backend metrics.", this);
+  }
+}
+
 void RegisterBackendMetricFilter(CoreConfiguration::Builder* builder) {
-  builder->channel_init()
-      ->RegisterFilter(GRPC_SERVER_CHANNEL, &BackendMetricFilter::kFilter)
-      .IfHasChannelArg(GRPC_ARG_SERVER_CALL_METRIC_RECORDING);
+  if (IsV3BackendMetricFilterEnabled()) {
+    builder->channel_init()
+        ->RegisterFilter<BackendMetricFilter>(GRPC_SERVER_CHANNEL)
+        .IfHasChannelArg(GRPC_ARG_SERVER_CALL_METRIC_RECORDING);
+  } else {
+    builder->channel_init()
+        ->RegisterFilter<LegacyBackendMetricFilter>(GRPC_SERVER_CHANNEL)
+        .IfHasChannelArg(GRPC_ARG_SERVER_CALL_METRIC_RECORDING);
+  }
 }
 
 }  // namespace grpc_core
diff --git a/src/core/ext/filters/backend_metrics/backend_metric_filter.h b/src/core/ext/filters/backend_metrics/backend_metric_filter.h
index 403028b023a..2e6766339f9 100644
--- a/src/core/ext/filters/backend_metrics/backend_metric_filter.h
+++ b/src/core/ext/filters/backend_metrics/backend_metric_filter.h
@@ -31,20 +31,34 @@
 
 namespace grpc_core {
 
-class BackendMetricFilter : public ChannelFilter {
+class LegacyBackendMetricFilter : public ChannelFilter {
  public:
   static const grpc_channel_filter kFilter;
 
-  static absl::StatusOr<BackendMetricFilter> Create(const ChannelArgs& args,
-                                                    ChannelFilter::Args);
+  static absl::StatusOr<LegacyBackendMetricFilter> Create(
+      const ChannelArgs& args, ChannelFilter::Args);
 
   // Construct a promise for one call.
   ArenaPromise<ServerMetadataHandle> MakeCallPromise(
       CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+};
+
+class BackendMetricFilter : public ImplementChannelFilter<BackendMetricFilter> {
+ public:
+  static const grpc_channel_filter kFilter;
+
+  static absl::StatusOr<BackendMetricFilter> Create(const ChannelArgs& args,
+                                                    ChannelFilter::Args);
 
- private:
-  absl::optional<std::string> MaybeSerializeBackendMetrics(
-      BackendMetricProvider* provider) const;
+  class Call {
+   public:
+    static const NoInterceptor OnClientInitialMetadata;
+    static const NoInterceptor OnServerInitialMetadata;
+    void OnServerTrailingMetadata(ServerMetadata& md);
+    static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnServerToClientMessage;
+    static const NoInterceptor OnFinalize;
+  };
 };
 
 }  // namespace grpc_core
diff --git a/src/core/ext/filters/channel_idle/channel_idle_filter.cc b/src/core/ext/filters/channel_idle/channel_idle_filter.cc
index cd88ca58b3d..8e5fead77a2 100644
--- a/src/core/ext/filters/channel_idle/channel_idle_filter.cc
+++ b/src/core/ext/filters/channel_idle/channel_idle_filter.cc
@@ -296,13 +296,13 @@ const grpc_channel_filter MaxAgeFilter::kFilter =
 void RegisterChannelIdleFilters(CoreConfiguration::Builder* builder) {
   if (!IsV3ChannelIdleFiltersEnabled()) return;
   builder->channel_init()
-      ->RegisterFilter(GRPC_CLIENT_CHANNEL, &ClientIdleFilter::kFilter)
+      ->RegisterFilter<ClientIdleFilter>(GRPC_CLIENT_CHANNEL)
       .ExcludeFromMinimalStack()
       .If([](const ChannelArgs& channel_args) {
         return GetClientIdleTimeout(channel_args) != Duration::Infinity();
       });
   builder->channel_init()
-      ->RegisterFilter(GRPC_SERVER_CHANNEL, &MaxAgeFilter::kFilter)
+      ->RegisterFilter<MaxAgeFilter>(GRPC_SERVER_CHANNEL)
       .ExcludeFromMinimalStack()
       .If([](const ChannelArgs& channel_args) {
         return MaxAgeFilter::Config::FromChannelArgs(channel_args).enable();
diff --git a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
index 23d97c9e2ff..8cb06f4b764 100644
--- a/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
+++ b/src/core/ext/filters/channel_idle/legacy_channel_idle_filter.cc
@@ -302,13 +302,13 @@ const grpc_channel_filter LegacyMaxAgeFilter::kFilter =
 void RegisterLegacyChannelIdleFilters(CoreConfiguration::Builder* builder) {
   if (IsV3ChannelIdleFiltersEnabled()) return;
   builder->channel_init()
-      ->RegisterFilter(GRPC_CLIENT_CHANNEL, &LegacyClientIdleFilter::kFilter)
+      ->RegisterFilter<LegacyClientIdleFilter>(GRPC_CLIENT_CHANNEL)
       .ExcludeFromMinimalStack()
       .If([](const ChannelArgs& channel_args) {
         return GetClientIdleTimeout(channel_args) != Duration::Infinity();
       });
   builder->channel_init()
-      ->RegisterFilter(GRPC_SERVER_CHANNEL, &LegacyMaxAgeFilter::kFilter)
+      ->RegisterFilter<LegacyMaxAgeFilter>(GRPC_SERVER_CHANNEL)
       .ExcludeFromMinimalStack()
       .If([](const ChannelArgs& channel_args) {
         return LegacyMaxAgeFilter::Config::FromChannelArgs(channel_args)
diff --git a/src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc b/src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc
index 7f2ecdd69f0..9c74cb8bb9a 100644
--- a/src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/endpoint_list.cc
@@ -69,6 +69,9 @@ class EndpointList::Endpoint::Helper
       grpc_connectivity_state state, const absl::Status& status,
       RefCountedPtr<LoadBalancingPolicy::SubchannelPicker> picker) override {
     auto old_state = std::exchange(endpoint_->connectivity_state_, state);
+    if (!old_state.has_value()) {
+      ++endpoint_->endpoint_list_->num_endpoints_seen_initial_state_;
+    }
     endpoint_->picker_ = std::move(picker);
     endpoint_->OnStateUpdate(old_state, state, status);
   }
@@ -181,11 +184,4 @@ void EndpointList::ResetBackoffLocked() {
   }
 }
 
-bool EndpointList::AllEndpointsSeenInitialState() const {
-  for (const auto& endpoint : endpoints_) {
-    if (!endpoint->connectivity_state().has_value()) return false;
-  }
-  return true;
-}
-
 }  // namespace grpc_core
diff --git a/src/core/ext/filters/client_channel/lb_policy/endpoint_list.h b/src/core/ext/filters/client_channel/lb_policy/endpoint_list.h
index c814d9f50eb..8977dabf9ce 100644
--- a/src/core/ext/filters/client_channel/lb_policy/endpoint_list.h
+++ b/src/core/ext/filters/client_channel/lb_policy/endpoint_list.h
@@ -199,7 +199,9 @@ class EndpointList : public InternallyRefCounted<EndpointList> {
 
   // Returns true if all endpoints have seen their initial connectivity
   // state notification.
-  bool AllEndpointsSeenInitialState() const;
+  bool AllEndpointsSeenInitialState() const {
+    return num_endpoints_seen_initial_state_ == size();
+  }
 
  private:
   // Returns the parent policy's helper.  Needed because the accessor
@@ -210,6 +212,7 @@ class EndpointList : public InternallyRefCounted<EndpointList> {
   RefCountedPtr<LoadBalancingPolicy> policy_;
   const char* tracer_;
   std::vector<OrphanablePtr<Endpoint>> endpoints_;
+  size_t num_endpoints_seen_initial_state_ = 0;
 };
 
 }  // namespace grpc_core
diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
index ae64ec93f00..8cec2474e55 100644
--- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
@@ -1928,8 +1928,7 @@ void RegisterGrpcLbPolicy(CoreConfiguration::Builder* builder) {
   builder->lb_policy_registry()->RegisterLoadBalancingPolicyFactory(
       std::make_unique<GrpcLbFactory>());
   builder->channel_init()
-      ->RegisterFilter(GRPC_CLIENT_SUBCHANNEL,
-                       &ClientLoadReportingFilter::kFilter)
+      ->RegisterFilter<ClientLoadReportingFilter>(GRPC_CLIENT_SUBCHANNEL)
       .IfChannelArg(GRPC_ARG_GRPCLB_ENABLE_LOAD_REPORTING_FILTER, false);
 }
 
diff --git a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc
index efc0ec90cba..f2f9c8870fb 100644
--- a/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/pick_first/pick_first.cc
@@ -224,7 +224,9 @@ class PickFirst : public LoadBalancingPolicy {
    private:
     // Returns true if all subchannels have seen their initial
     // connectivity state notifications.
-    bool AllSubchannelsSeenInitialState();
+    bool AllSubchannelsSeenInitialState() const {
+      return num_subchannels_seen_initial_notification_ == size();
+    }
 
     // Looks through subchannels_ starting from attempting_index_ to
     // find the first one not currently in TRANSIENT_FAILURE, then
@@ -255,6 +257,8 @@ class PickFirst : public LoadBalancingPolicy {
     // TODO(roth): Remove this when we remove the Happy Eyeballs experiment.
     bool in_transient_failure_ = false;
 
+    size_t num_subchannels_seen_initial_notification_ = 0;
+
     // The index into subchannels_ to which we are currently attempting
     // to connect during the initial Happy Eyeballs pass.  Once the
     // initial pass is over, this will be equal to size().
@@ -754,6 +758,11 @@ void PickFirst::SubchannelList::SubchannelData::OnConnectivityStateChange(
     seen_transient_failure_ = true;
     subchannel_list_->last_failure_ = connectivity_status_;
   }
+  // If this is the initial connectivity state update for this subchannel,
+  // increment the counter in the subchannel list.
+  if (!old_state.has_value()) {
+    ++subchannel_list_->num_subchannels_seen_initial_notification_;
+  }
   // If we haven't yet seen the initial connectivity state notification
   // for all subchannels, do nothing.
   if (!subchannel_list_->AllSubchannelsSeenInitialState()) return;
@@ -1122,13 +1131,6 @@ void PickFirst::SubchannelList::ResetBackoffLocked() {
   }
 }
 
-bool PickFirst::SubchannelList::AllSubchannelsSeenInitialState() {
-  for (auto& sd : subchannels_) {
-    if (!sd.connectivity_state().has_value()) return false;
-  }
-  return true;
-}
-
 void PickFirst::SubchannelList::StartConnectingNextSubchannel() {
   // Find the next subchannel not in state TRANSIENT_FAILURE.
   // We skip subchannels in state TRANSIENT_FAILURE to avoid a
diff --git a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc b/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
index 732f07169bc..9cc094f0499 100644
--- a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
+++ b/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
@@ -312,7 +312,8 @@ class XdsResolver : public Resolver {
     RouteConfigData::RouteEntry* route_;
   };
 
-  class ClusterSelectionFilter : public ChannelFilter {
+  class ClusterSelectionFilter
+      : public ImplementChannelFilter<ClusterSelectionFilter> {
    public:
     const static grpc_channel_filter kFilter;
 
@@ -322,8 +323,15 @@ class XdsResolver : public Resolver {
     }
 
     // Construct a promise for one call.
-    ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-        CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+    class Call {
+     public:
+      void OnClientInitialMetadata(ClientMetadata& md);
+      static const NoInterceptor OnServerInitialMetadata;
+      static const NoInterceptor OnServerTrailingMetadata;
+      static const NoInterceptor OnClientToServerMessage;
+      static const NoInterceptor OnServerToClientMessage;
+      static const NoInterceptor OnFinalize;
+    };
 
    private:
     explicit ClusterSelectionFilter(ChannelFilter::Args filter_args)
@@ -374,6 +382,16 @@ class XdsResolver : public Resolver {
   std::map<absl::string_view, WeakRefCountedPtr<ClusterRef>> cluster_ref_map_;
 };
 
+const NoInterceptor
+    XdsResolver::ClusterSelectionFilter::Call::OnServerInitialMetadata;
+const NoInterceptor
+    XdsResolver::ClusterSelectionFilter::Call::OnServerTrailingMetadata;
+const NoInterceptor
+    XdsResolver::ClusterSelectionFilter::Call::OnClientToServerMessage;
+const NoInterceptor
+    XdsResolver::ClusterSelectionFilter::Call::OnServerToClientMessage;
+const NoInterceptor XdsResolver::ClusterSelectionFilter::Call::OnFinalize;
+
 //
 // XdsResolver::RouteConfigData::RouteListIterator
 //
@@ -835,9 +853,8 @@ const grpc_channel_filter XdsResolver::ClusterSelectionFilter::kFilter =
                            kFilterExaminesServerInitialMetadata>(
         "cluster_selection_filter");
 
-ArenaPromise<ServerMetadataHandle>
-XdsResolver::ClusterSelectionFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
+void XdsResolver::ClusterSelectionFilter::Call::OnClientInitialMetadata(
+    ClientMetadata&) {
   auto* service_config_call_data =
       static_cast<ClientChannelServiceConfigCallData*>(
           GetContext<grpc_call_context_element>()
@@ -856,7 +873,6 @@ XdsResolver::ClusterSelectionFilter::MakeCallPromise(
           [cluster = std::move(cluster)]() mutable { cluster.reset(); });
     }
   }
-  return next_promise_factory(std::move(call_args));
 }
 
 //
diff --git a/src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc b/src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc
index 9de7fe2e374..e86e14246f4 100644
--- a/src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc
+++ b/src/core/ext/filters/client_channel/service_config_channel_arg_filter.cc
@@ -54,7 +54,8 @@ namespace grpc_core {
 
 namespace {
 
-class ServiceConfigChannelArgFilter : public ChannelFilter {
+class ServiceConfigChannelArgFilter
+    : public ImplementChannelFilter<ServiceConfigChannelArgFilter> {
  public:
   static absl::StatusOr<ServiceConfigChannelArgFilter> Create(
       const ChannelArgs& args, ChannelFilter::Args) {
@@ -74,28 +75,43 @@ class ServiceConfigChannelArgFilter : public ChannelFilter {
     }
   }
 
-  // Construct a promise for one call.
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+  class Call {
+   public:
+    void OnClientInitialMetadata(ClientMetadata& md,
+                                 ServiceConfigChannelArgFilter* filter);
+    static const NoInterceptor OnServerInitialMetadata;
+    static const NoInterceptor OnServerTrailingMetadata;
+    static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnServerToClientMessage;
+    static const NoInterceptor OnFinalize;
+  };
 
  private:
   RefCountedPtr<ServiceConfig> service_config_;
 };
 
-ArenaPromise<ServerMetadataHandle>
-ServiceConfigChannelArgFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
+const NoInterceptor
+    ServiceConfigChannelArgFilter::Call::OnServerInitialMetadata;
+const NoInterceptor
+    ServiceConfigChannelArgFilter::Call::OnServerTrailingMetadata;
+const NoInterceptor
+    ServiceConfigChannelArgFilter::Call::OnClientToServerMessage;
+const NoInterceptor
+    ServiceConfigChannelArgFilter::Call::OnServerToClientMessage;
+const NoInterceptor ServiceConfigChannelArgFilter::Call::OnFinalize;
+
+void ServiceConfigChannelArgFilter::Call::OnClientInitialMetadata(
+    ClientMetadata& md, ServiceConfigChannelArgFilter* filter) {
   const ServiceConfigParser::ParsedConfigVector* method_configs = nullptr;
-  if (service_config_ != nullptr) {
-    method_configs = service_config_->GetMethodParsedConfigVector(
-        call_args.client_initial_metadata->get_pointer(HttpPathMetadata())
-            ->c_slice());
+  if (filter->service_config_ != nullptr) {
+    method_configs = filter->service_config_->GetMethodParsedConfigVector(
+        md.get_pointer(HttpPathMetadata())->c_slice());
   }
   auto* arena = GetContext<Arena>();
   auto* service_config_call_data = arena->New<ServiceConfigCallData>(
       arena, GetContext<grpc_call_context_element>());
-  service_config_call_data->SetServiceConfig(service_config_, method_configs);
-  return next_promise_factory(std::move(call_args));
+  service_config_call_data->SetServiceConfig(filter->service_config_,
+                                             method_configs);
 }
 
 const grpc_channel_filter kServiceConfigChannelArgFilter =
@@ -112,7 +128,7 @@ void RegisterServiceConfigChannelArgFilter(
                        &kServiceConfigChannelArgFilter)
       .ExcludeFromMinimalStack()
       .IfHasChannelArg(GRPC_ARG_SERVICE_CONFIG)
-      .Before({&ClientMessageSizeFilter::kFilter});
+      .Before<ClientMessageSizeFilter>();
 }
 
 }  // namespace grpc_core
diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.cc b/src/core/ext/filters/fault_injection/fault_injection_filter.cc
index 843de69bbc1..6ddc4c26230 100644
--- a/src/core/ext/filters/fault_injection/fault_injection_filter.cc
+++ b/src/core/ext/filters/fault_injection/fault_injection_filter.cc
@@ -54,6 +54,11 @@
 namespace grpc_core {
 
 TraceFlag grpc_fault_injection_filter_trace(false, "fault_injection_filter");
+const NoInterceptor FaultInjectionFilter::Call::OnServerInitialMetadata;
+const NoInterceptor FaultInjectionFilter::Call::OnServerTrailingMetadata;
+const NoInterceptor FaultInjectionFilter::Call::OnClientToServerMessage;
+const NoInterceptor FaultInjectionFilter::Call::OnServerToClientMessage;
+const NoInterceptor FaultInjectionFilter::Call::OnFinalize;
 
 namespace {
 
@@ -144,23 +149,22 @@ FaultInjectionFilter::FaultInjectionFilter(ChannelFilter::Args filter_args)
       mu_(new Mutex) {}
 
 // Construct a promise for one call.
-ArenaPromise<ServerMetadataHandle> FaultInjectionFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
-  auto decision = MakeInjectionDecision(call_args.client_initial_metadata);
+ArenaPromise<absl::Status> FaultInjectionFilter::Call::OnClientInitialMetadata(
+    ClientMetadata& md, FaultInjectionFilter* filter) {
+  auto decision = filter->MakeInjectionDecision(md);
   if (GRPC_TRACE_FLAG_ENABLED(grpc_fault_injection_filter_trace)) {
     gpr_log(GPR_INFO, "chand=%p: Fault injection triggered %s", this,
             decision.ToString().c_str());
   }
   auto delay = decision.DelayUntil();
-  return TrySeq(
-      Sleep(delay),
-      [decision = std::move(decision)]() { return decision.MaybeAbort(); },
-      next_promise_factory(std::move(call_args)));
+  return TrySeq(Sleep(delay), [decision = std::move(decision)]() {
+    return decision.MaybeAbort();
+  });
 }
 
 FaultInjectionFilter::InjectionDecision
 FaultInjectionFilter::MakeInjectionDecision(
-    const ClientMetadataHandle& initial_metadata) {
+    const ClientMetadata& initial_metadata) {
   // Fetch the fault injection policy from the service config, based on the
   // relative index for which policy should this CallData use.
   auto* service_config_call_data = static_cast<ServiceConfigCallData*>(
@@ -188,15 +192,15 @@ FaultInjectionFilter::MakeInjectionDecision(
       !fi_policy->delay_percentage_header.empty()) {
     std::string buffer;
     if (!fi_policy->abort_code_header.empty() && abort_code == GRPC_STATUS_OK) {
-      auto value = initial_metadata->GetStringValue(
-          fi_policy->abort_code_header, &buffer);
+      auto value = initial_metadata.GetStringValue(fi_policy->abort_code_header,
+                                                   &buffer);
       if (value.has_value()) {
         grpc_status_code_from_int(
             AsInt<int>(*value).value_or(GRPC_STATUS_UNKNOWN), &abort_code);
       }
     }
     if (!fi_policy->abort_percentage_header.empty()) {
-      auto value = initial_metadata->GetStringValue(
+      auto value = initial_metadata.GetStringValue(
           fi_policy->abort_percentage_header, &buffer);
       if (value.has_value()) {
         abort_percentage_numerator = std::min(
@@ -205,14 +209,14 @@ FaultInjectionFilter::MakeInjectionDecision(
     }
     if (!fi_policy->delay_header.empty() && delay == Duration::Zero()) {
       auto value =
-          initial_metadata->GetStringValue(fi_policy->delay_header, &buffer);
+          initial_metadata.GetStringValue(fi_policy->delay_header, &buffer);
       if (value.has_value()) {
         delay = Duration::Milliseconds(
             std::max(AsInt<int64_t>(*value).value_or(0), int64_t{0}));
       }
     }
     if (!fi_policy->delay_percentage_header.empty()) {
-      auto value = initial_metadata->GetStringValue(
+      auto value = initial_metadata.GetStringValue(
           fi_policy->delay_percentage_header, &buffer);
       if (value.has_value()) {
         delay_percentage_numerator = std::min(
diff --git a/src/core/ext/filters/fault_injection/fault_injection_filter.h b/src/core/ext/filters/fault_injection/fault_injection_filter.h
index ed1006f4e66..e2918e854f5 100644
--- a/src/core/ext/filters/fault_injection/fault_injection_filter.h
+++ b/src/core/ext/filters/fault_injection/fault_injection_filter.h
@@ -40,7 +40,8 @@ namespace grpc_core {
 // of the ordinary channel stack. The fault injection filter fetches fault
 // injection policy from the method config of service config returned by the
 // resolver, and enforces the fault injection policy.
-class FaultInjectionFilter : public ChannelFilter {
+class FaultInjectionFilter
+    : public ImplementChannelFilter<FaultInjectionFilter> {
  public:
   static const grpc_channel_filter kFilter;
 
@@ -48,15 +49,23 @@ class FaultInjectionFilter : public ChannelFilter {
       const ChannelArgs& args, ChannelFilter::Args filter_args);
 
   // Construct a promise for one call.
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+  class Call {
+   public:
+    ArenaPromise<absl::Status> OnClientInitialMetadata(
+        ClientMetadata& md, FaultInjectionFilter* filter);
+    static const NoInterceptor OnServerInitialMetadata;
+    static const NoInterceptor OnServerTrailingMetadata;
+    static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnServerToClientMessage;
+    static const NoInterceptor OnFinalize;
+  };
 
  private:
   explicit FaultInjectionFilter(ChannelFilter::Args filter_args);
 
   class InjectionDecision;
   InjectionDecision MakeInjectionDecision(
-      const ClientMetadataHandle& initial_metadata);
+      const ClientMetadata& initial_metadata);
 
   // The relative index of instances of the same filter.
   size_t index_;
diff --git a/src/core/ext/filters/http/client_authority_filter.cc b/src/core/ext/filters/http/client_authority_filter.cc
index a48c9554e41..3df6d275f6a 100644
--- a/src/core/ext/filters/http/client_authority_filter.cc
+++ b/src/core/ext/filters/http/client_authority_filter.cc
@@ -37,6 +37,12 @@
 
 namespace grpc_core {
 
+const NoInterceptor ClientAuthorityFilter::Call::OnServerInitialMetadata;
+const NoInterceptor ClientAuthorityFilter::Call::OnServerTrailingMetadata;
+const NoInterceptor ClientAuthorityFilter::Call::OnClientToServerMessage;
+const NoInterceptor ClientAuthorityFilter::Call::OnServerToClientMessage;
+const NoInterceptor ClientAuthorityFilter::Call::OnFinalize;
+
 absl::StatusOr<ClientAuthorityFilter> ClientAuthorityFilter::Create(
     const ChannelArgs& args, ChannelFilter::Args) {
   absl::optional<absl::string_view> default_authority =
@@ -49,17 +55,12 @@ absl::StatusOr<ClientAuthorityFilter> ClientAuthorityFilter::Create(
   return ClientAuthorityFilter(Slice::FromCopiedString(*default_authority));
 }
 
-ArenaPromise<ServerMetadataHandle> ClientAuthorityFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
+void ClientAuthorityFilter::Call::OnClientInitialMetadata(
+    ClientMetadata& md, ClientAuthorityFilter* filter) {
   // If no authority is set, set the default authority.
-  if (call_args.client_initial_metadata->get_pointer(HttpAuthorityMetadata()) ==
-      nullptr) {
-    call_args.client_initial_metadata->Set(HttpAuthorityMetadata(),
-                                           default_authority_.Ref());
+  if (md.get_pointer(HttpAuthorityMetadata()) == nullptr) {
+    md.Set(HttpAuthorityMetadata(), filter->default_authority_.Ref());
   }
-  // We have no asynchronous work, so we can just ask the next promise to run,
-  // passing down initial_metadata.
-  return next_promise_factory(std::move(call_args));
 }
 
 const grpc_channel_filter ClientAuthorityFilter::kFilter =
@@ -75,14 +76,13 @@ bool NeedsClientAuthorityFilter(const ChannelArgs& args) {
 
 void RegisterClientAuthorityFilter(CoreConfiguration::Builder* builder) {
   builder->channel_init()
-      ->RegisterFilter(GRPC_CLIENT_SUBCHANNEL, &ClientAuthorityFilter::kFilter)
+      ->RegisterFilter<ClientAuthorityFilter>(GRPC_CLIENT_SUBCHANNEL)
       .If(NeedsClientAuthorityFilter)
-      .Before({&ClientAuthFilter::kFilter});
+      .Before<ClientAuthFilter>();
   builder->channel_init()
-      ->RegisterFilter(GRPC_CLIENT_DIRECT_CHANNEL,
-                       &ClientAuthorityFilter::kFilter)
+      ->RegisterFilter<ClientAuthorityFilter>(GRPC_CLIENT_DIRECT_CHANNEL)
       .If(NeedsClientAuthorityFilter)
-      .Before({&ClientAuthFilter::kFilter});
+      .Before<ClientAuthFilter>();
 }
 
 }  // namespace grpc_core
diff --git a/src/core/ext/filters/http/client_authority_filter.h b/src/core/ext/filters/http/client_authority_filter.h
index 930e1731e5e..064e0a0a450 100644
--- a/src/core/ext/filters/http/client_authority_filter.h
+++ b/src/core/ext/filters/http/client_authority_filter.h
@@ -34,16 +34,24 @@
 
 namespace grpc_core {
 
-class ClientAuthorityFilter final : public ChannelFilter {
+class ClientAuthorityFilter final
+    : public ImplementChannelFilter<ClientAuthorityFilter> {
  public:
   static const grpc_channel_filter kFilter;
 
   static absl::StatusOr<ClientAuthorityFilter> Create(const ChannelArgs& args,
                                                       ChannelFilter::Args);
 
-  // Construct a promise for one call.
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+  class Call {
+   public:
+    void OnClientInitialMetadata(ClientMetadata& md,
+                                 ClientAuthorityFilter* filter);
+    static const NoInterceptor OnServerInitialMetadata;
+    static const NoInterceptor OnServerTrailingMetadata;
+    static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnServerToClientMessage;
+    static const NoInterceptor OnFinalize;
+  };
 
  private:
   explicit ClientAuthorityFilter(Slice default_authority)
diff --git a/src/core/ext/filters/http/http_filters_plugin.cc b/src/core/ext/filters/http/http_filters_plugin.cc
index b8099c45c2f..52706560c75 100644
--- a/src/core/ext/filters/http/http_filters_plugin.cc
+++ b/src/core/ext/filters/http/http_filters_plugin.cc
@@ -42,47 +42,49 @@ bool IsBuildingHttpLikeTransport(const ChannelArgs& args) {
 void RegisterHttpFilters(CoreConfiguration::Builder* builder) {
   if (IsV3CompressionFilterEnabled()) {
     builder->channel_init()
-        ->RegisterFilter(GRPC_CLIENT_SUBCHANNEL,
-                         &ClientCompressionFilter::kFilter)
+        ->RegisterFilter<ClientCompressionFilter>(GRPC_CLIENT_SUBCHANNEL)
         .If(IsBuildingHttpLikeTransport)
-        .After({&HttpClientFilter::kFilter, &ClientMessageSizeFilter::kFilter});
+        .After<HttpClientFilter>()
+        .After<ClientMessageSizeFilter>();
     builder->channel_init()
-        ->RegisterFilter(GRPC_CLIENT_DIRECT_CHANNEL,
-                         &ClientCompressionFilter::kFilter)
+        ->RegisterFilter<ClientCompressionFilter>(GRPC_CLIENT_DIRECT_CHANNEL)
         .If(IsBuildingHttpLikeTransport)
-        .After({&HttpClientFilter::kFilter, &ClientMessageSizeFilter::kFilter});
+        .After<HttpClientFilter>()
+        .After<ClientMessageSizeFilter>();
     builder->channel_init()
-        ->RegisterFilter(GRPC_SERVER_CHANNEL, &ServerCompressionFilter::kFilter)
+        ->RegisterFilter<ServerCompressionFilter>(GRPC_SERVER_CHANNEL)
         .If(IsBuildingHttpLikeTransport)
-        .After({&HttpServerFilter::kFilter, &ServerMessageSizeFilter::kFilter});
+        .After<HttpServerFilter>()
+        .After<ServerMessageSizeFilter>();
   } else {
     builder->channel_init()
-        ->RegisterFilter(GRPC_CLIENT_SUBCHANNEL,
-                         &LegacyClientCompressionFilter::kFilter)
+        ->RegisterFilter<LegacyClientCompressionFilter>(GRPC_CLIENT_SUBCHANNEL)
         .If(IsBuildingHttpLikeTransport)
-        .After({&HttpClientFilter::kFilter, &ClientMessageSizeFilter::kFilter});
+        .After<HttpClientFilter>()
+        .After<ClientMessageSizeFilter>();
     builder->channel_init()
-        ->RegisterFilter(GRPC_CLIENT_DIRECT_CHANNEL,
-                         &LegacyClientCompressionFilter::kFilter)
+        ->RegisterFilter<LegacyClientCompressionFilter>(
+            GRPC_CLIENT_DIRECT_CHANNEL)
         .If(IsBuildingHttpLikeTransport)
-        .After({&HttpClientFilter::kFilter, &ClientMessageSizeFilter::kFilter});
+        .After<HttpClientFilter>()
+        .After<ClientMessageSizeFilter>();
     builder->channel_init()
-        ->RegisterFilter(GRPC_SERVER_CHANNEL,
-                         &LegacyServerCompressionFilter::kFilter)
+        ->RegisterFilter<LegacyServerCompressionFilter>(GRPC_SERVER_CHANNEL)
         .If(IsBuildingHttpLikeTransport)
-        .After({&HttpServerFilter::kFilter, &ServerMessageSizeFilter::kFilter});
+        .After<HttpServerFilter>()
+        .After<ServerMessageSizeFilter>();
   }
   builder->channel_init()
-      ->RegisterFilter(GRPC_CLIENT_SUBCHANNEL, &HttpClientFilter::kFilter)
+      ->RegisterFilter<HttpClientFilter>(GRPC_CLIENT_SUBCHANNEL)
       .If(IsBuildingHttpLikeTransport)
-      .After({&ClientMessageSizeFilter::kFilter});
+      .After<ClientMessageSizeFilter>();
   builder->channel_init()
-      ->RegisterFilter(GRPC_CLIENT_DIRECT_CHANNEL, &HttpClientFilter::kFilter)
+      ->RegisterFilter<HttpClientFilter>(GRPC_CLIENT_DIRECT_CHANNEL)
       .If(IsBuildingHttpLikeTransport)
-      .After({&ClientMessageSizeFilter::kFilter});
+      .After<ClientMessageSizeFilter>();
   builder->channel_init()
-      ->RegisterFilter(GRPC_SERVER_CHANNEL, &HttpServerFilter::kFilter)
+      ->RegisterFilter<HttpServerFilter>(GRPC_SERVER_CHANNEL)
       .If(IsBuildingHttpLikeTransport)
-      .After({&ServerMessageSizeFilter::kFilter});
+      .After<ServerMessageSizeFilter>();
 }
 }  // namespace grpc_core
diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc
index 8a3ea08549b..624ca70e79e 100644
--- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc
+++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.cc
@@ -72,6 +72,10 @@ constexpr char kEncodedIpv4AddressLengthString[] = "08";
 constexpr char kEncodedIpv6AddressLengthString[] = "32";
 constexpr char kEmptyAddressLengthString[] = "00";
 
+const NoInterceptor ServerLoadReportingFilter::Call::OnServerInitialMetadata;
+const NoInterceptor ServerLoadReportingFilter::Call::OnClientToServerMessage;
+const NoInterceptor ServerLoadReportingFilter::Call::OnServerToClientMessage;
+
 absl::StatusOr<ServerLoadReportingFilter> ServerLoadReportingFilter::Create(
     const ChannelArgs& channel_args, ChannelFilter::Args) {
   // Find and record the peer_identity.
@@ -93,9 +97,9 @@ absl::StatusOr<ServerLoadReportingFilter> ServerLoadReportingFilter::Create(
 
 namespace {
 std::string GetCensusSafeClientIpString(
-    const ClientMetadataHandle& initial_metadata) {
+    const ClientMetadata& initial_metadata) {
   // Find the client URI string.
-  Slice* client_uri_slice = initial_metadata->get_pointer(PeerString());
+  const Slice* client_uri_slice = initial_metadata.get_pointer(PeerString());
   if (client_uri_slice == nullptr) {
     gpr_log(GPR_ERROR,
             "Unable to extract client URI string (peer string) from gRPC "
@@ -139,8 +143,8 @@ std::string GetCensusSafeClientIpString(
   }
 }
 
-std::string MakeClientIpAndLrToken(
-    absl::string_view lr_token, const ClientMetadataHandle& initial_metadata) {
+std::string MakeClientIpAndLrToken(absl::string_view lr_token,
+                                   const ClientMetadata& initial_metadata) {
   std::string client_ip = GetCensusSafeClientIpString(initial_metadata);
   absl::string_view prefix;
   switch (client_ip.length()) {
@@ -176,89 +180,73 @@ const char* GetStatusTagForStatus(grpc_status_code status) {
 }
 }  // namespace
 
-ArenaPromise<ServerMetadataHandle> ServerLoadReportingFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
+void ServerLoadReportingFilter::Call::OnClientInitialMetadata(
+    ClientMetadata& md, ServerLoadReportingFilter* filter) {
   // Gather up basic facts about the request
   Slice service_method;
-  if (const Slice* path =
-          call_args.client_initial_metadata->get_pointer(HttpPathMetadata())) {
+  if (const Slice* path = md.get_pointer(HttpPathMetadata())) {
     service_method = path->Ref();
   }
-  std::string target_host;
-  if (const Slice* authority = call_args.client_initial_metadata->get_pointer(
-          HttpAuthorityMetadata())) {
-    target_host = absl::AsciiStrToLower(authority->as_string_view());
+  if (const Slice* authority = md.get_pointer(HttpAuthorityMetadata())) {
+    target_host_ = absl::AsciiStrToLower(authority->as_string_view());
   }
-  std::string client_ip_and_lr_token;
-  auto lb_token = call_args.client_initial_metadata->Take(LbTokenMetadata())
-                      .value_or(Slice());
-  client_ip_and_lr_token = MakeClientIpAndLrToken(
-      lb_token.as_string_view(), call_args.client_initial_metadata);
+  auto lb_token = md.Take(LbTokenMetadata()).value_or(Slice());
+  client_ip_and_lr_token_ =
+      MakeClientIpAndLrToken(lb_token.as_string_view(), md);
   // Record the beginning of the request
   opencensus::stats::Record(
       {{::grpc::load_reporter::MeasureStartCount(), 1}},
       {{::grpc::load_reporter::TagKeyToken(),
-        {client_ip_and_lr_token.data(), client_ip_and_lr_token.length()}},
+        {client_ip_and_lr_token_.data(), client_ip_and_lr_token_.length()}},
        {::grpc::load_reporter::TagKeyHost(),
-        {target_host.data(), target_host.length()}},
+        {target_host_.data(), target_host_.length()}},
        {::grpc::load_reporter::TagKeyUserId(),
-        {peer_identity_.data(), peer_identity_.length()}}});
-  // Returned promise runs the rest of the request, then reports costs and
-  // records measurements
-  return ArenaPromise<ServerMetadataHandle>(Seq(
-      // Call down the stack
-      next_promise_factory(std::move(call_args)),
-      // And then record the call result
-      [this, client_ip_and_lr_token,
-       target_host](ServerMetadataHandle trailing_metadata) {
-        const auto& costs = trailing_metadata->Take(LbCostBinMetadata());
-        for (const auto& cost : costs) {
-          opencensus::stats::Record(
-              {{::grpc::load_reporter::MeasureOtherCallMetric(), cost.cost}},
-              {{::grpc::load_reporter::TagKeyToken(),
-                {client_ip_and_lr_token.data(),
-                 client_ip_and_lr_token.length()}},
-               {::grpc::load_reporter::TagKeyHost(),
-                {target_host.data(), target_host.length()}},
-               {::grpc::load_reporter::TagKeyUserId(),
-                {peer_identity_.data(), peer_identity_.length()}},
-               {::grpc::load_reporter::TagKeyMetricName(),
-                {cost.name.data(), cost.name.length()}}});
-        }
-        GetContext<CallFinalization>()->Add([this, client_ip_and_lr_token,
-                                             target_host](
-                                                const grpc_call_final_info*
-                                                    final_info) {
-          if (final_info == nullptr) return;
-          // After the last bytes have been placed on the wire we record
-          // final measurements
-          opencensus::stats::Record(
-              {{::grpc::load_reporter::MeasureEndCount(), 1},
-               {::grpc::load_reporter::MeasureEndBytesSent(),
-                final_info->stats.transport_stream_stats.outgoing.data_bytes},
-               {::grpc::load_reporter::MeasureEndBytesReceived(),
-                final_info->stats.transport_stream_stats.incoming.data_bytes},
-               {::grpc::load_reporter::MeasureEndLatencyMs(),
-                gpr_time_to_millis(final_info->stats.latency)}},
-              {{::grpc::load_reporter::TagKeyToken(),
-                {client_ip_and_lr_token.data(),
-                 client_ip_and_lr_token.length()}},
-               {::grpc::load_reporter::TagKeyHost(),
-                {target_host.data(), target_host.length()}},
-               {::grpc::load_reporter::TagKeyUserId(),
-                {peer_identity_.data(), peer_identity_.length()}},
-               {::grpc::load_reporter::TagKeyStatus(),
-                GetStatusTagForStatus(final_info->final_status)}});
-        });
-        return Immediate(std::move(trailing_metadata));
-      }));
+        {filter->peer_identity_.data(), filter->peer_identity_.length()}}});
 }
 
-namespace {
-const grpc_channel_filter kFilter =
+void ServerLoadReportingFilter::Call::OnServerTrailingMetadata(
+    ServerMetadata& md, ServerLoadReportingFilter* filter) {
+  const auto& costs = md.Take(LbCostBinMetadata());
+  for (const auto& cost : costs) {
+    opencensus::stats::Record(
+        {{::grpc::load_reporter::MeasureOtherCallMetric(), cost.cost}},
+        {{::grpc::load_reporter::TagKeyToken(),
+          {client_ip_and_lr_token_.data(), client_ip_and_lr_token_.length()}},
+         {::grpc::load_reporter::TagKeyHost(),
+          {target_host_.data(), target_host_.length()}},
+         {::grpc::load_reporter::TagKeyUserId(),
+          {filter->peer_identity_.data(), filter->peer_identity_.length()}},
+         {::grpc::load_reporter::TagKeyMetricName(),
+          {cost.name.data(), cost.name.length()}}});
+  }
+}
+
+void ServerLoadReportingFilter::Call::OnFinalize(
+    const grpc_call_final_info* final_info, ServerLoadReportingFilter* filter) {
+  if (final_info == nullptr) return;
+  // After the last bytes have been placed on the wire we record
+  // final measurements
+  opencensus::stats::Record(
+      {{::grpc::load_reporter::MeasureEndCount(), 1},
+       {::grpc::load_reporter::MeasureEndBytesSent(),
+        final_info->stats.transport_stream_stats.outgoing.data_bytes},
+       {::grpc::load_reporter::MeasureEndBytesReceived(),
+        final_info->stats.transport_stream_stats.incoming.data_bytes},
+       {::grpc::load_reporter::MeasureEndLatencyMs(),
+        gpr_time_to_millis(final_info->stats.latency)}},
+      {{::grpc::load_reporter::TagKeyToken(),
+        {client_ip_and_lr_token_.data(), client_ip_and_lr_token_.length()}},
+       {::grpc::load_reporter::TagKeyHost(),
+        {target_host_.data(), target_host_.length()}},
+       {::grpc::load_reporter::TagKeyUserId(),
+        {filter->peer_identity_.data(), filter->peer_identity_.length()}},
+       {::grpc::load_reporter::TagKeyStatus(),
+        GetStatusTagForStatus(final_info->final_status)}});
+}
+
+const grpc_channel_filter ServerLoadReportingFilter::kFilter =
     MakePromiseBasedFilter<ServerLoadReportingFilter, FilterEndpoint::kServer>(
         "server_load_reporting");
-}  // namespace
 
 // TODO(juanlishen): We should register the filter during grpc initialization
 // time once OpenCensus is compatible with our build system. For now, we force
@@ -276,7 +264,7 @@ struct ServerLoadReportingFilterStaticRegistrar {
       grpc::load_reporter::MeasureEndLatencyMs();
       grpc::load_reporter::MeasureOtherCallMetric();
       builder->channel_init()
-          ->RegisterFilter(GRPC_SERVER_CHANNEL, &kFilter)
+          ->RegisterFilter<ServerLoadReportingFilter>(GRPC_SERVER_CHANNEL)
           .IfChannelArg(GRPC_ARG_ENABLE_LOAD_REPORTING, false);
     });
   }
diff --git a/src/core/ext/filters/load_reporting/server_load_reporting_filter.h b/src/core/ext/filters/load_reporting/server_load_reporting_filter.h
index 049a70eb07c..ddb8d0f2482 100644
--- a/src/core/ext/filters/load_reporting/server_load_reporting_filter.h
+++ b/src/core/ext/filters/load_reporting/server_load_reporting_filter.h
@@ -34,8 +34,11 @@
 
 namespace grpc_core {
 
-class ServerLoadReportingFilter : public ChannelFilter {
+class ServerLoadReportingFilter
+    : public ImplementChannelFilter<ServerLoadReportingFilter> {
  public:
+  static const grpc_channel_filter kFilter;
+
   static absl::StatusOr<ServerLoadReportingFilter> Create(
       const ChannelArgs& args, ChannelFilter::Args);
 
@@ -43,9 +46,22 @@ class ServerLoadReportingFilter : public ChannelFilter {
   const char* peer_identity() { return peer_identity_.c_str(); }
   size_t peer_identity_len() { return peer_identity_.length(); }
 
-  // Construct a promise for one call.
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+  class Call {
+   public:
+    void OnClientInitialMetadata(ClientMetadata& md,
+                                 ServerLoadReportingFilter* filter);
+    static const NoInterceptor OnServerInitialMetadata;
+    void OnServerTrailingMetadata(ServerMetadata& md,
+                                  ServerLoadReportingFilter* filter);
+    static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnServerToClientMessage;
+    void OnFinalize(const grpc_call_final_info* final_info,
+                    ServerLoadReportingFilter* filter);
+
+   private:
+    std::string client_ip_and_lr_token_;
+    std::string target_host_;
+  };
 
  private:
   // The peer's authenticated identity.
diff --git a/src/core/ext/filters/logging/logging_filter.cc b/src/core/ext/filters/logging/logging_filter.cc
index 85e4871a086..0774e95c232 100644
--- a/src/core/ext/filters/logging/logging_filter.cc
+++ b/src/core/ext/filters/logging/logging_filter.cc
@@ -536,11 +536,11 @@ void RegisterLoggingFilter(LoggingSink* sink) {
   g_logging_sink = sink;
   CoreConfiguration::RegisterBuilder([](CoreConfiguration::Builder* builder) {
     builder->channel_init()
-        ->RegisterFilter(GRPC_SERVER_CHANNEL, &ServerLoggingFilter::kFilter)
+        ->RegisterFilter<ServerLoggingFilter>(GRPC_SERVER_CHANNEL)
         // TODO(yashykt) : Figure out a good place to place this channel arg
         .IfChannelArg("grpc.experimental.enable_observability", true);
     builder->channel_init()
-        ->RegisterFilter(GRPC_CLIENT_CHANNEL, &ClientLoggingFilter::kFilter)
+        ->RegisterFilter<ClientLoggingFilter>(GRPC_CLIENT_CHANNEL)
         // TODO(yashykt) : Figure out a good place to place this channel arg
         .IfChannelArg("grpc.experimental.enable_observability", true);
   });
diff --git a/src/core/ext/filters/message_size/message_size_filter.cc b/src/core/ext/filters/message_size/message_size_filter.cc
index 9cfc00474c4..ac010d40e1a 100644
--- a/src/core/ext/filters/message_size/message_size_filter.cc
+++ b/src/core/ext/filters/message_size/message_size_filter.cc
@@ -240,12 +240,10 @@ bool HasMessageSizeLimits(const ChannelArgs& channel_args) {
 void RegisterMessageSizeFilter(CoreConfiguration::Builder* builder) {
   MessageSizeParser::Register(builder);
   builder->channel_init()
-      ->RegisterFilter(GRPC_CLIENT_SUBCHANNEL,
-                       &ClientMessageSizeFilter::kFilter)
+      ->RegisterFilter<ClientMessageSizeFilter>(GRPC_CLIENT_SUBCHANNEL)
       .ExcludeFromMinimalStack();
   builder->channel_init()
-      ->RegisterFilter(GRPC_CLIENT_DIRECT_CHANNEL,
-                       &ClientMessageSizeFilter::kFilter)
+      ->RegisterFilter<ClientMessageSizeFilter>(GRPC_CLIENT_DIRECT_CHANNEL)
       .ExcludeFromMinimalStack()
       .If(HasMessageSizeLimits)
       // TODO(ctiller): ordering constraint is here to match the ordering that
@@ -253,7 +251,7 @@ void RegisterMessageSizeFilter(CoreConfiguration::Builder* builder) {
       // filters from first principles.
       .Before({&grpc_client_deadline_filter});
   builder->channel_init()
-      ->RegisterFilter(GRPC_SERVER_CHANNEL, &ServerMessageSizeFilter::kFilter)
+      ->RegisterFilter<ServerMessageSizeFilter>(GRPC_SERVER_CHANNEL)
       .ExcludeFromMinimalStack()
       .If(HasMessageSizeLimits)
       // TODO(ctiller): ordering constraint is here to match the ordering that
diff --git a/src/core/ext/filters/rbac/rbac_filter.cc b/src/core/ext/filters/rbac/rbac_filter.cc
index 77b6dd46ad7..3481b434bb8 100644
--- a/src/core/ext/filters/rbac/rbac_filter.cc
+++ b/src/core/ext/filters/rbac/rbac_filter.cc
@@ -43,8 +43,14 @@
 
 namespace grpc_core {
 
-ArenaPromise<ServerMetadataHandle> RbacFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
+const NoInterceptor RbacFilter::Call::OnServerInitialMetadata;
+const NoInterceptor RbacFilter::Call::OnServerTrailingMetadata;
+const NoInterceptor RbacFilter::Call::OnClientToServerMessage;
+const NoInterceptor RbacFilter::Call::OnServerToClientMessage;
+const NoInterceptor RbacFilter::Call::OnFinalize;
+
+absl::Status RbacFilter::Call::OnClientInitialMetadata(ClientMetadata& md,
+                                                       RbacFilter* filter) {
   // Fetch and apply the rbac policy from the service config.
   auto* service_config_call_data = static_cast<ServiceConfigCallData*>(
       GetContext<
@@ -52,21 +58,19 @@ ArenaPromise<ServerMetadataHandle> RbacFilter::MakeCallPromise(
           .value);
   auto* method_params = static_cast<RbacMethodParsedConfig*>(
       service_config_call_data->GetMethodParsedConfig(
-          service_config_parser_index_));
+          filter->service_config_parser_index_));
   if (method_params == nullptr) {
-    return Immediate(ServerMetadataFromStatus(
-        absl::PermissionDeniedError("No RBAC policy found.")));
+    return absl::PermissionDeniedError("No RBAC policy found.");
   } else {
-    auto* authorization_engine = method_params->authorization_engine(index_);
+    auto* authorization_engine =
+        method_params->authorization_engine(filter->index_);
     if (authorization_engine
-            ->Evaluate(EvaluateArgs(call_args.client_initial_metadata.get(),
-                                    &per_channel_evaluate_args_))
+            ->Evaluate(EvaluateArgs(&md, &filter->per_channel_evaluate_args_))
             .type == AuthorizationEngine::Decision::Type::kDeny) {
-      return Immediate(ServerMetadataFromStatus(
-          absl::PermissionDeniedError("Unauthorized RPC rejected")));
+      return absl::PermissionDeniedError("Unauthorized RPC rejected");
     }
   }
-  return next_promise_factory(std::move(call_args));
+  return absl::OkStatus();
 }
 
 const grpc_channel_filter RbacFilter::kFilterVtable =
diff --git a/src/core/ext/filters/rbac/rbac_filter.h b/src/core/ext/filters/rbac/rbac_filter.h
index 1bc923c4e22..f2208753b6b 100644
--- a/src/core/ext/filters/rbac/rbac_filter.h
+++ b/src/core/ext/filters/rbac/rbac_filter.h
@@ -34,7 +34,7 @@ namespace grpc_core {
 
 // Filter used when xDS server config fetcher provides a configuration with an
 // HTTP RBAC filter. Also serves as the type for channel data for the filter.
-class RbacFilter : public ChannelFilter {
+class RbacFilter : public ImplementChannelFilter<RbacFilter> {
  public:
   // This channel filter is intended to be used by connections on xDS enabled
   // servers configured with RBAC. The RBAC filter fetches the RBAC policy from
@@ -45,9 +45,16 @@ class RbacFilter : public ChannelFilter {
   static absl::StatusOr<RbacFilter> Create(const ChannelArgs& args,
                                            ChannelFilter::Args filter_args);
 
-  // Construct a promise for one call.
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+  class Call {
+   public:
+    absl::Status OnClientInitialMetadata(ClientMetadata& md,
+                                         RbacFilter* filter);
+    static const NoInterceptor OnServerInitialMetadata;
+    static const NoInterceptor OnServerTrailingMetadata;
+    static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnServerToClientMessage;
+    static const NoInterceptor OnFinalize;
+  };
 
  private:
   RbacFilter(size_t index,
diff --git a/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc b/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc
index 3d9a23fcc7c..b79090ddab9 100644
--- a/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc
+++ b/src/core/ext/filters/server_config_selector/server_config_selector_filter.cc
@@ -47,7 +47,8 @@ namespace grpc_core {
 
 namespace {
 
-class ServerConfigSelectorFilter final : public ChannelFilter {
+class ServerConfigSelectorFilter final
+    : public ImplementChannelFilter<ServerConfigSelectorFilter> {
  public:
   ~ServerConfigSelectorFilter() override;
 
@@ -60,8 +61,16 @@ class ServerConfigSelectorFilter final : public ChannelFilter {
   static absl::StatusOr<ServerConfigSelectorFilter> Create(
       const ChannelArgs& args, ChannelFilter::Args);
 
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+  class Call {
+   public:
+    absl::Status OnClientInitialMetadata(ClientMetadata& md,
+                                         ServerConfigSelectorFilter* filter);
+    static const NoInterceptor OnServerInitialMetadata;
+    static const NoInterceptor OnServerTrailingMetadata;
+    static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnServerToClientMessage;
+    static const NoInterceptor OnFinalize;
+  };
 
   absl::StatusOr<RefCountedPtr<ServerConfigSelector>> config_selector() {
     MutexLock lock(&state_->mu);
@@ -130,25 +139,28 @@ ServerConfigSelectorFilter::~ServerConfigSelectorFilter() {
   }
 }
 
-ArenaPromise<ServerMetadataHandle> ServerConfigSelectorFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
-  auto sel = config_selector();
-  if (!sel.ok()) return Immediate(ServerMetadataFromStatus(sel.status()));
-  auto call_config =
-      sel.value()->GetCallConfig(call_args.client_initial_metadata.get());
+absl::Status ServerConfigSelectorFilter::Call::OnClientInitialMetadata(
+    ClientMetadata& md, ServerConfigSelectorFilter* filter) {
+  auto sel = filter->config_selector();
+  if (!sel.ok()) return sel.status();
+  auto call_config = sel.value()->GetCallConfig(&md);
   if (!call_config.ok()) {
-    auto r = Immediate(ServerMetadataFromStatus(
-        absl::UnavailableError(StatusToString(call_config.status()))));
-    return std::move(r);
+    return absl::UnavailableError(StatusToString(call_config.status()));
   }
   auto* service_config_call_data =
       GetContext<Arena>()->New<ServiceConfigCallData>(
           GetContext<Arena>(), GetContext<grpc_call_context_element>());
   service_config_call_data->SetServiceConfig(
       std::move(call_config->service_config), call_config->method_configs);
-  return next_promise_factory(std::move(call_args));
+  return absl::OkStatus();
 }
 
+const NoInterceptor ServerConfigSelectorFilter::Call::OnServerInitialMetadata;
+const NoInterceptor ServerConfigSelectorFilter::Call::OnServerTrailingMetadata;
+const NoInterceptor ServerConfigSelectorFilter::Call::OnClientToServerMessage;
+const NoInterceptor ServerConfigSelectorFilter::Call::OnServerToClientMessage;
+const NoInterceptor ServerConfigSelectorFilter::Call::OnFinalize;
+
 }  // namespace
 
 const grpc_channel_filter kServerConfigSelectorFilter =
diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.cc b/src/core/ext/filters/stateful_session/stateful_session_filter.cc
index f0c3afb2d0e..65fa3dc0bd0 100644
--- a/src/core/ext/filters/stateful_session/stateful_session_filter.cc
+++ b/src/core/ext/filters/stateful_session/stateful_session_filter.cc
@@ -58,6 +58,9 @@
 namespace grpc_core {
 
 TraceFlag grpc_stateful_session_filter_trace(false, "stateful_session_filter");
+const NoInterceptor StatefulSessionFilter::Call::OnClientToServerMessage;
+const NoInterceptor StatefulSessionFilter::Call::OnServerToClientMessage;
+const NoInterceptor StatefulSessionFilter::Call::OnFinalize;
 
 UniqueTypeName XdsOverrideHostAttribute::TypeName() {
   static UniqueTypeName::Factory kFactory("xds_override_host");
@@ -103,7 +106,7 @@ void MaybeUpdateServerInitialMetadata(
     bool cluster_changed, absl::string_view actual_cluster,
     absl::string_view cookie_address_list,
     XdsOverrideHostAttribute* override_host_attribute,
-    ServerMetadata* server_initial_metadata) {
+    ServerMetadata& server_initial_metadata) {
   // If cookie doesn't need to change, do nothing.
   if (cookie_address_list == override_host_attribute->actual_address_list() &&
       !cluster_changed) {
@@ -121,7 +124,7 @@ void MaybeUpdateServerInitialMetadata(
     parts.emplace_back(
         absl::StrCat("Max-Age=", cookie_config->ttl.as_timespec().tv_sec));
   }
-  server_initial_metadata->Append(
+  server_initial_metadata.Append(
       "set-cookie", Slice::FromCopiedString(absl::StrJoin(parts, "; ")),
       [](absl::string_view error, const Slice&) {
         Crash(absl::StrCat("ERROR ADDING set-cookie METADATA: ", error));
@@ -168,12 +171,11 @@ absl::string_view GetClusterToUse(
   return absl::StripPrefix(arena_allocated_cluster, kClusterPrefix);
 }
 
-std::string GetCookieValue(const ClientMetadataHandle& client_initial_metadata,
+std::string GetCookieValue(const ClientMetadata& client_initial_metadata,
                            absl::string_view cookie_name) {
   // Check to see if the cookie header is present.
   std::string buffer;
-  auto header_value =
-      client_initial_metadata->GetStringValue("cookie", &buffer);
+  auto header_value = client_initial_metadata.GetStringValue("cookie", &buffer);
   if (!header_value.has_value()) return "";
   // Parse cookie header.
   std::vector<absl::string_view> values;
@@ -193,13 +195,14 @@ std::string GetCookieValue(const ClientMetadataHandle& client_initial_metadata,
 }
 
 bool IsConfiguredPath(absl::string_view configured_path,
-                      const ClientMetadataHandle& client_initial_metadata) {
+                      const ClientMetadata& client_initial_metadata) {
   // No path configured meaning all paths match
   if (configured_path.empty()) {
     return true;
   }
   // Check to see if the configured path matches the request path.
-  Slice* path_slice = client_initial_metadata->get_pointer(HttpPathMetadata());
+  const Slice* path_slice =
+      client_initial_metadata.get_pointer(HttpPathMetadata());
   GPR_ASSERT(path_slice != nullptr);
   absl::string_view path = path_slice->as_string_view();
   // Matching criteria from
@@ -218,9 +221,8 @@ bool IsConfiguredPath(absl::string_view configured_path,
 }
 }  // namespace
 
-// Construct a promise for one call.
-ArenaPromise<ServerMetadataHandle> StatefulSessionFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
+void StatefulSessionFilter::Call::OnClientInitialMetadata(
+    ClientMetadata& md, StatefulSessionFilter* filter) {
   // Get config.
   auto* service_config_call_data = static_cast<ServiceConfigCallData*>(
       GetContext<
@@ -229,62 +231,57 @@ ArenaPromise<ServerMetadataHandle> StatefulSessionFilter::MakeCallPromise(
   GPR_ASSERT(service_config_call_data != nullptr);
   auto* method_params = static_cast<StatefulSessionMethodParsedConfig*>(
       service_config_call_data->GetMethodParsedConfig(
-          service_config_parser_index_));
+          filter->service_config_parser_index_));
   GPR_ASSERT(method_params != nullptr);
-  auto* cookie_config = method_params->GetConfig(index_);
-  GPR_ASSERT(cookie_config != nullptr);
-  if (!cookie_config->name.has_value() ||
-      !IsConfiguredPath(cookie_config->path,
-                        call_args.client_initial_metadata)) {
-    return next_promise_factory(std::move(call_args));
+  cookie_config_ = method_params->GetConfig(filter->index_);
+  GPR_ASSERT(cookie_config_ != nullptr);
+  if (!cookie_config_->name.has_value() ||
+      !IsConfiguredPath(cookie_config_->path, md)) {
+    return;
   }
   // Base64-decode cookie value.
-  std::string cookie_value =
-      GetCookieValue(call_args.client_initial_metadata, *cookie_config->name);
+  std::string cookie_value = GetCookieValue(md, *cookie_config_->name);
   // Cookie format is "host;cluster"
   std::pair<absl::string_view, absl::string_view> host_cluster =
       absl::StrSplit(cookie_value, absl::MaxSplits(';', 1));
-  absl::string_view cookie_address_list;
   // Allocate the string on the arena, so that it has the right lifetime.
   if (!host_cluster.first.empty()) {
-    cookie_address_list = AllocateStringOnArena(host_cluster.first);
+    cookie_address_list_ = AllocateStringOnArena(host_cluster.first);
   }
   // Set override host attribute.
-  auto* override_host_attribute =
+  override_host_attribute_ =
       GetContext<Arena>()->ManagedNew<XdsOverrideHostAttribute>(
-          cookie_address_list);
-  service_config_call_data->SetCallAttribute(override_host_attribute);
+          cookie_address_list_);
+  service_config_call_data->SetCallAttribute(override_host_attribute_);
   // Check if the cluster override is valid, and apply it if necessary.
   // Note that cluster_name will point to an arena-allocated string
   // that will still be alive when we see the server initial metadata.
   // If the cluster name is empty, that means we cannot use a
   // cluster override (i.e., the route uses a cluster specifier plugin).
-  absl::string_view cluster_name =
+  cluster_name_ =
       GetClusterToUse(host_cluster.second, service_config_call_data);
-  bool cluster_changed = cluster_name != host_cluster.second;
-  // Intercept server initial metadata.
-  call_args.server_initial_metadata->InterceptAndMap(
-      [cookie_config, cluster_changed, cluster_name, cookie_address_list,
-       override_host_attribute](ServerMetadataHandle md) {
-        // Add cookie to server initial metadata if needed.
-        MaybeUpdateServerInitialMetadata(cookie_config, cluster_changed,
-                                         cluster_name, cookie_address_list,
-                                         override_host_attribute, md.get());
-        return md;
-      });
-  return Map(next_promise_factory(std::move(call_args)),
-             [cookie_config, cluster_changed, cluster_name, cookie_address_list,
-              override_host_attribute](ServerMetadataHandle md) {
-               // If we got a Trailers-Only response, then add the
-               // cookie to the trailing metadata instead of the
-               // initial metadata.
-               if (md->get(GrpcTrailersOnly()).value_or(false)) {
-                 MaybeUpdateServerInitialMetadata(
-                     cookie_config, cluster_changed, cluster_name,
-                     cookie_address_list, override_host_attribute, md.get());
-               }
-               return md;
-             });
+  cluster_changed_ = cluster_name_ != host_cluster.second;
+  perform_filtering_ = true;
+}
+
+void StatefulSessionFilter::Call::OnServerInitialMetadata(ServerMetadata& md) {
+  if (!perform_filtering_) return;
+  // Add cookie to server initial metadata if needed.
+  MaybeUpdateServerInitialMetadata(cookie_config_, cluster_changed_,
+                                   cluster_name_, cookie_address_list_,
+                                   override_host_attribute_, md);
+}
+
+void StatefulSessionFilter::Call::OnServerTrailingMetadata(ServerMetadata& md) {
+  if (!perform_filtering_) return;
+  // If we got a Trailers-Only response, then add the
+  // cookie to the trailing metadata instead of the
+  // initial metadata.
+  if (md.get(GrpcTrailersOnly()).value_or(false)) {
+    MaybeUpdateServerInitialMetadata(cookie_config_, cluster_changed_,
+                                     cluster_name_, cookie_address_list_,
+                                     override_host_attribute_, md);
+  }
 }
 
 void StatefulSessionFilterRegister(CoreConfiguration::Builder* builder) {
diff --git a/src/core/ext/filters/stateful_session/stateful_session_filter.h b/src/core/ext/filters/stateful_session/stateful_session_filter.h
index 9942900191c..29b5c878dd9 100644
--- a/src/core/ext/filters/stateful_session/stateful_session_filter.h
+++ b/src/core/ext/filters/stateful_session/stateful_session_filter.h
@@ -26,6 +26,7 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
+#include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/promise_based_filter.h"
@@ -68,16 +69,32 @@ class XdsOverrideHostAttribute
 };
 
 // A filter to provide cookie-based stateful session affinity.
-class StatefulSessionFilter : public ChannelFilter {
+class StatefulSessionFilter
+    : public ImplementChannelFilter<StatefulSessionFilter> {
  public:
   static const grpc_channel_filter kFilter;
 
   static absl::StatusOr<StatefulSessionFilter> Create(
       const ChannelArgs& args, ChannelFilter::Args filter_args);
 
-  // Construct a promise for one call.
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+  class Call {
+   public:
+    void OnClientInitialMetadata(ClientMetadata& md,
+                                 StatefulSessionFilter* filter);
+    void OnServerInitialMetadata(ServerMetadata& md);
+    void OnServerTrailingMetadata(ServerMetadata& md);
+    static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnServerToClientMessage;
+    static const NoInterceptor OnFinalize;
+
+   private:
+    const StatefulSessionMethodParsedConfig::CookieConfig* cookie_config_;
+    XdsOverrideHostAttribute* override_host_attribute_;
+    absl::string_view cluster_name_;
+    absl::string_view cookie_address_list_;
+    bool cluster_changed_;
+    bool perform_filtering_ = false;
+  };
 
  private:
   explicit StatefulSessionFilter(ChannelFilter::Args filter_args);
diff --git a/src/core/ext/transport/chaotic_good/chaotic_good_transport.cc b/src/core/ext/transport/chaotic_good/chaotic_good_transport.cc
new file mode 100644
index 00000000000..163f994d35f
--- /dev/null
+++ b/src/core/ext/transport/chaotic_good/chaotic_good_transport.cc
@@ -0,0 +1,19 @@
+// Copyright 2023 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h"
+
+namespace grpc_core {}  // namespace grpc_core
diff --git a/src/core/ext/transport/chaotic_good/chaotic_good_transport.h b/src/core/ext/transport/chaotic_good/chaotic_good_transport.h
new file mode 100644
index 00000000000..1096486bbea
--- /dev/null
+++ b/src/core/ext/transport/chaotic_good/chaotic_good_transport.h
@@ -0,0 +1,111 @@
+// Copyright 2023 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CHAOTIC_GOOD_TRANSPORT_H
+#define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CHAOTIC_GOOD_TRANSPORT_H
+
+#include <grpc/support/port_platform.h>
+
+#include "absl/random/random.h"
+
+#include "src/core/ext/transport/chaotic_good/frame.h"
+#include "src/core/ext/transport/chaotic_good/frame_header.h"
+#include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
+#include "src/core/lib/promise/if.h"
+#include "src/core/lib/promise/promise.h"
+#include "src/core/lib/promise/try_join.h"
+#include "src/core/lib/promise/try_seq.h"
+#include "src/core/lib/transport/promise_endpoint.h"
+
+namespace grpc_core {
+namespace chaotic_good {
+
+class ChaoticGoodTransport {
+ public:
+  ChaoticGoodTransport(std::unique_ptr<PromiseEndpoint> control_endpoint,
+                       std::unique_ptr<PromiseEndpoint> data_endpoint)
+      : control_endpoint_(std::move(control_endpoint)),
+        data_endpoint_(std::move(data_endpoint)) {}
+
+  auto WriteFrame(const FrameInterface& frame) {
+    auto buffers = frame.Serialize(&encoder_);
+    return TryJoin<absl::StatusOr>(
+        control_endpoint_->Write(std::move(buffers.control)),
+        data_endpoint_->Write(std::move(buffers.data)));
+  }
+
+  // Read frame header and payloads for control and data portions of one frame.
+  // Resolves to StatusOr<tuple<FrameHeader, BufferPair>>.
+  auto ReadFrameBytes() {
+    return TrySeq(
+        control_endpoint_->ReadSlice(FrameHeader::frame_header_size_),
+        [this](Slice read_buffer) {
+          auto frame_header =
+              FrameHeader::Parse(reinterpret_cast<const uint8_t*>(
+                  GRPC_SLICE_START_PTR(read_buffer.c_slice())));
+          // Read header and trailers from control endpoint.
+          // Read message padding and message from data endpoint.
+          return If(
+              frame_header.ok(),
+              [this, &frame_header] {
+                const uint32_t message_padding = std::exchange(
+                    last_message_padding_, frame_header->message_padding);
+                const uint32_t message_length = frame_header->message_length;
+                return Map(
+                    TryJoin<absl::StatusOr>(
+                        control_endpoint_->Read(frame_header->GetFrameLength()),
+                        TrySeq(data_endpoint_->Read(message_padding),
+                               [this, message_length]() {
+                                 return data_endpoint_->Read(message_length);
+                               })),
+                    [frame_header = *frame_header](
+                        absl::StatusOr<std::tuple<SliceBuffer, SliceBuffer>>
+                            buffers)
+                        -> absl::StatusOr<std::tuple<FrameHeader, BufferPair>> {
+                      if (!buffers.ok()) return buffers.status();
+                      return std::tuple<FrameHeader, BufferPair>(
+                          frame_header,
+                          BufferPair{std::move(std::get<0>(*buffers)),
+                                     std::move(std::get<1>(*buffers))});
+                    });
+              },
+              [&frame_header]()
+                  -> absl::StatusOr<std::tuple<FrameHeader, BufferPair>> {
+                return frame_header.status();
+              });
+        });
+  }
+
+  absl::Status DeserializeFrame(FrameHeader header, BufferPair buffers,
+                                Arena* arena, FrameInterface& frame) {
+    return frame.Deserialize(&parser_, header, bitgen_, arena,
+                             std::move(buffers));
+  }
+
+  // Skip a frame, but correctly handle any hpack state updates.
+  void SkipFrame(FrameHeader, BufferPair) { Crash("not implemented"); }
+
+ private:
+  const std::unique_ptr<PromiseEndpoint> control_endpoint_;
+  const std::unique_ptr<PromiseEndpoint> data_endpoint_;
+  uint32_t last_message_padding_ = 0;
+  HPackCompressor encoder_;
+  HPackParser parser_;
+  absl::BitGen bitgen_;
+};
+
+}  // namespace chaotic_good
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_CHAOTIC_GOOD_TRANSPORT_H
diff --git a/src/core/ext/transport/chaotic_good/client_transport.cc b/src/core/ext/transport/chaotic_good/client_transport.cc
index 24f30687182..d4075bcad1b 100644
--- a/src/core/ext/transport/chaotic_good/client_transport.cc
+++ b/src/core/ext/transport/chaotic_good/client_transport.cc
@@ -17,9 +17,11 @@
 #include "src/core/ext/transport/chaotic_good/client_transport.h"
 
 #include <cstdint>
+#include <cstdlib>
 #include <memory>
 #include <string>
 #include <tuple>
+#include <utility>
 
 #include "absl/random/bit_gen_ref.h"
 #include "absl/random/random.h"
@@ -36,9 +38,13 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/activity.h"
+#include "src/core/lib/promise/all_ok.h"
 #include "src/core/lib/promise/event_engine_wakeup_scheduler.h"
 #include "src/core/lib/promise/loop.h"
+#include "src/core/lib/promise/map.h"
+#include "src/core/lib/promise/promise.h"
 #include "src/core/lib/promise/try_join.h"
+#include "src/core/lib/promise/try_seq.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/lib/slice/slice.h"
@@ -49,59 +55,15 @@
 namespace grpc_core {
 namespace chaotic_good {
 
-ClientTransport::ClientTransport(
-    std::unique_ptr<PromiseEndpoint> control_endpoint,
-    std::unique_ptr<PromiseEndpoint> data_endpoint,
-    std::shared_ptr<grpc_event_engine::experimental::EventEngine> event_engine)
-    : outgoing_frames_(MpscReceiver<ClientFrame>(4)),
-      control_endpoint_(std::move(control_endpoint)),
-      data_endpoint_(std::move(data_endpoint)),
-      control_endpoint_write_buffer_(SliceBuffer()),
-      data_endpoint_write_buffer_(SliceBuffer()),
-      hpack_compressor_(std::make_unique<HPackCompressor>()),
-      hpack_parser_(std::make_unique<HPackParser>()),
-      memory_allocator_(
-          ResourceQuota::Default()->memory_quota()->CreateMemoryAllocator(
-              "client_transport")),
-      arena_(MakeScopedArena(1024, &memory_allocator_)),
-      context_(arena_.get()),
-      event_engine_(event_engine) {
-  auto write_loop = Loop([this] {
+auto ChaoticGoodClientTransport::TransportWriteLoop() {
+  return Loop([this] {
     return TrySeq(
         // Get next outgoing frame.
-        this->outgoing_frames_.Next(),
-        // Construct data buffers that will be sent to the endpoints.
+        outgoing_frames_.Next(),
+        // Serialize and write it out.
         [this](ClientFrame client_frame) {
-          MatchMutable(
-              &client_frame,
-              [this](ClientFragmentFrame* frame) mutable {
-                control_endpoint_write_buffer_.Append(
-                    frame->Serialize(hpack_compressor_.get()));
-                if (frame->message != nullptr) {
-                  std::string message_padding(frame->message_padding, '0');
-                  Slice slice(grpc_slice_from_cpp_string(message_padding));
-                  // Append message padding to data_endpoint_buffer.
-                  data_endpoint_write_buffer_.Append(std::move(slice));
-                  // Append message payload to data_endpoint_buffer.
-                  frame->message->payload()->MoveFirstNBytesIntoSliceBuffer(
-                      frame->message->payload()->Length(),
-                      data_endpoint_write_buffer_);
-                }
-              },
-              [this](CancelFrame* frame) mutable {
-                control_endpoint_write_buffer_.Append(
-                    frame->Serialize(hpack_compressor_.get()));
-              });
-          return absl::OkStatus();
+          return transport_.WriteFrame(GetFrameInterface(client_frame));
         },
-        // Write buffers to corresponding endpoints concurrently.
-        [this]() {
-          return TryJoin<absl::StatusOr>(
-              control_endpoint_->Write(
-                  std::move(control_endpoint_write_buffer_)),
-              data_endpoint_->Write(std::move(data_endpoint_write_buffer_)));
-        },
-        // Finish writes to difference endpoints and continue the loop.
         []() -> LoopCtl<absl::Status> {
           // The write failures will be caught in TrySeq and exit loop.
           // Therefore, only need to return Continue() in the last lambda
@@ -109,78 +71,215 @@ ClientTransport::ClientTransport(
           return Continue();
         });
   });
-  writer_ = MakeActivity(
-      // Continuously write next outgoing frames to promise endpoints.
-      std::move(write_loop), EventEngineWakeupScheduler(event_engine_),
-      [this](absl::Status status) {
-        if (!(status.ok() || status.code() == absl::StatusCode::kCancelled)) {
-          this->AbortWithError();
-        }
+}
+
+absl::optional<CallHandler> ChaoticGoodClientTransport::LookupStream(
+    uint32_t stream_id) {
+  MutexLock lock(&mu_);
+  auto it = stream_map_.find(stream_id);
+  if (it == stream_map_.end()) {
+    return absl::nullopt;
+  }
+  return it->second;
+}
+
+auto ChaoticGoodClientTransport::PushFrameIntoCall(ServerFragmentFrame frame,
+                                                   CallHandler call_handler) {
+  auto& headers = frame.headers;
+  return TrySeq(
+      If(
+          headers != nullptr,
+          [call_handler, &headers]() mutable {
+            return call_handler.PushServerInitialMetadata(std::move(headers));
+          },
+          []() -> StatusFlag { return Success{}; }),
+      [call_handler, message = std::move(frame.message)]() mutable {
+        return If(
+            message.has_value(),
+            [&call_handler, &message]() mutable {
+              return call_handler.PushMessage(std::move(message->message));
+            },
+            []() -> StatusFlag { return Success{}; });
       },
-      // Hold Arena in activity for GetContext<Arena> usage.
-      arena_.get());
-  auto read_loop = Loop([this] {
+      [call_handler, trailers = std::move(frame.trailers)]() mutable {
+        return If(
+            trailers != nullptr,
+            [&call_handler, &trailers]() mutable {
+              return call_handler.PushServerTrailingMetadata(
+                  std::move(trailers));
+            },
+            []() -> StatusFlag { return Success{}; });
+      });
+}
+
+auto ChaoticGoodClientTransport::TransportReadLoop() {
+  return Loop([this] {
     return TrySeq(
-        // Read frame header from control endpoint.
-        // TODO(ladynana): remove memcpy in ReadSlice.
-        this->control_endpoint_->ReadSlice(FrameHeader::frame_header_size_),
-        // Read different parts of the server frame from control/data endpoints
-        // based on frame header.
-        [this](Slice read_buffer) mutable {
-          frame_header_ = std::make_shared<FrameHeader>(
-              FrameHeader::Parse(
-                  reinterpret_cast<const uint8_t*>(
-                      GRPC_SLICE_START_PTR(read_buffer.c_slice())))
-                  .value());
-          // Read header and trailers from control endpoint.
-          // Read message padding and message from data endpoint.
-          return TryJoin<absl::StatusOr>(
-              control_endpoint_->Read(frame_header_->GetFrameLength()),
-              data_endpoint_->Read(frame_header_->message_padding +
-                                   frame_header_->message_length));
+        transport_.ReadFrameBytes(),
+        [](std::tuple<FrameHeader, BufferPair> frame_bytes)
+            -> absl::StatusOr<std::tuple<FrameHeader, BufferPair>> {
+          const auto& frame_header = std::get<0>(frame_bytes);
+          if (frame_header.type != FrameType::kFragment) {
+            return absl::InternalError(
+                absl::StrCat("Expected fragment frame, got ",
+                             static_cast<int>(frame_header.type)));
+          }
+          return frame_bytes;
         },
-        // Construct and send the server frame to corresponding stream.
-        [this](std::tuple<SliceBuffer, SliceBuffer> ret) mutable {
-          control_endpoint_read_buffer_ = std::move(std::get<0>(ret));
-          // Discard message padding and only keep message in data read buffer.
-          std::get<1>(ret).MoveLastNBytesIntoSliceBuffer(
-              frame_header_->message_length, data_endpoint_read_buffer_);
+        [this](std::tuple<FrameHeader, BufferPair> frame_bytes) {
+          const auto& frame_header = std::get<0>(frame_bytes);
+          auto& buffers = std::get<1>(frame_bytes);
+          absl::optional<CallHandler> call_handler =
+              LookupStream(frame_header.stream_id);
           ServerFragmentFrame frame;
-          // Initialized to get this_cpu() info in global_stat().
-          ExecCtx exec_ctx;
-          // Deserialize frame from read buffer.
-          absl::BitGen bitgen;
-          auto status = frame.Deserialize(hpack_parser_.get(), *frame_header_,
-                                          absl::BitGenRef(bitgen),
-                                          control_endpoint_read_buffer_);
-          GPR_ASSERT(status.ok());
-          // Move message into frame.
-          frame.message = arena_->MakePooled<Message>(
-              std::move(data_endpoint_read_buffer_), 0);
-          MutexLock lock(&mu_);
-          const uint32_t stream_id = frame_header_->stream_id;
-          return stream_map_[stream_id]->Push(ServerFrame(std::move(frame)));
-        },
-        // Check if send frame to corresponding stream successfully.
-        [](bool ret) -> LoopCtl<absl::Status> {
-          if (ret) {
-            // Send incoming frames successfully.
-            return Continue();
+          absl::Status deserialize_status;
+          if (call_handler.has_value()) {
+            deserialize_status = transport_.DeserializeFrame(
+                frame_header, std::move(buffers), call_handler->arena(), frame);
           } else {
-            return absl::InternalError("Send incoming frames failed.");
+            // Stream not found, skip the frame.
+            transport_.SkipFrame(frame_header, std::move(buffers));
+            deserialize_status = absl::OkStatus();
           }
-        });
+          return If(
+              deserialize_status.ok() && call_handler.has_value(),
+              [this, &frame, &call_handler]() {
+                return call_handler->SpawnWaitable(
+                    "push-frame", [this, call_handler = *call_handler,
+                                   frame = std::move(frame)]() mutable {
+                      return Map(call_handler.CancelIfFails(PushFrameIntoCall(
+                                     std::move(frame), call_handler)),
+                                 [](StatusFlag f) {
+                                   return StatusCast<absl::Status>(f);
+                                 });
+                    });
+              },
+              [&deserialize_status]() -> absl::Status {
+                // Stream not found, nothing to do.
+                return std::move(deserialize_status);
+              });
+        },
+        []() -> LoopCtl<absl::Status> { return Continue{}; });
   });
-  reader_ = MakeActivity(
-      // Continuously read next incoming frames from promise endpoints.
-      std::move(read_loop), EventEngineWakeupScheduler(event_engine_),
-      [this](absl::Status status) {
-        if (!(status.ok() || status.code() == absl::StatusCode::kCancelled)) {
-          this->AbortWithError();
-        }
+}
+
+auto ChaoticGoodClientTransport::OnTransportActivityDone() {
+  return [this](absl::Status status) {
+    if (!(status.ok() || status.code() == absl::StatusCode::kCancelled)) {
+      this->AbortWithError();
+    }
+  };
+}
+
+ChaoticGoodClientTransport::ChaoticGoodClientTransport(
+    std::unique_ptr<PromiseEndpoint> control_endpoint,
+    std::unique_ptr<PromiseEndpoint> data_endpoint,
+    std::shared_ptr<grpc_event_engine::experimental::EventEngine> event_engine)
+    : outgoing_frames_(4),
+      transport_(std::move(control_endpoint), std::move(data_endpoint)),
+      writer_{
+          MakeActivity(
+              // Continuously write next outgoing frames to promise endpoints.
+              TransportWriteLoop(), EventEngineWakeupScheduler(event_engine),
+              OnTransportActivityDone()),
+      },
+      reader_{MakeActivity(
+          // Continuously read next incoming frames from promise endpoints.
+          TransportReadLoop(), EventEngineWakeupScheduler(event_engine),
+          OnTransportActivityDone())} {}
+
+ChaoticGoodClientTransport::~ChaoticGoodClientTransport() {
+  if (writer_ != nullptr) {
+    writer_.reset();
+  }
+  if (reader_ != nullptr) {
+    reader_.reset();
+  }
+}
+
+void ChaoticGoodClientTransport::AbortWithError() {
+  // Mark transport as unavailable when the endpoint write/read failed.
+  // Close all the available pipes.
+  outgoing_frames_.MarkClosed();
+  ReleasableMutexLock lock(&mu_);
+  StreamMap stream_map = std::move(stream_map_);
+  stream_map_.clear();
+  lock.Release();
+  for (const auto& pair : stream_map) {
+    auto call_handler = pair.second;
+    call_handler.SpawnInfallible("cancel", [call_handler]() mutable {
+      call_handler.Cancel(ServerMetadataFromStatus(
+          absl::UnavailableError("Transport closed.")));
+      return Empty{};
+    });
+  }
+}
+
+uint32_t ChaoticGoodClientTransport::MakeStream(CallHandler call_handler) {
+  ReleasableMutexLock lock(&mu_);
+  const uint32_t stream_id = next_stream_id_++;
+  stream_map_.emplace(stream_id, call_handler);
+  lock.Release();
+  call_handler.OnDone([this, stream_id]() {
+    MutexLock lock(&mu_);
+    stream_map_.erase(stream_id);
+  });
+  return stream_id;
+}
+
+auto ChaoticGoodClientTransport::CallOutboundLoop(uint32_t stream_id,
+                                                  CallHandler call_handler) {
+  auto send_fragment = [stream_id,
+                        outgoing_frames = outgoing_frames_.MakeSender()](
+                           ClientFragmentFrame frame) mutable {
+    frame.stream_id = stream_id;
+    return Map(outgoing_frames.Send(std::move(frame)),
+               [](bool success) -> absl::Status {
+                 if (!success) {
+                   // Failed to send outgoing frame.
+                   return absl::UnavailableError("Transport closed.");
+                 }
+                 return absl::OkStatus();
+               });
+  };
+  return TrySeq(
+      // Wait for initial metadata then send it out.
+      call_handler.PullClientInitialMetadata(),
+      [send_fragment](ClientMetadataHandle md) mutable {
+        ClientFragmentFrame frame;
+        frame.headers = std::move(md);
+        return send_fragment(std::move(frame));
       },
-      // Hold Arena in activity for GetContext<Arena> usage.
-      arena_.get());
+      // Continuously send client frame with client to server messages.
+      ForEach(OutgoingMessages(call_handler),
+              [send_fragment,
+               aligned_bytes = aligned_bytes_](MessageHandle message) mutable {
+                ClientFragmentFrame frame;
+                // Construct frame header (flags, header_length and
+                // trailer_length will be added in serialization).
+                const uint32_t message_length = message->payload()->Length();
+                const uint32_t padding =
+                    message_length % aligned_bytes == 0
+                        ? 0
+                        : aligned_bytes - message_length % aligned_bytes;
+                GPR_ASSERT((message_length + padding) % aligned_bytes == 0);
+                frame.message = FragmentMessage(std::move(message), padding,
+                                                message_length);
+                return send_fragment(std::move(frame));
+              }),
+      [send_fragment]() mutable {
+        ClientFragmentFrame frame;
+        frame.end_of_stream = true;
+        return send_fragment(std::move(frame));
+      });
+}
+
+void ChaoticGoodClientTransport::StartCall(CallHandler call_handler) {
+  // At this point, the connection is set up.
+  // Start sending data frames.
+  call_handler.SpawnGuarded("outbound_loop", [this, call_handler]() mutable {
+    return CallOutboundLoop(MakeStream(call_handler), call_handler);
+  });
 }
 
 }  // namespace chaotic_good
diff --git a/src/core/ext/transport/chaotic_good/client_transport.h b/src/core/ext/transport/chaotic_good/client_transport.h
index 23ecdbfe84a..b8d515f9896 100644
--- a/src/core/ext/transport/chaotic_good/client_transport.h
+++ b/src/core/ext/transport/chaotic_good/client_transport.h
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
+#include <cstdint>
 #include <initializer_list>  // IWYU pragma: keep
 #include <map>
 #include <memory>
@@ -28,6 +29,8 @@
 #include <utility>
 
 #include "absl/base/thread_annotations.h"
+#include "absl/container/flat_hash_map.h"
+#include "absl/random/random.h"
 #include "absl/status/status.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
@@ -35,6 +38,7 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/event_engine/memory_allocator.h>
 
+#include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h"
 #include "src/core/ext/transport/chaotic_good/frame.h"
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
@@ -61,178 +65,56 @@
 namespace grpc_core {
 namespace chaotic_good {
 
-class ClientTransport {
+class ChaoticGoodClientTransport final : public Transport,
+                                         public ClientTransport {
  public:
-  ClientTransport(std::unique_ptr<PromiseEndpoint> control_endpoint,
-                  std::unique_ptr<PromiseEndpoint> data_endpoint,
-                  std::shared_ptr<grpc_event_engine::experimental::EventEngine>
-                      event_engine);
-  ~ClientTransport() {
-    if (writer_ != nullptr) {
-      writer_.reset();
-    }
-    if (reader_ != nullptr) {
-      reader_.reset();
-    }
-  }
-  void AbortWithError() {
-    // Mark transport as unavailable when the endpoint write/read failed.
-    // Close all the available pipes.
-    if (!outgoing_frames_.IsClosed()) {
-      outgoing_frames_.MarkClosed();
-    }
-    MutexLock lock(&mu_);
-    for (const auto& pair : stream_map_) {
-      if (!pair.second->IsClose()) {
-        pair.second->MarkClose();
-      }
-    }
-  }
-  auto AddStream(CallArgs call_args) {
-    // At this point, the connection is set up.
-    // Start sending data frames.
-    uint32_t stream_id;
-    InterActivityPipe<ServerFrame, server_frame_queue_size_> pipe_server_frames;
-    {
-      MutexLock lock(&mu_);
-      stream_id = next_stream_id_++;
-      stream_map_.insert(
-          std::pair<uint32_t,
-                    std::shared_ptr<InterActivityPipe<
-                        ServerFrame, server_frame_queue_size_>::Sender>>(
-              stream_id, std::make_shared<InterActivityPipe<
-                             ServerFrame, server_frame_queue_size_>::Sender>(
-                             std::move(pipe_server_frames.sender))));
-    }
-    return TrySeq(
-        TryJoin<absl::StatusOr>(
-            // Continuously send client frame with client to server messages.
-            ForEach(std::move(*call_args.client_to_server_messages),
-                    [stream_id, initial_frame = true,
-                     client_initial_metadata =
-                         std::move(call_args.client_initial_metadata),
-                     outgoing_frames = outgoing_frames_.MakeSender(),
-                     this](MessageHandle result) mutable {
-                      ClientFragmentFrame frame;
-                      // Construct frame header (flags, header_length and
-                      // trailer_length will be added in serialization).
-                      uint32_t message_length = result->payload()->Length();
-                      frame.stream_id = stream_id;
-                      frame.message_padding = message_length % aligned_bytes;
-                      frame.message = std::move(result);
-                      if (initial_frame) {
-                        // Send initial frame with client intial metadata.
-                        frame.headers = std::move(client_initial_metadata);
-                        initial_frame = false;
-                      }
-                      return TrySeq(
-                          outgoing_frames.Send(ClientFrame(std::move(frame))),
-                          [](bool success) -> absl::Status {
-                            if (!success) {
-                              // TODO(ladynana): propagate the actual error
-                              // message from EventEngine.
-                              return absl::UnavailableError(
-                                  "Transport closed due to endpoint write/read "
-                                  "failed.");
-                            }
-                            return absl::OkStatus();
-                          });
-                    }),
-            // Continuously receive server frames from endpoints and save
-            // results to call_args.
-            Loop([server_initial_metadata = call_args.server_initial_metadata,
-                  server_to_client_messages =
-                      call_args.server_to_client_messages,
-                  receiver = std::move(pipe_server_frames.receiver)]() mutable {
-              return TrySeq(
-                  // Receive incoming server frame.
-                  receiver.Next(),
-                  // Save incomming frame results to call_args.
-                  [server_initial_metadata, server_to_client_messages](
-                      absl::optional<ServerFrame> server_frame) mutable {
-                    bool transport_closed = false;
-                    ServerFragmentFrame frame;
-                    if (!server_frame.has_value()) {
-                      // Incoming server frame pipe is closed, which only
-                      // happens when transport is aborted.
-                      transport_closed = true;
-                    } else {
-                      frame = std::move(
-                          absl::get<ServerFragmentFrame>(*server_frame));
-                    };
-                    bool has_headers = (frame.headers != nullptr);
-                    bool has_message = (frame.message != nullptr);
-                    bool has_trailers = (frame.trailers != nullptr);
-                    return TrySeq(
-                        If((!transport_closed) && has_headers,
-                           [server_initial_metadata,
-                            headers = std::move(frame.headers)]() mutable {
-                             return server_initial_metadata->Push(
-                                 std::move(headers));
-                           },
-                           [] { return false; }),
-                        If((!transport_closed) && has_message,
-                           [server_to_client_messages,
-                            message = std::move(frame.message)]() mutable {
-                             return server_to_client_messages->Push(
-                                 std::move(message));
-                           },
-                           [] { return false; }),
-                        If((!transport_closed) && has_trailers,
-                           [trailers = std::move(frame.trailers)]() mutable
-                           -> LoopCtl<ServerMetadataHandle> {
-                             return std::move(trailers);
-                           },
-                           [transport_closed]()
-                               -> LoopCtl<ServerMetadataHandle> {
-                             if (transport_closed) {
-                               // TODO(ladynana): propagate the actual error
-                               // message from EventEngine.
-                               return ServerMetadataFromStatus(
-                                   absl::UnavailableError(
-                                       "Transport closed due to endpoint "
-                                       "write/read failed."));
-                             }
-                             return Continue();
-                           }));
-                  });
-            })),
-        [](std::tuple<Empty, ServerMetadataHandle> ret) {
-          return std::move(std::get<1>(ret));
-        });
-  }
+  ChaoticGoodClientTransport(
+      std::unique_ptr<PromiseEndpoint> control_endpoint,
+      std::unique_ptr<PromiseEndpoint> data_endpoint,
+      std::shared_ptr<grpc_event_engine::experimental::EventEngine>
+          event_engine);
+  ~ChaoticGoodClientTransport() override;
+
+  FilterStackTransport* filter_stack_transport() override { return nullptr; }
+  ClientTransport* client_transport() override { return this; }
+  ServerTransport* server_transport() override { return nullptr; }
+  absl::string_view GetTransportName() const override { return "chaotic_good"; }
+  void SetPollset(grpc_stream*, grpc_pollset*) override {}
+  void SetPollsetSet(grpc_stream*, grpc_pollset_set*) override {}
+  void PerformOp(grpc_transport_op*) override { Crash("unimplemented"); }
+  grpc_endpoint* GetEndpoint() override { return nullptr; }
+  void Orphan() override { delete this; }
+
+  void StartCall(CallHandler call_handler) override;
+  void AbortWithError();
 
  private:
+  // Queue size of each stream pipe is set to 2, so that for each stream read it
+  // will queue at most 2 frames.
+  static const size_t kServerFrameQueueSize = 2;
+  using StreamMap = absl::flat_hash_map<uint32_t, CallHandler>;
+
+  uint32_t MakeStream(CallHandler call_handler);
+  absl::optional<CallHandler> LookupStream(uint32_t stream_id);
+  auto CallOutboundLoop(uint32_t stream_id, CallHandler call_handler);
+  auto OnTransportActivityDone();
+  auto TransportWriteLoop();
+  auto TransportReadLoop();
+  // Push one frame into a call
+  auto PushFrameIntoCall(ServerFragmentFrame frame, CallHandler call_handler);
+
   // Max buffer is set to 4, so that for stream writes each time it will queue
   // at most 2 frames.
   MpscReceiver<ClientFrame> outgoing_frames_;
-  // Queue size of each stream pipe is set to 2, so that for each stream read it
-  // will queue at most 2 frames.
-  static const size_t server_frame_queue_size_ = 2;
+  ChaoticGoodTransport transport_;
   // Assigned aligned bytes from setting frame.
-  size_t aligned_bytes = 64;
+  size_t aligned_bytes_ = 64;
   Mutex mu_;
   uint32_t next_stream_id_ ABSL_GUARDED_BY(mu_) = 1;
   // Map of stream incoming server frames, key is stream_id.
-  std::map<uint32_t, std::shared_ptr<InterActivityPipe<
-                         ServerFrame, server_frame_queue_size_>::Sender>>
-      stream_map_ ABSL_GUARDED_BY(mu_);
+  StreamMap stream_map_ ABSL_GUARDED_BY(mu_);
   ActivityPtr writer_;
   ActivityPtr reader_;
-  std::unique_ptr<PromiseEndpoint> control_endpoint_;
-  std::unique_ptr<PromiseEndpoint> data_endpoint_;
-  SliceBuffer control_endpoint_write_buffer_;
-  SliceBuffer data_endpoint_write_buffer_;
-  SliceBuffer control_endpoint_read_buffer_;
-  SliceBuffer data_endpoint_read_buffer_;
-  std::unique_ptr<HPackCompressor> hpack_compressor_;
-  std::unique_ptr<HPackParser> hpack_parser_;
-  std::shared_ptr<FrameHeader> frame_header_;
-  MemoryAllocator memory_allocator_;
-  ScopedArenaPtr arena_;
-  promise_detail::Context<Arena> context_;
-  // Use to synchronize writer_ and reader_ activity with outside activities;
-  std::shared_ptr<grpc_event_engine::experimental::EventEngine> event_engine_;
 };
 
 }  // namespace chaotic_good
diff --git a/src/core/ext/transport/chaotic_good/frame.cc b/src/core/ext/transport/chaotic_good/frame.cc
index f49fa4c4f3b..d2c0b3a4fc0 100644
--- a/src/core/ext/transport/chaotic_good/frame.cc
+++ b/src/core/ext/transport/chaotic_good/frame.cc
@@ -40,6 +40,10 @@
 namespace grpc_core {
 namespace chaotic_good {
 
+namespace {
+const uint8_t kZeros[64] = {};
+}
+
 namespace {
 const NoDestruct<Slice> kZeroSlice{[] {
   // Frame header size is fixed to 24 bytes.
@@ -50,53 +54,65 @@ const NoDestruct<Slice> kZeroSlice{[] {
 
 class FrameSerializer {
  public:
-  explicit FrameSerializer(FrameType frame_type, uint32_t stream_id,
-                           uint32_t message_padding) {
-    output_.AppendIndexed(kZeroSlice->Copy());
+  explicit FrameSerializer(FrameType frame_type, uint32_t stream_id) {
+    output_.control.AppendIndexed(kZeroSlice->Copy());
     header_.type = frame_type;
     header_.stream_id = stream_id;
-    header_.message_padding = message_padding;
     header_.flags.SetAll(false);
   }
+
   // If called, must be called before AddTrailers, Finish.
   SliceBuffer& AddHeaders() {
     header_.flags.set(0);
-    return output_;
+    return output_.control;
+  }
+
+  void AddMessage(const FragmentMessage& msg) {
+    header_.flags.set(1);
+    header_.message_length = msg.length;
+    header_.message_padding = msg.padding;
+    output_.data = msg.message->payload()->Copy();
+    if (msg.padding != 0) {
+      output_.data.Append(Slice::FromStaticBuffer(kZeros, msg.padding));
+    }
   }
+
   // If called, must be called before Finish.
   SliceBuffer& AddTrailers() {
-    header_.flags.set(1);
-    header_.header_length = output_.Length() - FrameHeader::frame_header_size_;
-    return output_;
+    header_.flags.set(2);
+    header_.header_length =
+        output_.control.Length() - FrameHeader::frame_header_size_;
+    return output_.control;
   }
 
-  SliceBuffer Finish() {
+  BufferPair Finish() {
     // Calculate frame header_length or trailer_length if available.
-    if (header_.flags.is_set(1)) {
+    if (header_.flags.is_set(2)) {
       // Header length is already known in AddTrailers().
-      header_.trailer_length = output_.Length() - header_.header_length -
+      header_.trailer_length = output_.control.Length() -
+                               header_.header_length -
                                FrameHeader::frame_header_size_;
     } else {
       if (header_.flags.is_set(0)) {
         // Calculate frame header length in Finish() since AddTrailers() isn't
         // called.
         header_.header_length =
-            output_.Length() - FrameHeader::frame_header_size_;
+            output_.control.Length() - FrameHeader::frame_header_size_;
       }
     }
     header_.Serialize(
-        GRPC_SLICE_START_PTR(output_.c_slice_buffer()->slices[0]));
+        GRPC_SLICE_START_PTR(output_.control.c_slice_buffer()->slices[0]));
     return std::move(output_);
   }
 
  private:
   FrameHeader header_;
-  SliceBuffer output_;
+  BufferPair output_;
 };
 
 class FrameDeserializer {
  public:
-  FrameDeserializer(const FrameHeader& header, SliceBuffer& input)
+  FrameDeserializer(const FrameHeader& header, BufferPair& input)
       : header_(header), input_(input) {}
   const FrameHeader& header() const { return header_; }
   // If called, must be called before ReceiveTrailers, Finish.
@@ -118,28 +134,27 @@ class FrameDeserializer {
  private:
   absl::StatusOr<SliceBuffer> Take(uint32_t length) {
     if (length == 0) return SliceBuffer{};
-    if (input_.Length() < length) {
+    if (input_.control.Length() < length) {
       return absl::InvalidArgumentError(
           "Frame too short (insufficient payload)");
     }
     SliceBuffer out;
-    input_.MoveFirstNBytesIntoSliceBuffer(length, out);
+    input_.control.MoveFirstNBytesIntoSliceBuffer(length, out);
     return std::move(out);
   }
   FrameHeader header_;
-  SliceBuffer& input_;
+  BufferPair& input_;
 };
 
 template <typename Metadata>
 absl::StatusOr<Arena::PoolPtr<Metadata>> ReadMetadata(
     HPackParser* parser, absl::StatusOr<SliceBuffer> maybe_slices,
-    uint32_t stream_id, bool is_header, bool is_client,
-    absl::BitGenRef bitsrc) {
+    uint32_t stream_id, bool is_header, bool is_client, absl::BitGenRef bitsrc,
+    Arena* arena) {
   if (!maybe_slices.ok()) return maybe_slices.status();
   auto& slices = *maybe_slices;
-  auto arena = GetContext<Arena>();
   GPR_ASSERT(arena != nullptr);
-  Arena::PoolPtr<Metadata> metadata = arena->MakePooled<Metadata>(arena);
+  Arena::PoolPtr<Metadata> metadata = Arena::MakePooled<Metadata>(arena);
   parser->BeginFrame(
       metadata.get(), std::numeric_limits<uint32_t>::max(),
       std::numeric_limits<uint32_t>::max(),
@@ -161,20 +176,23 @@ absl::StatusOr<Arena::PoolPtr<Metadata>> ReadMetadata(
 }  // namespace
 
 absl::Status SettingsFrame::Deserialize(HPackParser*, const FrameHeader& header,
-                                        absl::BitGenRef,
-                                        SliceBuffer& slice_buffer) {
+                                        absl::BitGenRef, Arena*,
+                                        BufferPair buffers) {
   if (header.type != FrameType::kSettings) {
     return absl::InvalidArgumentError("Expected settings frame");
   }
   if (header.flags.any()) {
     return absl::InvalidArgumentError("Unexpected flags");
   }
-  FrameDeserializer deserializer(header, slice_buffer);
+  if (buffers.data.Length() != 0) {
+    return absl::InvalidArgumentError("Unexpected data");
+  }
+  FrameDeserializer deserializer(header, buffers);
   return deserializer.Finish();
 }
 
-SliceBuffer SettingsFrame::Serialize(HPackCompressor*) const {
-  FrameSerializer serializer(FrameType::kSettings, 0, 0);
+BufferPair SettingsFrame::Serialize(HPackCompressor*) const {
+  FrameSerializer serializer(FrameType::kSettings, 0);
   return serializer.Finish();
 }
 
@@ -183,19 +201,20 @@ std::string SettingsFrame::ToString() const { return "SettingsFrame{}"; }
 absl::Status ClientFragmentFrame::Deserialize(HPackParser* parser,
                                               const FrameHeader& header,
                                               absl::BitGenRef bitsrc,
-                                              SliceBuffer& slice_buffer) {
+                                              Arena* arena,
+                                              BufferPair buffers) {
   if (header.stream_id == 0) {
     return absl::InvalidArgumentError("Expected non-zero stream id");
   }
   stream_id = header.stream_id;
-  message_padding = header.message_padding;
   if (header.type != FrameType::kFragment) {
     return absl::InvalidArgumentError("Expected fragment frame");
   }
-  FrameDeserializer deserializer(header, slice_buffer);
+  FrameDeserializer deserializer(header, buffers);
   if (header.flags.is_set(0)) {
     auto r = ReadMetadata<ClientMetadata>(parser, deserializer.ReceiveHeaders(),
-                                          header.stream_id, true, true, bitsrc);
+                                          header.stream_id, true, true, bitsrc,
+                                          arena);
     if (!r.ok()) return r.status();
     if (r.value() != nullptr) {
       headers = std::move(r.value());
@@ -205,8 +224,17 @@ absl::Status ClientFragmentFrame::Deserialize(HPackParser* parser,
         "Unexpected non-zero header length", header.header_length));
   }
   if (header.flags.is_set(1)) {
+    message =
+        FragmentMessage{Arena::MakePooled<Message>(std::move(buffers.data), 0),
+                        header.message_padding, header.message_length};
+  } else if (buffers.data.Length() != 0) {
+    return absl::InvalidArgumentError(absl::StrCat(
+        "Unexpected non-zero message length ", buffers.data.Length()));
+  }
+  if (header.flags.is_set(2)) {
     if (header.trailer_length != 0) {
-      return absl::InvalidArgumentError("Unexpected trailer length");
+      return absl::InvalidArgumentError(
+          absl::StrCat("Unexpected trailer length ", header.trailer_length));
     }
     end_of_stream = true;
   } else {
@@ -215,42 +243,53 @@ absl::Status ClientFragmentFrame::Deserialize(HPackParser* parser,
   return deserializer.Finish();
 }
 
-SliceBuffer ClientFragmentFrame::Serialize(HPackCompressor* encoder) const {
+BufferPair ClientFragmentFrame::Serialize(HPackCompressor* encoder) const {
   GPR_ASSERT(stream_id != 0);
-  FrameSerializer serializer(FrameType::kFragment, stream_id, message_padding);
+  FrameSerializer serializer(FrameType::kFragment, stream_id);
   if (headers.get() != nullptr) {
     encoder->EncodeRawHeaders(*headers.get(), serializer.AddHeaders());
   }
+  if (message.has_value()) {
+    serializer.AddMessage(message.value());
+  }
   if (end_of_stream) {
     serializer.AddTrailers();
   }
   return serializer.Finish();
 }
 
+std::string FragmentMessage::ToString() const {
+  std::string out =
+      absl::StrCat("FragmentMessage{length=", length, ", padding=", padding);
+  if (message.get() != nullptr) {
+    absl::StrAppend(&out, ", message=", message->DebugString().c_str());
+  }
+  absl::StrAppend(&out, "}");
+  return out;
+}
+
 std::string ClientFragmentFrame::ToString() const {
   return absl::StrCat(
       "ClientFragmentFrame{stream_id=", stream_id, ", headers=",
       headers.get() != nullptr ? headers->DebugString().c_str() : "nullptr",
-      ", message=",
-      message.get() != nullptr ? message->DebugString().c_str() : "nullptr",
-      ", message_padding=", message_padding, ", end_of_stream=", end_of_stream,
-      "}");
+      ", message=", message.has_value() ? message->ToString().c_str() : "none",
+      ", end_of_stream=", end_of_stream, "}");
 }
 
 absl::Status ServerFragmentFrame::Deserialize(HPackParser* parser,
                                               const FrameHeader& header,
                                               absl::BitGenRef bitsrc,
-                                              SliceBuffer& slice_buffer) {
+                                              Arena* arena,
+                                              BufferPair buffers) {
   if (header.stream_id == 0) {
     return absl::InvalidArgumentError("Expected non-zero stream id");
   }
   stream_id = header.stream_id;
-  message_padding = header.message_padding;
-  FrameDeserializer deserializer(header, slice_buffer);
+  FrameDeserializer deserializer(header, buffers);
   if (header.flags.is_set(0)) {
-    auto r =
-        ReadMetadata<ServerMetadata>(parser, deserializer.ReceiveHeaders(),
-                                     header.stream_id, true, false, bitsrc);
+    auto r = ReadMetadata<ServerMetadata>(parser, deserializer.ReceiveHeaders(),
+                                          header.stream_id, true, false, bitsrc,
+                                          arena);
     if (!r.ok()) return r.status();
     if (r.value() != nullptr) {
       headers = std::move(r.value());
@@ -260,9 +299,16 @@ absl::Status ServerFragmentFrame::Deserialize(HPackParser* parser,
         "Unexpected non-zero header length", header.header_length));
   }
   if (header.flags.is_set(1)) {
-    auto r =
-        ReadMetadata<ServerMetadata>(parser, deserializer.ReceiveTrailers(),
-                                     header.stream_id, false, false, bitsrc);
+    message.emplace(Arena::MakePooled<Message>(std::move(buffers.data), 0),
+                    header.message_padding, header.message_length);
+  } else if (buffers.data.Length() != 0) {
+    return absl::InvalidArgumentError(absl::StrCat(
+        "Unexpected non-zero message length", buffers.data.Length()));
+  }
+  if (header.flags.is_set(2)) {
+    auto r = ReadMetadata<ServerMetadata>(
+        parser, deserializer.ReceiveTrailers(), header.stream_id, false, false,
+        bitsrc, arena);
     if (!r.ok()) return r.status();
     if (r.value() != nullptr) {
       trailers = std::move(r.value());
@@ -274,12 +320,15 @@ absl::Status ServerFragmentFrame::Deserialize(HPackParser* parser,
   return deserializer.Finish();
 }
 
-SliceBuffer ServerFragmentFrame::Serialize(HPackCompressor* encoder) const {
+BufferPair ServerFragmentFrame::Serialize(HPackCompressor* encoder) const {
   GPR_ASSERT(stream_id != 0);
-  FrameSerializer serializer(FrameType::kFragment, stream_id, message_padding);
+  FrameSerializer serializer(FrameType::kFragment, stream_id);
   if (headers.get() != nullptr) {
     encoder->EncodeRawHeaders(*headers.get(), serializer.AddHeaders());
   }
+  if (message.has_value()) {
+    serializer.AddMessage(message.value());
+  }
   if (trailers.get() != nullptr) {
     encoder->EncodeRawHeaders(*trailers.get(), serializer.AddTrailers());
   }
@@ -290,16 +339,15 @@ std::string ServerFragmentFrame::ToString() const {
   return absl::StrCat(
       "ServerFragmentFrame{stream_id=", stream_id, ", headers=",
       headers.get() != nullptr ? headers->DebugString().c_str() : "nullptr",
-      ", message=",
-      message.get() != nullptr ? message->DebugString().c_str() : "nullptr",
-      ", message_padding=", message_padding, ", trailers=",
+      ", message=", message.has_value() ? message->ToString().c_str() : "none",
+      ", trailers=",
       trailers.get() != nullptr ? trailers->DebugString().c_str() : "nullptr",
       "}");
 }
 
 absl::Status CancelFrame::Deserialize(HPackParser*, const FrameHeader& header,
-                                      absl::BitGenRef,
-                                      SliceBuffer& slice_buffer) {
+                                      absl::BitGenRef, Arena*,
+                                      BufferPair buffers) {
   if (header.type != FrameType::kCancel) {
     return absl::InvalidArgumentError("Expected cancel frame");
   }
@@ -309,14 +357,17 @@ absl::Status CancelFrame::Deserialize(HPackParser*, const FrameHeader& header,
   if (header.stream_id == 0) {
     return absl::InvalidArgumentError("Expected non-zero stream id");
   }
-  FrameDeserializer deserializer(header, slice_buffer);
+  if (buffers.data.Length() != 0) {
+    return absl::InvalidArgumentError("Unexpected data");
+  }
+  FrameDeserializer deserializer(header, buffers);
   stream_id = header.stream_id;
   return deserializer.Finish();
 }
 
-SliceBuffer CancelFrame::Serialize(HPackCompressor*) const {
+BufferPair CancelFrame::Serialize(HPackCompressor*) const {
   GPR_ASSERT(stream_id != 0);
-  FrameSerializer serializer(FrameType::kCancel, stream_id, 0);
+  FrameSerializer serializer(FrameType::kCancel, stream_id);
   return serializer.Finish();
 }
 
diff --git a/src/core/ext/transport/chaotic_good/frame.h b/src/core/ext/transport/chaotic_good/frame.h
index 529c89570c7..e7ccd6ee222 100644
--- a/src/core/ext/transport/chaotic_good/frame.h
+++ b/src/core/ext/transport/chaotic_good/frame.h
@@ -28,6 +28,7 @@
 #include "src/core/ext/transport/chaotic_good/frame_header.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
 #include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
+#include "src/core/lib/gprpp/match.h"
 #include "src/core/lib/resource_quota/arena.h"
 #include "src/core/lib/slice/slice_buffer.h"
 #include "src/core/lib/transport/metadata_batch.h"
@@ -36,20 +37,21 @@
 namespace grpc_core {
 namespace chaotic_good {
 
+struct BufferPair {
+  SliceBuffer control;
+  SliceBuffer data;
+};
+
 class FrameInterface {
  public:
   virtual absl::Status Deserialize(HPackParser* parser,
                                    const FrameHeader& header,
-                                   absl::BitGenRef bitsrc,
-                                   SliceBuffer& slice_buffer) = 0;
-  virtual SliceBuffer Serialize(HPackCompressor* encoder) const = 0;
+                                   absl::BitGenRef bitsrc, Arena* arena,
+                                   BufferPair buffers) = 0;
+  virtual BufferPair Serialize(HPackCompressor* encoder) const = 0;
   virtual std::string ToString() const = 0;
 
  protected:
-  static bool EqVal(const Message& a, const Message& b) {
-    return a.payload()->JoinIntoString() == b.payload()->JoinIntoString() &&
-           a.flags() == b.flags();
-  }
   static bool EqVal(const grpc_metadata_batch& a,
                     const grpc_metadata_batch& b) {
     return a.DebugString() == b.DebugString();
@@ -65,57 +67,75 @@ class FrameInterface {
 
 struct SettingsFrame final : public FrameInterface {
   absl::Status Deserialize(HPackParser* parser, const FrameHeader& header,
-                           absl::BitGenRef bitsrc,
-                           SliceBuffer& slice_buffer) override;
-  SliceBuffer Serialize(HPackCompressor* encoder) const override;
+                           absl::BitGenRef bitsrc, Arena* arena,
+                           BufferPair buffers) override;
+  BufferPair Serialize(HPackCompressor* encoder) const override;
   std::string ToString() const override;
 
   bool operator==(const SettingsFrame&) const { return true; }
 };
 
+struct FragmentMessage {
+  FragmentMessage(MessageHandle message, uint32_t padding, uint32_t length)
+      : message(std::move(message)), padding(padding), length(length) {}
+
+  MessageHandle message;
+  uint32_t padding;
+  uint32_t length;
+
+  std::string ToString() const;
+
+  static bool EqVal(const Message& a, const Message& b) {
+    return a.payload()->JoinIntoString() == b.payload()->JoinIntoString() &&
+           a.flags() == b.flags();
+  }
+
+  bool operator==(const FragmentMessage& other) const {
+    return EqVal(*message, *other.message) && length == other.length;
+  }
+};
+
 struct ClientFragmentFrame final : public FrameInterface {
   absl::Status Deserialize(HPackParser* parser, const FrameHeader& header,
-                           absl::BitGenRef bitsrc,
-                           SliceBuffer& slice_buffer) override;
-  SliceBuffer Serialize(HPackCompressor* encoder) const override;
+                           absl::BitGenRef bitsrc, Arena* arena,
+                           BufferPair buffers) override;
+  BufferPair Serialize(HPackCompressor* encoder) const override;
   std::string ToString() const override;
 
   uint32_t stream_id;
   ClientMetadataHandle headers;
-  MessageHandle message;
-  uint32_t message_padding;
+  absl::optional<FragmentMessage> message;
   bool end_of_stream = false;
 
   bool operator==(const ClientFragmentFrame& other) const {
     return stream_id == other.stream_id && EqHdl(headers, other.headers) &&
-           end_of_stream == other.end_of_stream;
+           message == other.message && end_of_stream == other.end_of_stream;
   }
 };
 
 struct ServerFragmentFrame final : public FrameInterface {
   absl::Status Deserialize(HPackParser* parser, const FrameHeader& header,
-                           absl::BitGenRef bitsrc,
-                           SliceBuffer& slice_buffer) override;
-  SliceBuffer Serialize(HPackCompressor* encoder) const override;
+                           absl::BitGenRef bitsrc, Arena* arena,
+                           BufferPair buffers) override;
+  BufferPair Serialize(HPackCompressor* encoder) const override;
   std::string ToString() const override;
 
   uint32_t stream_id;
   ServerMetadataHandle headers;
-  MessageHandle message;
-  uint32_t message_padding;
+  absl::optional<FragmentMessage> message;
   ServerMetadataHandle trailers;
 
   bool operator==(const ServerFragmentFrame& other) const {
     return stream_id == other.stream_id && EqHdl(headers, other.headers) &&
-           EqHdl(trailers, other.trailers);
+           message == other.message && EqHdl(trailers, other.trailers);
   }
 };
 
 struct CancelFrame final : public FrameInterface {
   absl::Status Deserialize(HPackParser* parser, const FrameHeader& header,
-                           absl::BitGenRef bitsrc,
-                           SliceBuffer& slice_buffer) override;
-  SliceBuffer Serialize(HPackCompressor* encoder) const override;
+                           absl::BitGenRef bitsrc, Arena* arena,
+                           BufferPair buffers) override;
+  BufferPair Serialize(HPackCompressor* encoder) const override;
   std::string ToString() const override;
 
   uint32_t stream_id;
@@ -128,6 +148,19 @@ struct CancelFrame final : public FrameInterface {
 using ClientFrame = absl::variant<ClientFragmentFrame, CancelFrame>;
 using ServerFrame = absl::variant<ServerFragmentFrame>;
 
+inline FrameInterface& GetFrameInterface(ClientFrame& frame) {
+  return MatchMutable(
+      &frame,
+      [](ClientFragmentFrame* frame) -> FrameInterface& { return *frame; },
+      [](CancelFrame* frame) -> FrameInterface& { return *frame; });
+}
+
+inline FrameInterface& GetFrameInterface(ServerFrame& frame) {
+  return MatchMutable(
+      &frame,
+      [](ServerFragmentFrame* frame) -> FrameInterface& { return *frame; });
+}
+
 }  // namespace chaotic_good
 }  // namespace grpc_core
 
diff --git a/src/core/ext/transport/chaotic_good/frame_header.cc b/src/core/ext/transport/chaotic_good/frame_header.cc
index e39d6a34b58..6b1ec018491 100644
--- a/src/core/ext/transport/chaotic_good/frame_header.cc
+++ b/src/core/ext/transport/chaotic_good/frame_header.cc
@@ -19,6 +19,7 @@
 #include <cstdint>
 
 #include "absl/status/status.h"
+#include "absl/strings/str_cat.h"
 
 #include <grpc/support/log.h>
 
@@ -46,7 +47,6 @@ void FrameHeader::Serialize(uint8_t* data) const {
   WriteLittleEndianUint32(
       static_cast<uint32_t>(type) | (flags.ToInt<uint32_t>() << 8), data);
   if (flags.is_set(0)) GPR_ASSERT(header_length > 0);
-  if (flags.is_set(1)) GPR_ASSERT(trailer_length > 0);
   WriteLittleEndianUint32(stream_id, data + 4);
   WriteLittleEndianUint32(header_length, data + 8);
   WriteLittleEndianUint32(message_length, data + 12);
@@ -60,8 +60,8 @@ absl::StatusOr<FrameHeader> FrameHeader::Parse(const uint8_t* data) {
   const uint32_t type_and_flags = ReadLittleEndianUint32(data);
   header.type = static_cast<FrameType>(type_and_flags & 0xff);
   const uint32_t flags = type_and_flags >> 8;
-  if (flags > 3) return absl::InvalidArgumentError("Invalid flags");
-  header.flags = BitSet<2>::FromInt(flags);
+  if (flags > 7) return absl::InvalidArgumentError("Invalid flags");
+  header.flags = BitSet<3>::FromInt(flags);
   header.stream_id = ReadLittleEndianUint32(data + 4);
   header.header_length = ReadLittleEndianUint32(data + 8);
   if (header.flags.is_set(0) && header.header_length <= 0) {
@@ -70,11 +70,11 @@ absl::StatusOr<FrameHeader> FrameHeader::Parse(const uint8_t* data) {
   }
   header.message_length = ReadLittleEndianUint32(data + 12);
   header.message_padding = ReadLittleEndianUint32(data + 16);
-  header.trailer_length = ReadLittleEndianUint32(data + 20);
-  if (header.flags.is_set(1) && header.trailer_length <= 0) {
+  if (header.flags.is_set(1) && header.message_length <= 0) {
     return absl::InvalidArgumentError(
-        absl::StrCat("Invalid trailer length", header.trailer_length));
+        absl::StrCat("Invalid message length: ", header.message_length));
   }
+  header.trailer_length = ReadLittleEndianUint32(data + 20);
   return header;
 }
 
diff --git a/src/core/ext/transport/chaotic_good/frame_header.h b/src/core/ext/transport/chaotic_good/frame_header.h
index fa236ed3342..773b44f26e3 100644
--- a/src/core/ext/transport/chaotic_good/frame_header.h
+++ b/src/core/ext/transport/chaotic_good/frame_header.h
@@ -36,7 +36,7 @@ enum class FrameType : uint8_t {
 
 struct FrameHeader {
   FrameType type = FrameType::kCancel;
-  BitSet<2> flags;
+  BitSet<3> flags;
   uint32_t stream_id = 0;
   uint32_t header_length = 0;
   uint32_t message_length = 0;
diff --git a/src/core/ext/transport/chaotic_good/server_transport.cc b/src/core/ext/transport/chaotic_good/server_transport.cc
new file mode 100644
index 00000000000..3d4387ac949
--- /dev/null
+++ b/src/core/ext/transport/chaotic_good/server_transport.cc
@@ -0,0 +1,332 @@
+// Copyright 2022 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/ext/transport/chaotic_good/server_transport.h"
+
+#include <memory>
+#include <string>
+#include <tuple>
+
+#include "absl/random/bit_gen_ref.h"
+#include "absl/random/random.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/slice.h>
+#include <grpc/support/log.h>
+
+#include "src/core/ext/transport/chaotic_good/frame.h"
+#include "src/core/ext/transport/chaotic_good/frame_header.h"
+#include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/promise/activity.h"
+#include "src/core/lib/promise/event_engine_wakeup_scheduler.h"
+#include "src/core/lib/promise/for_each.h"
+#include "src/core/lib/promise/loop.h"
+#include "src/core/lib/promise/switch.h"
+#include "src/core/lib/promise/try_seq.h"
+#include "src/core/lib/resource_quota/arena.h"
+#include "src/core/lib/resource_quota/resource_quota.h"
+#include "src/core/lib/slice/slice.h"
+#include "src/core/lib/slice/slice_buffer.h"
+#include "src/core/lib/transport/promise_endpoint.h"
+
+namespace grpc_core {
+namespace chaotic_good {
+
+auto ChaoticGoodServerTransport::TransportWriteLoop() {
+  return Loop([this] {
+    return TrySeq(
+        // Get next outgoing frame.
+        outgoing_frames_.Next(),
+        // Serialize and write it out.
+        [this](ServerFrame client_frame) {
+          return transport_.WriteFrame(GetFrameInterface(client_frame));
+        },
+        []() -> LoopCtl<absl::Status> {
+          // The write failures will be caught in TrySeq and exit loop.
+          // Therefore, only need to return Continue() in the last lambda
+          // function.
+          return Continue();
+        });
+  });
+}
+
+auto ChaoticGoodServerTransport::PushFragmentIntoCall(
+    CallInitiator call_initiator, ClientFragmentFrame frame) {
+  auto& headers = frame.headers;
+  return TrySeq(
+      If(
+          headers != nullptr,
+          [call_initiator, &headers]() mutable {
+            return call_initiator.PushClientInitialMetadata(std::move(headers));
+          },
+          []() -> StatusFlag { return Success{}; }),
+      [call_initiator, message = std::move(frame.message)]() mutable {
+        return If(
+            message.has_value(),
+            [&call_initiator, &message]() mutable {
+              return call_initiator.PushMessage(std::move(message->message));
+            },
+            []() -> StatusFlag { return Success{}; });
+      },
+      [call_initiator,
+       end_of_stream = frame.end_of_stream]() mutable -> StatusFlag {
+        if (end_of_stream) call_initiator.FinishSends();
+        return Success{};
+      });
+}
+
+auto ChaoticGoodServerTransport::MaybePushFragmentIntoCall(
+    absl::optional<CallInitiator> call_initiator, absl::Status error,
+    ClientFragmentFrame frame) {
+  return If(
+      call_initiator.has_value() && error.ok(),
+      [this, &call_initiator, &frame]() {
+        return Map(
+            call_initiator->SpawnWaitable(
+                "push-fragment",
+                [call_initiator, frame = std::move(frame), this]() mutable {
+                  return call_initiator->CancelIfFails(
+                      PushFragmentIntoCall(*call_initiator, std::move(frame)));
+                }),
+            [](StatusFlag status) { return StatusCast<absl::Status>(status); });
+      },
+      [error = std::move(error)]() { return error; });
+}
+
+auto ChaoticGoodServerTransport::CallOutboundLoop(
+    uint32_t stream_id, CallInitiator call_initiator) {
+  auto send_fragment = [stream_id,
+                        outgoing_frames = outgoing_frames_.MakeSender()](
+                           ServerFragmentFrame frame) mutable {
+    frame.stream_id = stream_id;
+    return Map(outgoing_frames.Send(std::move(frame)),
+               [](bool success) -> absl::Status {
+                 if (!success) {
+                   // Failed to send outgoing frame.
+                   return absl::UnavailableError("Transport closed.");
+                 }
+                 return absl::OkStatus();
+               });
+  };
+  return Seq(
+      TrySeq(
+          // Wait for initial metadata then send it out.
+          call_initiator.PullServerInitialMetadata(),
+          [send_fragment](ServerMetadataHandle md) mutable {
+            ServerFragmentFrame frame;
+            frame.headers = std::move(md);
+            return send_fragment(std::move(frame));
+          },
+          // Continuously send client frame with client to server messages.
+          ForEach(OutgoingMessages(call_initiator),
+                  [send_fragment, aligned_bytes = aligned_bytes_](
+                      MessageHandle message) mutable {
+                    ServerFragmentFrame frame;
+                    // Construct frame header (flags, header_length and
+                    // trailer_length will be added in serialization).
+                    const uint32_t message_length =
+                        message->payload()->Length();
+                    const uint32_t padding =
+                        message_length % aligned_bytes == 0
+                            ? 0
+                            : aligned_bytes - message_length % aligned_bytes;
+                    GPR_ASSERT((message_length + padding) % aligned_bytes == 0);
+                    frame.message = FragmentMessage(std::move(message), padding,
+                                                    message_length);
+                    return send_fragment(std::move(frame));
+                  })),
+      call_initiator.PullServerTrailingMetadata(),
+      [send_fragment](ServerMetadataHandle md) mutable {
+        ServerFragmentFrame frame;
+        frame.trailers = std::move(md);
+        return send_fragment(std::move(frame));
+      });
+}
+
+auto ChaoticGoodServerTransport::DeserializeAndPushFragmentToNewCall(
+    FrameHeader frame_header, BufferPair buffers) {
+  ClientFragmentFrame fragment_frame;
+  ScopedArenaPtr arena(acceptor_->CreateArena());
+  absl::Status status = transport_.DeserializeFrame(
+      frame_header, std::move(buffers), arena.get(), fragment_frame);
+  absl::optional<CallInitiator> call_initiator;
+  if (status.ok()) {
+    auto create_call_result =
+        acceptor_->CreateCall(*fragment_frame.headers, arena.release());
+    if (create_call_result.ok()) {
+      call_initiator.emplace(std::move(*create_call_result));
+      call_initiator->SpawnGuarded(
+          "server-write", [this, stream_id = frame_header.stream_id,
+                           call_initiator = *call_initiator]() {
+            return CallOutboundLoop(stream_id, call_initiator);
+          });
+    } else {
+      status = create_call_result.status();
+    }
+  }
+  return MaybePushFragmentIntoCall(std::move(call_initiator), std::move(status),
+                                   std::move(fragment_frame));
+}
+
+auto ChaoticGoodServerTransport::DeserializeAndPushFragmentToExistingCall(
+    FrameHeader frame_header, BufferPair buffers) {
+  absl::optional<CallInitiator> call_initiator =
+      LookupStream(frame_header.stream_id);
+  Arena* arena = nullptr;
+  if (call_initiator.has_value()) arena = call_initiator->arena();
+  ClientFragmentFrame fragment_frame;
+  absl::Status status = transport_.DeserializeFrame(
+      frame_header, std::move(buffers), arena, fragment_frame);
+  return MaybePushFragmentIntoCall(std::move(call_initiator), std::move(status),
+                                   std::move(fragment_frame));
+}
+
+auto ChaoticGoodServerTransport::TransportReadLoop() {
+  return Loop([this] {
+    return TrySeq(
+        transport_.ReadFrameBytes(),
+        [this](std::tuple<FrameHeader, BufferPair> frame_bytes) {
+          const auto& frame_header = std::get<0>(frame_bytes);
+          auto& buffers = std::get<1>(frame_bytes);
+          return Switch(
+              frame_header.type,
+              Case(FrameType::kSettings,
+                   []() -> absl::Status {
+                     return absl::InternalError("Unexpected settings frame");
+                   }),
+              Case(FrameType::kFragment,
+                   [this, &frame_header, &buffers]() {
+                     return If(
+                         frame_header.flags.is_set(0),
+                         [this, &frame_header, &buffers]() {
+                           return DeserializeAndPushFragmentToNewCall(
+                               frame_header, std::move(buffers));
+                         },
+                         [this, &frame_header, &buffers]() {
+                           return DeserializeAndPushFragmentToExistingCall(
+                               frame_header, std::move(buffers));
+                         });
+                   }),
+              Case(FrameType::kCancel,
+                   [this, &frame_header]() {
+                     absl::optional<CallInitiator> call_initiator =
+                         ExtractStream(frame_header.stream_id);
+                     return If(
+                         call_initiator.has_value(),
+                         [&call_initiator]() {
+                           auto c = std::move(*call_initiator);
+                           return c.SpawnWaitable("cancel", [c]() mutable {
+                             c.Cancel();
+                             return absl::OkStatus();
+                           });
+                         },
+                         []() -> absl::Status {
+                           return absl::InternalError(
+                               "Unexpected cancel frame");
+                         });
+                   }),
+              Default([frame_header]() {
+                return absl::InternalError(
+                    absl::StrCat("Unexpected frame type: ",
+                                 static_cast<uint8_t>(frame_header.type)));
+              }));
+        },
+        []() -> LoopCtl<absl::Status> { return Continue{}; });
+  });
+}
+
+auto ChaoticGoodServerTransport::OnTransportActivityDone() {
+  return [this](absl::Status status) {
+    if (!(status.ok() || status.code() == absl::StatusCode::kCancelled)) {
+      this->AbortWithError();
+    }
+  };
+}
+
+ChaoticGoodServerTransport::ChaoticGoodServerTransport(
+    const ChannelArgs& args, std::unique_ptr<PromiseEndpoint> control_endpoint,
+    std::unique_ptr<PromiseEndpoint> data_endpoint,
+    std::shared_ptr<grpc_event_engine::experimental::EventEngine> event_engine)
+    : outgoing_frames_(4),
+      transport_(std::move(control_endpoint), std::move(data_endpoint)),
+      allocator_(args.GetObject<ResourceQuota>()
+                     ->memory_quota()
+                     ->CreateMemoryAllocator("chaotic-good")),
+      event_engine_(event_engine),
+      writer_{MakeActivity(TransportWriteLoop(),
+                           EventEngineWakeupScheduler(event_engine),
+                           OnTransportActivityDone())},
+      reader_{nullptr} {}
+
+void ChaoticGoodServerTransport::SetAcceptor(Acceptor* acceptor) {
+  GPR_ASSERT(acceptor_ == nullptr);
+  GPR_ASSERT(acceptor != nullptr);
+  acceptor_ = acceptor;
+  reader_ = MakeActivity(TransportReadLoop(),
+                         EventEngineWakeupScheduler(event_engine_),
+                         OnTransportActivityDone());
+}
+
+ChaoticGoodServerTransport::~ChaoticGoodServerTransport() {
+  if (writer_ != nullptr) {
+    writer_.reset();
+  }
+  if (reader_ != nullptr) {
+    reader_.reset();
+  }
+}
+
+void ChaoticGoodServerTransport::AbortWithError() {
+  // Mark transport as unavailable when the endpoint write/read failed.
+  // Close all the available pipes.
+  outgoing_frames_.MarkClosed();
+  ReleasableMutexLock lock(&mu_);
+  StreamMap stream_map = std::move(stream_map_);
+  stream_map_.clear();
+  lock.Release();
+  for (const auto& pair : stream_map) {
+    auto call_initiator = pair.second;
+    call_initiator.SpawnInfallible("cancel", [call_initiator]() mutable {
+      call_initiator.Cancel();
+      return Empty{};
+    });
+  }
+}
+
+absl::optional<CallInitiator> ChaoticGoodServerTransport::LookupStream(
+    uint32_t stream_id) {
+  MutexLock lock(&mu_);
+  auto it = stream_map_.find(stream_id);
+  if (it == stream_map_.end()) return absl::nullopt;
+  return it->second;
+}
+
+absl::optional<CallInitiator> ChaoticGoodServerTransport::ExtractStream(
+    uint32_t stream_id) {
+  MutexLock lock(&mu_);
+  auto it = stream_map_.find(stream_id);
+  if (it == stream_map_.end()) return absl::nullopt;
+  auto r = std::move(it->second);
+  stream_map_.erase(it);
+  return std::move(r);
+}
+
+}  // namespace chaotic_good
+}  // namespace grpc_core
diff --git a/src/core/ext/transport/chaotic_good/server_transport.h b/src/core/ext/transport/chaotic_good/server_transport.h
new file mode 100644
index 00000000000..9ce92928385
--- /dev/null
+++ b/src/core/ext/transport/chaotic_good/server_transport.h
@@ -0,0 +1,145 @@
+// Copyright 2022 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_TRANSPORT_H
+#define GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_TRANSPORT_H
+
+#include <grpc/support/port_platform.h>
+
+#include <stdint.h>
+#include <stdio.h>
+
+#include <cstdint>
+#include <initializer_list>  // IWYU pragma: keep
+#include <iostream>
+#include <map>
+#include <memory>
+#include <optional>
+#include <string>
+#include <tuple>
+#include <type_traits>
+#include <utility>
+
+#include "absl/base/thread_annotations.h"
+#include "absl/container/flat_hash_map.h"
+#include "absl/functional/any_invocable.h"
+#include "absl/random/random.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/types/optional.h"
+#include "absl/types/variant.h"
+
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/slice.h>
+#include <grpc/support/log.h>
+
+#include "src/core/ext/transport/chaotic_good/chaotic_good_transport.h"
+#include "src/core/ext/transport/chaotic_good/frame.h"
+#include "src/core/ext/transport/chaotic_good/frame_header.h"
+#include "src/core/ext/transport/chttp2/transport/hpack_encoder.h"
+#include "src/core/ext/transport/chttp2/transport/hpack_parser.h"
+#include "src/core/lib/event_engine/default_event_engine.h"  // IWYU pragma: keep
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/gprpp/sync.h"
+#include "src/core/lib/promise/activity.h"
+#include "src/core/lib/promise/context.h"
+#include "src/core/lib/promise/if.h"
+#include "src/core/lib/promise/inter_activity_pipe.h"
+#include "src/core/lib/promise/loop.h"
+#include "src/core/lib/promise/mpsc.h"
+#include "src/core/lib/promise/party.h"
+#include "src/core/lib/promise/pipe.h"
+#include "src/core/lib/promise/poll.h"
+#include "src/core/lib/promise/seq.h"
+#include "src/core/lib/promise/try_join.h"
+#include "src/core/lib/promise/try_seq.h"
+#include "src/core/lib/resource_quota/arena.h"
+#include "src/core/lib/resource_quota/memory_quota.h"
+#include "src/core/lib/slice/slice.h"
+#include "src/core/lib/slice/slice_buffer.h"
+#include "src/core/lib/slice/slice_internal.h"
+#include "src/core/lib/transport/metadata_batch.h"
+#include "src/core/lib/transport/promise_endpoint.h"
+#include "src/core/lib/transport/transport.h"
+
+namespace grpc_core {
+namespace chaotic_good {
+
+class ChaoticGoodServerTransport final : public Transport,
+                                         public ServerTransport {
+ public:
+  ChaoticGoodServerTransport(
+      const ChannelArgs& args,
+      std::unique_ptr<PromiseEndpoint> control_endpoint,
+      std::unique_ptr<PromiseEndpoint> data_endpoint,
+      std::shared_ptr<grpc_event_engine::experimental::EventEngine>
+          event_engine);
+  ~ChaoticGoodServerTransport() override;
+
+  FilterStackTransport* filter_stack_transport() override { return nullptr; }
+  ClientTransport* client_transport() override { return nullptr; }
+  ServerTransport* server_transport() override { return this; }
+  absl::string_view GetTransportName() const override { return "chaotic_good"; }
+  void SetPollset(grpc_stream*, grpc_pollset*) override {}
+  void SetPollsetSet(grpc_stream*, grpc_pollset_set*) override {}
+  void PerformOp(grpc_transport_op*) override { Crash("unimplemented"); }
+  grpc_endpoint* GetEndpoint() override { return nullptr; }
+  void Orphan() override { delete this; }
+
+  void SetAcceptor(Acceptor* acceptor) override;
+  void AbortWithError();
+
+ private:
+  using StreamMap = absl::flat_hash_map<uint32_t, CallInitiator>;
+
+  absl::Status NewStream(uint32_t stream_id, CallInitiator call_initiator);
+  absl::optional<CallInitiator> LookupStream(uint32_t stream_id);
+  absl::optional<CallInitiator> ExtractStream(uint32_t stream_id);
+  auto CallOutboundLoop(uint32_t stream_id, CallInitiator call_initiator);
+  auto OnTransportActivityDone();
+  auto TransportReadLoop();
+  auto TransportWriteLoop();
+  // Read different parts of the server frame from control/data endpoints
+  // based on frame header.
+  // Resolves to a StatusOr<tuple<SliceBuffer, SliceBuffer>>
+  auto ReadFrameBody(Slice read_buffer);
+  void SendCancel(uint32_t stream_id, absl::Status why);
+  auto DeserializeAndPushFragmentToNewCall(FrameHeader frame_header,
+                                           BufferPair buffers);
+  auto DeserializeAndPushFragmentToExistingCall(FrameHeader frame_header,
+                                                BufferPair buffers);
+  auto MaybePushFragmentIntoCall(absl::optional<CallInitiator> call_initiator,
+                                 absl::Status error, ClientFragmentFrame frame);
+  auto PushFragmentIntoCall(CallInitiator call_initiator,
+                            ClientFragmentFrame frame);
+
+  Acceptor* acceptor_ = nullptr;
+  MpscReceiver<ServerFrame> outgoing_frames_;
+  ChaoticGoodTransport transport_;
+  // Assigned aligned bytes from setting frame.
+  size_t aligned_bytes_ = 64;
+  Mutex mu_;
+  // Map of stream incoming server frames, key is stream_id.
+  StreamMap stream_map_ ABSL_GUARDED_BY(mu_);
+  grpc_event_engine::experimental::MemoryAllocator allocator_;
+  std::shared_ptr<grpc_event_engine::experimental::EventEngine> event_engine_;
+  ActivityPtr writer_;
+  ActivityPtr reader_;
+};
+
+}  // namespace chaotic_good
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_EXT_TRANSPORT_CHAOTIC_GOOD_SERVER_TRANSPORT_H
\ No newline at end of file
diff --git a/src/core/ext/transport/chttp2/server/chttp2_server.cc b/src/core/ext/transport/chttp2/server/chttp2_server.cc
index e5a6282024e..dea28445a4f 100644
--- a/src/core/ext/transport/chttp2/server/chttp2_server.cc
+++ b/src/core/ext/transport/chttp2/server/chttp2_server.cc
@@ -617,8 +617,17 @@ void Chttp2ServerListener::ActiveConnection::Start(
   RefCountedPtr<HandshakingState> handshaking_state_ref;
   listener_ = std::move(listener);
   {
-    MutexLock lock(&mu_);
-    if (shutdown_) return;
+    ReleasableMutexLock lock(&mu_);
+    if (shutdown_) {
+      lock.Release();
+      // If the Connection is already shutdown at this point, it implies the
+      // owning Chttp2ServerListener and all associated ActiveConnections have
+      // been orphaned. The generated endpoints need to be shutdown here to
+      // ensure the tcp connections are closed appropriately.
+      grpc_endpoint_shutdown(endpoint, absl::OkStatus());
+      grpc_endpoint_destroy(endpoint);
+      return;
+    }
     // Hold a ref to HandshakingState to allow starting the handshake outside
     // the critical region.
     handshaking_state_ref = handshaking_state_->Ref();
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
index b75d792e572..7c3c7dcd6ec 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.cc
@@ -79,6 +79,7 @@
 #include "src/core/lib/debug/stats.h"
 #include "src/core/lib/debug/stats_data.h"
 #include "src/core/lib/experiments/experiments.h"
+#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/bitset.h"
 #include "src/core/lib/gprpp/crash.h"
@@ -342,7 +343,7 @@ void ForEachContextListEntryExecute(void* arg, Timestamps* ts,
 }
 
 HttpAnnotation::HttpAnnotation(
-    Type type, Timestamp time,
+    Type type, gpr_timespec time,
     absl::optional<chttp2::TransportFlowControl::Stats> transport_stats,
     absl::optional<chttp2::StreamFlowControl::Stats> stream_stats)
     : CallTracerAnnotationInterface::Annotation(
@@ -367,7 +368,7 @@ std::string HttpAnnotation::ToString() const {
     default:
       absl::StrAppend(&s, "Unknown");
   }
-  absl::StrAppend(&s, " time: ", time_.ToString());
+  absl::StrAppend(&s, " time: ", gpr_format_timespec(time_));
   if (transport_stats_.has_value()) {
     absl::StrAppend(&s, " transport:[", transport_stats_->ToString(), "]");
   }
@@ -645,7 +646,7 @@ static void read_channel_args(grpc_chttp2_transport* t,
 
   t->max_concurrent_streams_overload_protection =
       channel_args.GetBool(GRPC_ARG_MAX_CONCURRENT_STREAMS_OVERLOAD_PROTECTION)
-          .value_or(grpc_core::IsOverloadProtectionEnabled());
+          .value_or(true);
 }
 
 static void init_keepalive_pings_if_enabled_locked(
@@ -1508,7 +1509,7 @@ static void perform_stream_op_locked(void* stream_op,
   if (op->send_initial_metadata) {
     if (s->call_tracer) {
       s->call_tracer->RecordAnnotation(grpc_core::HttpAnnotation(
-          grpc_core::HttpAnnotation::Type::kStart, grpc_core::Timestamp::Now(),
+          grpc_core::HttpAnnotation::Type::kStart, gpr_now(GPR_CLOCK_REALTIME),
           s->t->flow_control.stats(), s->flow_control.stats()));
     }
     if (t->is_client && t->channelz_socket != nullptr) {
diff --git a/src/core/ext/transport/chttp2/transport/chttp2_transport.h b/src/core/ext/transport/chttp2/transport/chttp2_transport.h
index b008e57135a..ddf7539606a 100644
--- a/src/core/ext/transport/chttp2/transport/chttp2_transport.h
+++ b/src/core/ext/transport/chttp2/transport/chttp2_transport.h
@@ -113,14 +113,14 @@ class HttpAnnotation : public CallTracerAnnotationInterface::Annotation {
   };
 
   HttpAnnotation(
-      Type type, Timestamp time,
+      Type type, gpr_timespec time,
       absl::optional<chttp2::TransportFlowControl::Stats> transport_stats,
       absl::optional<chttp2::StreamFlowControl::Stats> stream_stats);
 
   std::string ToString() const override;
 
   Type http_type() const { return type_; }
-  Timestamp time() const { return time_; }
+  gpr_timespec time() const { return time_; }
   absl::optional<chttp2::TransportFlowControl::Stats> transport_stats() const {
     return transport_stats_;
   }
@@ -130,7 +130,7 @@ class HttpAnnotation : public CallTracerAnnotationInterface::Annotation {
 
  private:
   const Type type_;
-  const Timestamp time_;
+  const gpr_timespec time_;
   absl::optional<chttp2::TransportFlowControl::Stats> transport_stats_;
   absl::optional<chttp2::StreamFlowControl::Stats> stream_stats_;
 };
diff --git a/src/core/ext/transport/chttp2/transport/flow_control.cc b/src/core/ext/transport/chttp2/transport/flow_control.cc
index 986c62bc427..20031119b3f 100644
--- a/src/core/ext/transport/chttp2/transport/flow_control.cc
+++ b/src/core/ext/transport/chttp2/transport/flow_control.cc
@@ -104,16 +104,7 @@ TransportFlowControl::TransportFlowControl(absl::string_view name,
                                            MemoryOwner* memory_owner)
     : memory_owner_(memory_owner),
       enable_bdp_probe_(enable_bdp_probe),
-      bdp_estimator_(name),
-      pid_controller_(PidController::Args()
-                          .set_gain_p(4)
-                          .set_gain_i(8)
-                          .set_gain_d(0)
-                          .set_initial_control_value(TargetLogBdp())
-                          .set_min_control_value(-1)
-                          .set_max_control_value(25)
-                          .set_integral_range(10)),
-      last_pid_update_(Timestamp::Now()) {}
+      bdp_estimator_(name) {}
 
 uint32_t TransportFlowControl::DesiredAnnounceSize(bool writing_anyway) const {
   const uint32_t target_announced_window =
@@ -184,41 +175,6 @@ FlowControlAction TransportFlowControl::UpdateAction(FlowControlAction action) {
   return action;
 }
 
-// Take in a target and modifies it based on the memory pressure of the system
-static double AdjustForMemoryPressure(double memory_pressure, double target) {
-  // do not increase window under heavy memory pressure.
-  static const double kLowMemPressure = 0.1;
-  static const double kZeroTarget = 22;
-  static const double kHighMemPressure = 0.8;
-  static const double kMaxMemPressure = 0.9;
-  if (memory_pressure < kLowMemPressure && target < kZeroTarget) {
-    target = (target - kZeroTarget) * memory_pressure / kLowMemPressure +
-             kZeroTarget;
-  } else if (memory_pressure > kHighMemPressure) {
-    target *= 1 - std::min(1.0, (memory_pressure - kHighMemPressure) /
-                                    (kMaxMemPressure - kHighMemPressure));
-  }
-  return target;
-}
-
-double TransportFlowControl::TargetLogBdp() {
-  return AdjustForMemoryPressure(
-      memory_owner_->is_valid()
-          ? memory_owner_->GetPressureInfo().pressure_control_value
-          : 0.0,
-      1 + log2(bdp_estimator_.EstimateBdp()));
-}
-
-double TransportFlowControl::SmoothLogBdp(double value) {
-  Timestamp now = Timestamp::Now();
-  double bdp_error = value - pid_controller_.last_control_value();
-  const double dt = (now - last_pid_update_).seconds();
-  last_pid_update_ = now;
-  // Limit dt to 100ms
-  const double kMaxDt = 0.1;
-  return pid_controller_.Update(bdp_error, dt > kMaxDt ? kMaxDt : dt);
-}
-
 double
 TransportFlowControl::TargetInitialWindowSizeBasedOnMemoryPressureAndBdp()
     const {
@@ -323,10 +279,8 @@ FlowControlAction TransportFlowControl::PeriodicUpdate() {
     // TODO(ncteisen): experiment with setting target to be huge under low
     // memory pressure.
     uint32_t target = static_cast<uint32_t>(RoundUpToPowerOf2(
-        Clamp(IsMemoryPressureControllerEnabled()
-                  ? TargetInitialWindowSizeBasedOnMemoryPressureAndBdp()
-                  : pow(2, SmoothLogBdp(TargetLogBdp())),
-              0.0, static_cast<double>(kMaxInitialWindowSize))));
+        Clamp(TargetInitialWindowSizeBasedOnMemoryPressureAndBdp(), 0.0,
+              static_cast<double>(kMaxInitialWindowSize))));
     if (target < kMinPositiveInitialWindowSize) target = 0;
     if (g_test_only_transport_target_window_estimates_mocker != nullptr) {
       // Hook for simulating unusual flow control situations in tests.
diff --git a/src/core/ext/transport/chttp2/transport/flow_control.h b/src/core/ext/transport/chttp2/transport/flow_control.h
index 599da6c85e8..f155ad34e6e 100644
--- a/src/core/ext/transport/chttp2/transport/flow_control.h
+++ b/src/core/ext/transport/chttp2/transport/flow_control.h
@@ -40,7 +40,6 @@
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/transport/bdp_estimator.h"
-#include "src/core/lib/transport/pid_controller.h"
 
 extern grpc_core::TraceFlag grpc_flowctl_trace;
 
@@ -330,8 +329,6 @@ class TransportFlowControl final {
   }
 
  private:
-  double TargetLogBdp();
-  double SmoothLogBdp(double value);
   double TargetInitialWindowSizeBasedOnMemoryPressureAndBdp() const;
   static void UpdateSetting(grpc_chttp2_setting_id id, int64_t* desired_value,
                             uint32_t new_desired_value,
@@ -359,10 +356,6 @@ class TransportFlowControl final {
   // bdp estimation
   BdpEstimator bdp_estimator_;
 
-  // pid controller
-  PidController pid_controller_;
-  Timestamp last_pid_update_;
-
   int64_t remote_window_ = kDefaultWindow;
   int64_t target_initial_window_size_ = kDefaultWindow;
   int64_t target_frame_size_ = kDefaultFrameSize;
diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc
index efa216fcf6e..7ccdffee984 100644
--- a/src/core/ext/transport/chttp2/transport/parsing.cc
+++ b/src/core/ext/transport/chttp2/transport/parsing.cc
@@ -674,7 +674,6 @@ static grpc_error_handle init_header_frame_parser(grpc_chttp2_transport* t,
       grpc_chttp2_initiate_write(t, GRPC_CHTTP2_INITIATE_WRITE_RST_STREAM);
       return init_header_skip_frame_parser(t, priority_type, is_eoh);
     } else if (GPR_UNLIKELY(
-                   grpc_core::IsRedMaxConcurrentStreamsEnabled() &&
                    t->stream_map.size() >=
                        t->max_concurrent_streams_policy.AdvertiseValue() &&
                    grpc_core::RandomEarlyDetection(
diff --git a/src/core/ext/transport/chttp2/transport/writing.cc b/src/core/ext/transport/chttp2/transport/writing.cc
index c81f2cf2808..8ca99c4fdfd 100644
--- a/src/core/ext/transport/chttp2/transport/writing.cc
+++ b/src/core/ext/transport/chttp2/transport/writing.cc
@@ -34,6 +34,7 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/log.h>
+#include <grpc/support/time.h>
 
 #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
 #include "src/core/ext/transport/chttp2/transport/context_list_entry.h"
@@ -516,7 +517,7 @@ class StreamWriteContext {
     if (s_->call_tracer) {
       s_->call_tracer->RecordAnnotation(grpc_core::HttpAnnotation(
           grpc_core::HttpAnnotation::Type::kHeadWritten,
-          grpc_core::Timestamp::Now(), s_->t->flow_control.stats(),
+          gpr_now(GPR_CLOCK_REALTIME), s_->t->flow_control.stats(),
           s_->flow_control.stats()));
     }
   }
@@ -648,7 +649,7 @@ class StreamWriteContext {
                                    absl::OkStatus());
     if (s_->call_tracer) {
       s_->call_tracer->RecordAnnotation(grpc_core::HttpAnnotation(
-          grpc_core::HttpAnnotation::Type::kEnd, grpc_core::Timestamp::Now(),
+          grpc_core::HttpAnnotation::Type::kEnd, gpr_now(GPR_CLOCK_REALTIME),
           s_->t->flow_control.stats(), s_->flow_control.stats()));
     }
   }
diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc
index cc932d0f216..24fdd41d387 100644
--- a/src/core/ext/transport/inproc/inproc_transport.cc
+++ b/src/core/ext/transport/inproc/inproc_transport.cc
@@ -36,8 +36,8 @@ class InprocServerTransport final : public RefCounted<InprocServerTransport>,
                                     public Transport,
                                     public ServerTransport {
  public:
-  void SetAcceptFunction(AcceptFunction accept_function) override {
-    accept_ = std::move(accept_function);
+  void SetAcceptor(Acceptor* acceptor) override {
+    acceptor_ = acceptor;
     ConnectionState expect = ConnectionState::kInitial;
     state_.compare_exchange_strong(expect, ConnectionState::kReady,
                                    std::memory_order_acq_rel,
@@ -92,7 +92,7 @@ class InprocServerTransport final : public RefCounted<InprocServerTransport>,
       case ConnectionState::kReady:
         break;
     }
-    return accept_(md);
+    return acceptor_->CreateCall(md, acceptor_->CreateArena());
   }
 
  private:
@@ -100,7 +100,7 @@ class InprocServerTransport final : public RefCounted<InprocServerTransport>,
 
   std::atomic<ConnectionState> state_{ConnectionState::kInitial};
   std::atomic<bool> disconnecting_{false};
-  AcceptFunction accept_;
+  Acceptor* acceptor_;
   absl::Status disconnect_error_;
   Mutex state_tracker_mu_;
   ConnectivityStateTracker state_tracker_ ABSL_GUARDED_BY(state_tracker_mu_){
diff --git a/src/core/lib/channel/call_tracer.h b/src/core/lib/channel/call_tracer.h
index e821cfcb5f8..3f2b10ead22 100644
--- a/src/core/lib/channel/call_tracer.h
+++ b/src/core/lib/channel/call_tracer.h
@@ -44,9 +44,9 @@ namespace grpc_core {
 
 // The interface hierarchy is as follows -
 //                 CallTracerAnnotationInterface
-//                      /          \
+//                    |                  |
 //        ClientCallTracer       CallTracerInterface
-//                                /             \
+//                                |              |
 //                      CallAttemptTracer    ServerCallTracer
 
 // The base class for all tracer implementations.
@@ -175,7 +175,8 @@ class ServerCallTracerFactory {
 
   virtual ~ServerCallTracerFactory() {}
 
-  virtual ServerCallTracer* CreateNewServerCallTracer(Arena* arena) = 0;
+  virtual ServerCallTracer* CreateNewServerCallTracer(
+      Arena* arena, const ChannelArgs& channel_args) = 0;
 
   // Returns true if a server is to be traced, false otherwise.
   virtual bool IsServerTraced(const ChannelArgs& /*args*/) { return true; }
diff --git a/src/core/lib/channel/promise_based_filter.h b/src/core/lib/channel/promise_based_filter.h
index 5c3b7ddb55a..d33cf38c096 100644
--- a/src/core/lib/channel/promise_based_filter.h
+++ b/src/core/lib/channel/promise_based_filter.h
@@ -331,6 +331,16 @@ auto MapResult(void (Derived::Call::*fn)(ServerMetadata&), Promise x,
   });
 }
 
+template <typename Promise, typename Derived>
+auto MapResult(void (Derived::Call::*fn)(ServerMetadata&, Derived*), Promise x,
+               FilterCallData<Derived>* call_data) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerTrailingMetadata);
+  return Map(std::move(x), [call_data](ServerMetadataHandle md) {
+    call_data->call.OnServerTrailingMetadata(*md, call_data->channel);
+    return md;
+  });
+}
+
 template <typename Interceptor, typename Derived, typename SfinaeVoid = void>
 struct RunCallImpl;
 
@@ -378,6 +388,33 @@ struct RunCallImpl<ServerMetadataHandle (Derived::Call::*)(ClientMetadata& md,
   }
 };
 
+template <typename Derived>
+struct RunCallImpl<absl::Status (Derived::Call::*)(ClientMetadata& md),
+                   Derived> {
+  static auto Run(CallArgs call_args, NextPromiseFactory next_promise_factory,
+                  FilterCallData<Derived>* call_data)
+      -> ArenaPromise<ServerMetadataHandle> {
+    auto status = call_data->call.OnClientInitialMetadata(
+        *call_args.client_initial_metadata);
+    if (status.ok()) return next_promise_factory(std::move(call_args));
+    return Immediate(ServerMetadataFromStatus(status));
+  }
+};
+
+template <typename Derived>
+struct RunCallImpl<absl::Status (Derived::Call::*)(ClientMetadata& md,
+                                                   Derived* channel),
+                   Derived> {
+  static auto Run(CallArgs call_args, NextPromiseFactory next_promise_factory,
+                  FilterCallData<Derived>* call_data)
+      -> ArenaPromise<ServerMetadataHandle> {
+    auto status = call_data->call.OnClientInitialMetadata(
+        *call_args.client_initial_metadata, call_data->channel);
+    if (status.ok()) return next_promise_factory(std::move(call_args));
+    return Immediate(ServerMetadataFromStatus(status));
+  }
+};
+
 template <typename Derived>
 struct RunCallImpl<
     void (Derived::Call::*)(ClientMetadata& md, Derived* channel), Derived> {
@@ -593,6 +630,35 @@ inline void InterceptClientInitialMetadata(
       });
 }
 
+template <typename Derived>
+inline void InterceptClientInitialMetadata(
+    absl::Status (Derived::Call::*fn)(ClientMetadata& md),
+    typename Derived::Call* call, Derived*, CallSpineInterface* call_spine) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnClientInitialMetadata);
+  call_spine->client_initial_metadata().receiver.InterceptAndMap(
+      [call_spine,
+       call](ClientMetadataHandle md) -> absl::optional<ClientMetadataHandle> {
+        auto status = call->OnClientInitialMetadata(*md);
+        if (status.ok()) return std::move(md);
+        return call_spine->Cancel(ServerMetadataFromStatus(status));
+      });
+}
+
+template <typename Derived>
+inline void InterceptClientInitialMetadata(
+    absl::Status (Derived::Call::*fn)(ClientMetadata& md, Derived* channel),
+    typename Derived::Call* call, Derived* channel,
+    CallSpineInterface* call_spine) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnClientInitialMetadata);
+  call_spine->client_initial_metadata().receiver.InterceptAndMap(
+      [call_spine, call, channel](
+          ClientMetadataHandle md) -> absl::optional<ClientMetadataHandle> {
+        auto status = call->OnClientInitialMetadata(*md, channel);
+        if (status.ok()) return std::move(md);
+        return call_spine->Cancel(ServerMetadataFromStatus(status));
+      });
+}
+
 // Returning a promise that resolves to something that can be cast to
 // ServerMetadataHandle also counts
 template <typename Promise, typename Derived>
@@ -872,6 +938,19 @@ inline void InterceptServerTrailingMetadata(
       });
 }
 
+template <typename Derived>
+inline void InterceptServerTrailingMetadata(
+    void (Derived::Call::*fn)(ServerMetadata&, Derived*),
+    typename Derived::Call* call, Derived* channel,
+    CallSpineInterface* call_spine) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnServerTrailingMetadata);
+  call_spine->server_trailing_metadata().sender.InterceptAndMap(
+      [call, channel](ServerMetadataHandle md) {
+        call->OnServerTrailingMetadata(*md, channel);
+        return md;
+      });
+}
+
 template <typename Derived>
 inline void InterceptServerTrailingMetadata(
     absl::Status (Derived::Call::*fn)(ServerMetadata&),
@@ -885,11 +964,11 @@ inline void InterceptServerTrailingMetadata(
       });
 }
 
-inline void InterceptFinalize(const NoInterceptor*, void*) {}
+inline void InterceptFinalize(const NoInterceptor*, void*, void*) {}
 
 template <class Call>
 inline void InterceptFinalize(void (Call::*fn)(const grpc_call_final_info*),
-                              Call* call) {
+                              void*, Call* call) {
   GPR_DEBUG_ASSERT(fn == &Call::OnFinalize);
   GetContext<CallFinalization>()->Add(
       [call](const grpc_call_final_info* final_info) {
@@ -897,6 +976,17 @@ inline void InterceptFinalize(void (Call::*fn)(const grpc_call_final_info*),
       });
 }
 
+template <class Derived>
+inline void InterceptFinalize(
+    void (Derived::Call::*fn)(const grpc_call_final_info*, Derived*),
+    Derived* channel, typename Derived::Call* call) {
+  GPR_DEBUG_ASSERT(fn == &Derived::Call::OnFinalize);
+  GetContext<CallFinalization>()->Add(
+      [call, channel](const grpc_call_final_info* final_info) {
+        call->OnFinalize(final_info, channel);
+      });
+}
+
 template <typename Derived>
 absl::enable_if_t<std::is_empty<FilterCallData<Derived>>::value,
                   FilterCallData<Derived>*>
@@ -994,7 +1084,8 @@ class ImplementChannelFilter : public ChannelFilter {
     promise_filter_detail::InterceptServerTrailingMetadata(
         &Derived::Call::OnServerTrailingMetadata, call,
         static_cast<Derived*>(this), call_spine);
-    promise_filter_detail::InterceptFinalize(&Derived::Call::OnFinalize, call);
+    promise_filter_detail::InterceptFinalize(&Derived::Call::OnFinalize,
+                                             static_cast<Derived*>(this), call);
   }
 
   // Polyfill for the original promise scheme.
@@ -1011,7 +1102,7 @@ class ImplementChannelFilter : public ChannelFilter {
     promise_filter_detail::InterceptServerToClientMessage(
         &Derived::Call::OnServerToClientMessage, call, call_args);
     promise_filter_detail::InterceptFinalize(
-        &Derived::Call::OnFinalize,
+        &Derived::Call::OnFinalize, static_cast<Derived*>(this),
         static_cast<typename Derived::Call*>(&call->call));
     return promise_filter_detail::MapResult(
         &Derived::Call::OnServerTrailingMetadata,
diff --git a/src/core/lib/channel/server_call_tracer_filter.cc b/src/core/lib/channel/server_call_tracer_filter.cc
index c2450a97d4c..2858d4ca0ad 100644
--- a/src/core/lib/channel/server_call_tracer_filter.cc
+++ b/src/core/lib/channel/server_call_tracer_filter.cc
@@ -104,8 +104,8 @@ absl::StatusOr<ServerCallTracerFilter> ServerCallTracerFilter::Create(
 }  // namespace
 
 void RegisterServerCallTracerFilter(CoreConfiguration::Builder* builder) {
-  builder->channel_init()->RegisterFilter(GRPC_SERVER_CHANNEL,
-                                          &ServerCallTracerFilter::kFilter);
+  builder->channel_init()->RegisterFilter<ServerCallTracerFilter>(
+      GRPC_SERVER_CHANNEL);
 }
 
 }  // namespace grpc_core
diff --git a/src/core/lib/event_engine/posix_engine/native_dns_resolver.cc b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc
similarity index 93%
rename from src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
rename to src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc
index 79a9489d661..344471564e1 100644
--- a/src/core/lib/event_engine/posix_engine/native_dns_resolver.cc
+++ b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc
@@ -33,7 +33,7 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 
-#include "src/core/lib/event_engine/posix_engine/native_dns_resolver.h"
+#include "src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/host_port.h"
 
@@ -93,10 +93,11 @@ LookupHostnameBlocking(absl::string_view name, absl::string_view default_port) {
 
 }  // namespace
 
-NativeDNSResolver::NativeDNSResolver(std::shared_ptr<EventEngine> event_engine)
+NativePosixDNSResolver::NativePosixDNSResolver(
+    std::shared_ptr<EventEngine> event_engine)
     : event_engine_(std::move(event_engine)) {}
 
-void NativeDNSResolver::LookupHostname(
+void NativePosixDNSResolver::LookupHostname(
     EventEngine::DNSResolver::LookupHostnameCallback on_resolved,
     absl::string_view name, absl::string_view default_port) {
   event_engine_->Run(
@@ -105,7 +106,7 @@ void NativeDNSResolver::LookupHostname(
       });
 }
 
-void NativeDNSResolver::LookupSRV(
+void NativePosixDNSResolver::LookupSRV(
     EventEngine::DNSResolver::LookupSRVCallback on_resolved,
     absl::string_view /* name */) {
   // Not supported
@@ -115,7 +116,7 @@ void NativeDNSResolver::LookupSRV(
   });
 }
 
-void NativeDNSResolver::LookupTXT(
+void NativePosixDNSResolver::LookupTXT(
     EventEngine::DNSResolver::LookupTXTCallback on_resolved,
     absl::string_view /* name */) {
   // Not supported
diff --git a/src/core/lib/event_engine/posix_engine/native_dns_resolver.h b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h
similarity index 81%
rename from src/core/lib/event_engine/posix_engine/native_dns_resolver.h
rename to src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h
index 411b090ab64..651b01866f8 100644
--- a/src/core/lib/event_engine/posix_engine/native_dns_resolver.h
+++ b/src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_NATIVE_DNS_RESOLVER_H
-#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_NATIVE_DNS_RESOLVER_H
+#ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_NATIVE_POSIX_DNS_RESOLVER_H
+#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_NATIVE_POSIX_DNS_RESOLVER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -34,9 +34,9 @@ namespace experimental {
 
 // An asynchronous DNS resolver which uses the native platform's getaddrinfo
 // API. Only supports A/AAAA records.
-class NativeDNSResolver : public RefCountedDNSResolverInterface {
+class NativePosixDNSResolver : public RefCountedDNSResolverInterface {
  public:
-  explicit NativeDNSResolver(std::shared_ptr<EventEngine> event_engine);
+  explicit NativePosixDNSResolver(std::shared_ptr<EventEngine> event_engine);
 
   void LookupHostname(
       EventEngine::DNSResolver::LookupHostnameCallback on_resolved,
@@ -58,4 +58,4 @@ class NativeDNSResolver : public RefCountedDNSResolverInterface {
 }  // namespace grpc_event_engine
 
 #endif  // GRPC_POSIX_SOCKET_RESOLVE_ADDRESS
-#endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_NATIVE_DNS_RESOLVER_H
+#endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_POSIX_ENGINE_NATIVE_POSIX_DNS_RESOLVER_H
diff --git a/src/core/lib/event_engine/posix_engine/posix_engine.cc b/src/core/lib/event_engine/posix_engine/posix_engine.cc
index 06938a6204a..9991135cd71 100644
--- a/src/core/lib/event_engine/posix_engine/posix_engine.cc
+++ b/src/core/lib/event_engine/posix_engine/posix_engine.cc
@@ -45,7 +45,7 @@
 #include "src/core/lib/event_engine/poller.h"
 #include "src/core/lib/event_engine/posix.h"
 #include "src/core/lib/event_engine/posix_engine/grpc_polled_fd_posix.h"
-#include "src/core/lib/event_engine/posix_engine/native_dns_resolver.h"
+#include "src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h"
 #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h"
 #include "src/core/lib/event_engine/posix_engine/timer.h"
 #include "src/core/lib/event_engine/tcp_socket_utils.h"
@@ -571,10 +571,10 @@ PosixEventEngine::GetDNSResolver(
         std::move(*ares_resolver));
 #endif  // GRPC_ARES == 1 && defined(GRPC_POSIX_SOCKET_ARES_EV_DRIVER)
   }
-  GRPC_EVENT_ENGINE_DNS_TRACE("PosixEventEngine:%p creating NativeDNSResolver",
-                              this);
+  GRPC_EVENT_ENGINE_DNS_TRACE(
+      "PosixEventEngine:%p creating NativePosixDNSResolver", this);
   return std::make_unique<PosixEventEngine::PosixDNSResolver>(
-      grpc_core::MakeOrphanable<NativeDNSResolver>(shared_from_this()));
+      grpc_core::MakeOrphanable<NativePosixDNSResolver>(shared_from_this()));
 #endif  // GRPC_POSIX_SOCKET_RESOLVE_ADDRESS
 }
 
diff --git a/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
new file mode 100644
index 00000000000..a00ed40225b
--- /dev/null
+++ b/src/core/lib/event_engine/windows/native_windows_dns_resolver.cc
@@ -0,0 +1,114 @@
+// Copyright 2024 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#include <grpc/support/port_platform.h>
+
+#ifdef GPR_WINDOWS
+#include <inttypes.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include <string>
+
+#include "absl/strings/str_format.h"
+
+#include <grpc/event_engine/event_engine.h>
+
+#include "src/core/lib/event_engine/windows/native_windows_dns_resolver.h"
+#include "src/core/lib/gprpp/host_port.h"
+#include "src/core/lib/gprpp/status_helper.h"
+#include "src/core/lib/iomgr/error.h"
+
+namespace grpc_event_engine {
+namespace experimental {
+
+namespace {
+absl::StatusOr<std::vector<EventEngine::ResolvedAddress>>
+LookupHostnameBlocking(absl::string_view name, absl::string_view default_port) {
+  std::vector<EventEngine::ResolvedAddress> addresses;
+  // parse name, splitting it into host and port parts
+  std::string host;
+  std::string port;
+  grpc_core::SplitHostPort(name, &host, &port);
+  if (host.empty()) {
+    return absl::InvalidArgumentError(absl::StrCat("Unparseable name: ", name));
+  }
+  if (port.empty()) {
+    if (default_port.empty()) {
+      return absl::InvalidArgumentError(
+          absl::StrFormat("No port in name %s or default_port argument", name));
+    }
+    port = std::string(default_port);
+  }
+  // Call getaddrinfo
+  struct addrinfo hints;
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_UNSPEC;      // ipv4 or ipv6
+  hints.ai_socktype = SOCK_STREAM;  // stream socket
+  hints.ai_flags = AI_PASSIVE;      // for wildcard IP address
+  struct addrinfo* result = nullptr;
+  int getaddrinfo_error =
+      getaddrinfo(host.c_str(), port.c_str(), &hints, &result);
+  if (getaddrinfo_error != 0) {
+    return absl::UnknownError(
+        absl::StrFormat("Address lookup failed for %s os_error: %s", name,
+                        grpc_core::StatusToString(
+                            GRPC_WSA_ERROR(WSAGetLastError(), "getaddrinfo"))
+                            .c_str()));
+  }
+  // Success path: collect and return all addresses
+  for (auto* resp = result; resp != nullptr; resp = resp->ai_next) {
+    addresses.emplace_back(resp->ai_addr, resp->ai_addrlen);
+  }
+  if (result) freeaddrinfo(result);
+  return addresses;
+}
+
+}  // namespace
+NativeWindowsDNSResolver::NativeWindowsDNSResolver(
+    std::shared_ptr<EventEngine> event_engine)
+    : event_engine_(std::move(event_engine)) {}
+
+void NativeWindowsDNSResolver::LookupHostname(
+    EventEngine::DNSResolver::LookupHostnameCallback on_resolved,
+    absl::string_view name, absl::string_view default_port) {
+  event_engine_->Run(
+      [name, default_port, on_resolved = std::move(on_resolved)]() mutable {
+        on_resolved(LookupHostnameBlocking(name, default_port));
+      });
+}
+
+void NativeWindowsDNSResolver::LookupSRV(
+    EventEngine::DNSResolver::LookupSRVCallback on_resolved,
+    absl::string_view /* name */) {
+  // Not supported
+  event_engine_->Run([on_resolved = std::move(on_resolved)]() mutable {
+    on_resolved(absl::UnimplementedError(
+        "The Native resolver does not support looking up SRV records"));
+  });
+}
+
+void NativeWindowsDNSResolver::LookupTXT(
+    EventEngine::DNSResolver::LookupTXTCallback on_resolved,
+    absl::string_view /* name */) {
+  // Not supported
+  event_engine_->Run([on_resolved = std::move(on_resolved)]() mutable {
+    on_resolved(absl::UnimplementedError(
+        "The Native resolver does not support looking up TXT records"));
+  });
+}
+
+}  // namespace experimental
+}  // namespace grpc_event_engine
+
+#endif  // GPR_WINDOWS
diff --git a/src/core/lib/event_engine/windows/native_windows_dns_resolver.h b/src/core/lib/event_engine/windows/native_windows_dns_resolver.h
new file mode 100644
index 00000000000..43d1fe27fcc
--- /dev/null
+++ b/src/core/lib/event_engine/windows/native_windows_dns_resolver.h
@@ -0,0 +1,51 @@
+// Copyright 2024 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#ifndef GRPC_SRC_CORE_LIB_EVENT_ENGINE_WINDOWS_NATIVE_WINDOWS_DNS_RESOLVER_H
+#define GRPC_SRC_CORE_LIB_EVENT_ENGINE_WINDOWS_NATIVE_WINDOWS_DNS_RESOLVER_H
+
+#include <grpc/support/port_platform.h>
+
+#ifdef GPR_WINDOWS
+
+#include <grpc/event_engine/event_engine.h>
+
+namespace grpc_event_engine {
+namespace experimental {
+
+// An asynchronous DNS resolver which uses the native platform's getaddrinfo
+// API. Only supports A/AAAA records.
+class NativeWindowsDNSResolver : public EventEngine::DNSResolver {
+ public:
+  explicit NativeWindowsDNSResolver(std::shared_ptr<EventEngine> event_engine);
+
+  void LookupHostname(
+      EventEngine::DNSResolver::LookupHostnameCallback on_resolved,
+      absl::string_view name, absl::string_view default_port) override;
+
+  void LookupSRV(EventEngine::DNSResolver::LookupSRVCallback on_resolved,
+                 absl::string_view name) override;
+
+  void LookupTXT(EventEngine::DNSResolver::LookupTXTCallback on_resolved,
+                 absl::string_view name) override;
+
+ private:
+  std::shared_ptr<EventEngine> event_engine_;
+};
+
+}  // namespace experimental
+}  // namespace grpc_event_engine
+
+#endif
+
+#endif  // GRPC_SRC_CORE_LIB_EVENT_ENGINE_WINDOWS_NATIVE_WINDOWS_DNS_RESOLVER_H
diff --git a/src/core/lib/event_engine/windows/windows_engine.cc b/src/core/lib/event_engine/windows/windows_engine.cc
index 25120267039..69e4963f387 100644
--- a/src/core/lib/event_engine/windows/windows_engine.cc
+++ b/src/core/lib/event_engine/windows/windows_engine.cc
@@ -37,6 +37,7 @@
 #include "src/core/lib/event_engine/utils.h"
 #include "src/core/lib/event_engine/windows/grpc_polled_fd_windows.h"
 #include "src/core/lib/event_engine/windows/iocp.h"
+#include "src/core/lib/event_engine/windows/native_windows_dns_resolver.h"
 #include "src/core/lib/event_engine/windows/windows_endpoint.h"
 #include "src/core/lib/event_engine/windows/windows_engine.h"
 #include "src/core/lib/event_engine/windows/windows_listener.h"
@@ -233,10 +234,9 @@ WindowsEventEngine::GetDNSResolver(
   return std::make_unique<WindowsEventEngine::WindowsDNSResolver>(
       std::move(*ares_resolver));
 #else   // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
-  // TODO(yijiem): Implement a basic A/AAAA-only native resolver in
-  // WindowsEventEngine.
-  (void)options;
-  grpc_core::Crash("unimplemented");
+  GRPC_EVENT_ENGINE_DNS_TRACE(
+      "WindowsEventEngine:%p creating NativeWindowsDNSResolver", this);
+  return std::make_unique<NativeWindowsDNSResolver>(shared_from_this());
 #endif  // GRPC_ARES == 1 && defined(GRPC_WINDOWS_SOCKET_ARES_EV_DRIVER)
 }
 
diff --git a/src/core/lib/experiments/experiments.cc b/src/core/lib/experiments/experiments.cc
index 3ec2239e017..3c40e129ae1 100644
--- a/src/core/lib/experiments/experiments.cc
+++ b/src/core/lib/experiments/experiments.cc
@@ -60,19 +60,12 @@ const char* const description_keepalive_server_fix =
     "Allows overriding keepalive_permit_without_calls for servers. Refer "
     "https://github.com/grpc/grpc/pull/33917 for more information.";
 const char* const additional_constraints_keepalive_server_fix = "{}";
-const char* const description_memory_pressure_controller =
-    "New memory pressure controller";
-const char* const additional_constraints_memory_pressure_controller = "{}";
 const char* const description_monitoring_experiment =
     "Placeholder experiment to prove/disprove our monitoring is working";
 const char* const additional_constraints_monitoring_experiment = "{}";
 const char* const description_multiping =
     "Allow more than one ping to be in flight at a time by default.";
 const char* const additional_constraints_multiping = "{}";
-const char* const description_overload_protection =
-    "If chttp2 has more streams than it can handle open, send RST_STREAM "
-    "immediately on new streams appearing.";
-const char* const additional_constraints_overload_protection = "{}";
 const char* const description_peer_state_based_framing =
     "If set, the max sizes of frames sent to lower layers is controlled based "
     "on the peer's memory pressure which is reflected in its max http2 frame "
@@ -97,10 +90,6 @@ const char* const description_promise_based_server_call =
     "If set, use the new gRPC promise based call code when it's appropriate "
     "(ie when all filters in a stack are promise based)";
 const char* const additional_constraints_promise_based_server_call = "{}";
-const char* const description_red_max_concurrent_streams =
-    "Perform random early rejection of requests that would exceed a newly "
-    "reduced MAX_CONCURRENT_STREAMS but are allowed by the current.";
-const char* const additional_constraints_red_max_concurrent_streams = "{}";
 const char* const description_registered_method_lookup_in_transport =
     "Change registered method's lookup point to transport";
 const char* const additional_constraints_registered_method_lookup_in_transport =
@@ -152,6 +141,9 @@ const char* const description_unconstrained_max_quota_buffer_size =
     "Discard the cap on the max free pool size for one memory allocator";
 const char* const additional_constraints_unconstrained_max_quota_buffer_size =
     "{}";
+const char* const description_v3_backend_metric_filter =
+    "Use the backend metric filter utilizing the v3 filter api";
+const char* const additional_constraints_v3_backend_metric_filter = "{}";
 const char* const description_v3_channel_idle_filters =
     "Use the v3 filter API version of the idle filters.";
 const char* const additional_constraints_v3_channel_idle_filters = "{}";
@@ -216,15 +208,10 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_keepalive_fix, nullptr, 0, false, false},
     {"keepalive_server_fix", description_keepalive_server_fix,
      additional_constraints_keepalive_server_fix, nullptr, 0, false, false},
-    {"memory_pressure_controller", description_memory_pressure_controller,
-     additional_constraints_memory_pressure_controller, nullptr, 0, false,
-     true},
     {"monitoring_experiment", description_monitoring_experiment,
      additional_constraints_monitoring_experiment, nullptr, 0, true, true},
     {"multiping", description_multiping, additional_constraints_multiping,
      nullptr, 0, false, true},
-    {"overload_protection", description_overload_protection,
-     additional_constraints_overload_protection, nullptr, 0, true, true},
     {"peer_state_based_framing", description_peer_state_based_framing,
      additional_constraints_peer_state_based_framing, nullptr, 0, false, true},
     {"pending_queue_cap", description_pending_queue_cap,
@@ -235,9 +222,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_promise_based_client_call, nullptr, 0, false, true},
     {"promise_based_server_call", description_promise_based_server_call,
      additional_constraints_promise_based_server_call, nullptr, 0, false, true},
-    {"red_max_concurrent_streams", description_red_max_concurrent_streams,
-     additional_constraints_red_max_concurrent_streams, nullptr, 0, false,
-     true},
     {"registered_method_lookup_in_transport",
      description_registered_method_lookup_in_transport,
      additional_constraints_registered_method_lookup_in_transport, nullptr, 0,
@@ -273,6 +257,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_unconstrained_max_quota_buffer_size,
      additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0,
      false, true},
+    {"v3_backend_metric_filter", description_v3_backend_metric_filter,
+     additional_constraints_v3_backend_metric_filter, nullptr, 0, false, true},
     {"v3_channel_idle_filters", description_v3_channel_idle_filters,
      additional_constraints_v3_channel_idle_filters, nullptr, 0, false, true},
     {"v3_compression_filter", description_v3_compression_filter,
@@ -334,19 +320,12 @@ const char* const description_keepalive_server_fix =
     "Allows overriding keepalive_permit_without_calls for servers. Refer "
     "https://github.com/grpc/grpc/pull/33917 for more information.";
 const char* const additional_constraints_keepalive_server_fix = "{}";
-const char* const description_memory_pressure_controller =
-    "New memory pressure controller";
-const char* const additional_constraints_memory_pressure_controller = "{}";
 const char* const description_monitoring_experiment =
     "Placeholder experiment to prove/disprove our monitoring is working";
 const char* const additional_constraints_monitoring_experiment = "{}";
 const char* const description_multiping =
     "Allow more than one ping to be in flight at a time by default.";
 const char* const additional_constraints_multiping = "{}";
-const char* const description_overload_protection =
-    "If chttp2 has more streams than it can handle open, send RST_STREAM "
-    "immediately on new streams appearing.";
-const char* const additional_constraints_overload_protection = "{}";
 const char* const description_peer_state_based_framing =
     "If set, the max sizes of frames sent to lower layers is controlled based "
     "on the peer's memory pressure which is reflected in its max http2 frame "
@@ -371,10 +350,6 @@ const char* const description_promise_based_server_call =
     "If set, use the new gRPC promise based call code when it's appropriate "
     "(ie when all filters in a stack are promise based)";
 const char* const additional_constraints_promise_based_server_call = "{}";
-const char* const description_red_max_concurrent_streams =
-    "Perform random early rejection of requests that would exceed a newly "
-    "reduced MAX_CONCURRENT_STREAMS but are allowed by the current.";
-const char* const additional_constraints_red_max_concurrent_streams = "{}";
 const char* const description_registered_method_lookup_in_transport =
     "Change registered method's lookup point to transport";
 const char* const additional_constraints_registered_method_lookup_in_transport =
@@ -426,6 +401,9 @@ const char* const description_unconstrained_max_quota_buffer_size =
     "Discard the cap on the max free pool size for one memory allocator";
 const char* const additional_constraints_unconstrained_max_quota_buffer_size =
     "{}";
+const char* const description_v3_backend_metric_filter =
+    "Use the backend metric filter utilizing the v3 filter api";
+const char* const additional_constraints_v3_backend_metric_filter = "{}";
 const char* const description_v3_channel_idle_filters =
     "Use the v3 filter API version of the idle filters.";
 const char* const additional_constraints_v3_channel_idle_filters = "{}";
@@ -490,15 +468,10 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_keepalive_fix, nullptr, 0, false, false},
     {"keepalive_server_fix", description_keepalive_server_fix,
      additional_constraints_keepalive_server_fix, nullptr, 0, false, false},
-    {"memory_pressure_controller", description_memory_pressure_controller,
-     additional_constraints_memory_pressure_controller, nullptr, 0, false,
-     true},
     {"monitoring_experiment", description_monitoring_experiment,
      additional_constraints_monitoring_experiment, nullptr, 0, true, true},
     {"multiping", description_multiping, additional_constraints_multiping,
      nullptr, 0, false, true},
-    {"overload_protection", description_overload_protection,
-     additional_constraints_overload_protection, nullptr, 0, true, true},
     {"peer_state_based_framing", description_peer_state_based_framing,
      additional_constraints_peer_state_based_framing, nullptr, 0, false, true},
     {"pending_queue_cap", description_pending_queue_cap,
@@ -509,9 +482,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_promise_based_client_call, nullptr, 0, false, true},
     {"promise_based_server_call", description_promise_based_server_call,
      additional_constraints_promise_based_server_call, nullptr, 0, false, true},
-    {"red_max_concurrent_streams", description_red_max_concurrent_streams,
-     additional_constraints_red_max_concurrent_streams, nullptr, 0, false,
-     true},
     {"registered_method_lookup_in_transport",
      description_registered_method_lookup_in_transport,
      additional_constraints_registered_method_lookup_in_transport, nullptr, 0,
@@ -547,6 +517,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_unconstrained_max_quota_buffer_size,
      additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0,
      false, true},
+    {"v3_backend_metric_filter", description_v3_backend_metric_filter,
+     additional_constraints_v3_backend_metric_filter, nullptr, 0, false, true},
     {"v3_channel_idle_filters", description_v3_channel_idle_filters,
      additional_constraints_v3_channel_idle_filters, nullptr, 0, false, true},
     {"v3_compression_filter", description_v3_compression_filter,
@@ -608,19 +580,12 @@ const char* const description_keepalive_server_fix =
     "Allows overriding keepalive_permit_without_calls for servers. Refer "
     "https://github.com/grpc/grpc/pull/33917 for more information.";
 const char* const additional_constraints_keepalive_server_fix = "{}";
-const char* const description_memory_pressure_controller =
-    "New memory pressure controller";
-const char* const additional_constraints_memory_pressure_controller = "{}";
 const char* const description_monitoring_experiment =
     "Placeholder experiment to prove/disprove our monitoring is working";
 const char* const additional_constraints_monitoring_experiment = "{}";
 const char* const description_multiping =
     "Allow more than one ping to be in flight at a time by default.";
 const char* const additional_constraints_multiping = "{}";
-const char* const description_overload_protection =
-    "If chttp2 has more streams than it can handle open, send RST_STREAM "
-    "immediately on new streams appearing.";
-const char* const additional_constraints_overload_protection = "{}";
 const char* const description_peer_state_based_framing =
     "If set, the max sizes of frames sent to lower layers is controlled based "
     "on the peer's memory pressure which is reflected in its max http2 frame "
@@ -645,10 +610,6 @@ const char* const description_promise_based_server_call =
     "If set, use the new gRPC promise based call code when it's appropriate "
     "(ie when all filters in a stack are promise based)";
 const char* const additional_constraints_promise_based_server_call = "{}";
-const char* const description_red_max_concurrent_streams =
-    "Perform random early rejection of requests that would exceed a newly "
-    "reduced MAX_CONCURRENT_STREAMS but are allowed by the current.";
-const char* const additional_constraints_red_max_concurrent_streams = "{}";
 const char* const description_registered_method_lookup_in_transport =
     "Change registered method's lookup point to transport";
 const char* const additional_constraints_registered_method_lookup_in_transport =
@@ -700,6 +661,9 @@ const char* const description_unconstrained_max_quota_buffer_size =
     "Discard the cap on the max free pool size for one memory allocator";
 const char* const additional_constraints_unconstrained_max_quota_buffer_size =
     "{}";
+const char* const description_v3_backend_metric_filter =
+    "Use the backend metric filter utilizing the v3 filter api";
+const char* const additional_constraints_v3_backend_metric_filter = "{}";
 const char* const description_v3_channel_idle_filters =
     "Use the v3 filter API version of the idle filters.";
 const char* const additional_constraints_v3_channel_idle_filters = "{}";
@@ -764,15 +728,10 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_keepalive_fix, nullptr, 0, false, false},
     {"keepalive_server_fix", description_keepalive_server_fix,
      additional_constraints_keepalive_server_fix, nullptr, 0, false, false},
-    {"memory_pressure_controller", description_memory_pressure_controller,
-     additional_constraints_memory_pressure_controller, nullptr, 0, false,
-     true},
     {"monitoring_experiment", description_monitoring_experiment,
      additional_constraints_monitoring_experiment, nullptr, 0, true, true},
     {"multiping", description_multiping, additional_constraints_multiping,
      nullptr, 0, false, true},
-    {"overload_protection", description_overload_protection,
-     additional_constraints_overload_protection, nullptr, 0, true, true},
     {"peer_state_based_framing", description_peer_state_based_framing,
      additional_constraints_peer_state_based_framing, nullptr, 0, false, true},
     {"pending_queue_cap", description_pending_queue_cap,
@@ -783,9 +742,6 @@ const ExperimentMetadata g_experiment_metadata[] = {
      additional_constraints_promise_based_client_call, nullptr, 0, false, true},
     {"promise_based_server_call", description_promise_based_server_call,
      additional_constraints_promise_based_server_call, nullptr, 0, false, true},
-    {"red_max_concurrent_streams", description_red_max_concurrent_streams,
-     additional_constraints_red_max_concurrent_streams, nullptr, 0, false,
-     true},
     {"registered_method_lookup_in_transport",
      description_registered_method_lookup_in_transport,
      additional_constraints_registered_method_lookup_in_transport, nullptr, 0,
@@ -821,6 +777,8 @@ const ExperimentMetadata g_experiment_metadata[] = {
      description_unconstrained_max_quota_buffer_size,
      additional_constraints_unconstrained_max_quota_buffer_size, nullptr, 0,
      false, true},
+    {"v3_backend_metric_filter", description_v3_backend_metric_filter,
+     additional_constraints_v3_backend_metric_filter, nullptr, 0, false, true},
     {"v3_channel_idle_filters", description_v3_channel_idle_filters,
      additional_constraints_v3_channel_idle_filters, nullptr, 0, false, true},
     {"v3_compression_filter", description_v3_compression_filter,
diff --git a/src/core/lib/experiments/experiments.h b/src/core/lib/experiments/experiments.h
index 05e2157985e..d631bf357a4 100644
--- a/src/core/lib/experiments/experiments.h
+++ b/src/core/lib/experiments/experiments.h
@@ -79,12 +79,9 @@ inline bool IsFreeLargeAllocatorEnabled() { return false; }
 inline bool IsHttp2StatsFixEnabled() { return true; }
 inline bool IsKeepaliveFixEnabled() { return false; }
 inline bool IsKeepaliveServerFixEnabled() { return false; }
-inline bool IsMemoryPressureControllerEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
 inline bool IsMonitoringExperimentEnabled() { return true; }
 inline bool IsMultipingEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_OVERLOAD_PROTECTION
-inline bool IsOverloadProtectionEnabled() { return true; }
 inline bool IsPeerStateBasedFramingEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PENDING_QUEUE_CAP
 inline bool IsPendingQueueCapEnabled() { return true; }
@@ -92,7 +89,6 @@ inline bool IsPendingQueueCapEnabled() { return true; }
 inline bool IsPickFirstHappyEyeballsEnabled() { return true; }
 inline bool IsPromiseBasedClientCallEnabled() { return false; }
 inline bool IsPromiseBasedServerCallEnabled() { return false; }
-inline bool IsRedMaxConcurrentStreamsEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_REGISTERED_METHOD_LOOKUP_IN_TRANSPORT
 inline bool IsRegisteredMethodLookupInTransportEnabled() { return true; }
 inline bool IsPromiseBasedInprocTransportEnabled() { return false; }
@@ -107,6 +103,7 @@ inline bool IsTcpFrameSizeTuningEnabled() { return false; }
 inline bool IsTcpRcvLowatEnabled() { return false; }
 inline bool IsTraceRecordCallopsEnabled() { return false; }
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
+inline bool IsV3BackendMetricFilterEnabled() { return false; }
 inline bool IsV3ChannelIdleFiltersEnabled() { return false; }
 inline bool IsV3CompressionFilterEnabled() { return false; }
 inline bool IsV3ServerAuthFilterEnabled() { return false; }
@@ -144,12 +141,9 @@ inline bool IsFreeLargeAllocatorEnabled() { return false; }
 inline bool IsHttp2StatsFixEnabled() { return true; }
 inline bool IsKeepaliveFixEnabled() { return false; }
 inline bool IsKeepaliveServerFixEnabled() { return false; }
-inline bool IsMemoryPressureControllerEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
 inline bool IsMonitoringExperimentEnabled() { return true; }
 inline bool IsMultipingEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_OVERLOAD_PROTECTION
-inline bool IsOverloadProtectionEnabled() { return true; }
 inline bool IsPeerStateBasedFramingEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PENDING_QUEUE_CAP
 inline bool IsPendingQueueCapEnabled() { return true; }
@@ -157,7 +151,6 @@ inline bool IsPendingQueueCapEnabled() { return true; }
 inline bool IsPickFirstHappyEyeballsEnabled() { return true; }
 inline bool IsPromiseBasedClientCallEnabled() { return false; }
 inline bool IsPromiseBasedServerCallEnabled() { return false; }
-inline bool IsRedMaxConcurrentStreamsEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_REGISTERED_METHOD_LOOKUP_IN_TRANSPORT
 inline bool IsRegisteredMethodLookupInTransportEnabled() { return true; }
 inline bool IsPromiseBasedInprocTransportEnabled() { return false; }
@@ -172,6 +165,7 @@ inline bool IsTcpFrameSizeTuningEnabled() { return false; }
 inline bool IsTcpRcvLowatEnabled() { return false; }
 inline bool IsTraceRecordCallopsEnabled() { return false; }
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
+inline bool IsV3BackendMetricFilterEnabled() { return false; }
 inline bool IsV3ChannelIdleFiltersEnabled() { return false; }
 inline bool IsV3CompressionFilterEnabled() { return false; }
 inline bool IsV3ServerAuthFilterEnabled() { return false; }
@@ -209,12 +203,9 @@ inline bool IsFreeLargeAllocatorEnabled() { return false; }
 inline bool IsHttp2StatsFixEnabled() { return true; }
 inline bool IsKeepaliveFixEnabled() { return false; }
 inline bool IsKeepaliveServerFixEnabled() { return false; }
-inline bool IsMemoryPressureControllerEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
 inline bool IsMonitoringExperimentEnabled() { return true; }
 inline bool IsMultipingEnabled() { return false; }
-#define GRPC_EXPERIMENT_IS_INCLUDED_OVERLOAD_PROTECTION
-inline bool IsOverloadProtectionEnabled() { return true; }
 inline bool IsPeerStateBasedFramingEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_PENDING_QUEUE_CAP
 inline bool IsPendingQueueCapEnabled() { return true; }
@@ -222,7 +213,6 @@ inline bool IsPendingQueueCapEnabled() { return true; }
 inline bool IsPickFirstHappyEyeballsEnabled() { return true; }
 inline bool IsPromiseBasedClientCallEnabled() { return false; }
 inline bool IsPromiseBasedServerCallEnabled() { return false; }
-inline bool IsRedMaxConcurrentStreamsEnabled() { return false; }
 #define GRPC_EXPERIMENT_IS_INCLUDED_REGISTERED_METHOD_LOOKUP_IN_TRANSPORT
 inline bool IsRegisteredMethodLookupInTransportEnabled() { return true; }
 inline bool IsPromiseBasedInprocTransportEnabled() { return false; }
@@ -237,6 +227,7 @@ inline bool IsTcpFrameSizeTuningEnabled() { return false; }
 inline bool IsTcpRcvLowatEnabled() { return false; }
 inline bool IsTraceRecordCallopsEnabled() { return false; }
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() { return false; }
+inline bool IsV3BackendMetricFilterEnabled() { return false; }
 inline bool IsV3ChannelIdleFiltersEnabled() { return false; }
 inline bool IsV3CompressionFilterEnabled() { return false; }
 inline bool IsV3ServerAuthFilterEnabled() { return false; }
@@ -264,16 +255,13 @@ enum ExperimentIds {
   kExperimentIdHttp2StatsFix,
   kExperimentIdKeepaliveFix,
   kExperimentIdKeepaliveServerFix,
-  kExperimentIdMemoryPressureController,
   kExperimentIdMonitoringExperiment,
   kExperimentIdMultiping,
-  kExperimentIdOverloadProtection,
   kExperimentIdPeerStateBasedFraming,
   kExperimentIdPendingQueueCap,
   kExperimentIdPickFirstHappyEyeballs,
   kExperimentIdPromiseBasedClientCall,
   kExperimentIdPromiseBasedServerCall,
-  kExperimentIdRedMaxConcurrentStreams,
   kExperimentIdRegisteredMethodLookupInTransport,
   kExperimentIdPromiseBasedInprocTransport,
   kExperimentIdRegisteredMethodsMap,
@@ -286,6 +274,7 @@ enum ExperimentIds {
   kExperimentIdTcpRcvLowat,
   kExperimentIdTraceRecordCallops,
   kExperimentIdUnconstrainedMaxQuotaBufferSize,
+  kExperimentIdV3BackendMetricFilter,
   kExperimentIdV3ChannelIdleFilters,
   kExperimentIdV3CompressionFilter,
   kExperimentIdV3ServerAuthFilter,
@@ -340,10 +329,6 @@ inline bool IsKeepaliveFixEnabled() {
 inline bool IsKeepaliveServerFixEnabled() {
   return IsExperimentEnabled(kExperimentIdKeepaliveServerFix);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_MEMORY_PRESSURE_CONTROLLER
-inline bool IsMemoryPressureControllerEnabled() {
-  return IsExperimentEnabled(kExperimentIdMemoryPressureController);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_MONITORING_EXPERIMENT
 inline bool IsMonitoringExperimentEnabled() {
   return IsExperimentEnabled(kExperimentIdMonitoringExperiment);
@@ -352,10 +337,6 @@ inline bool IsMonitoringExperimentEnabled() {
 inline bool IsMultipingEnabled() {
   return IsExperimentEnabled(kExperimentIdMultiping);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_OVERLOAD_PROTECTION
-inline bool IsOverloadProtectionEnabled() {
-  return IsExperimentEnabled(kExperimentIdOverloadProtection);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_PEER_STATE_BASED_FRAMING
 inline bool IsPeerStateBasedFramingEnabled() {
   return IsExperimentEnabled(kExperimentIdPeerStateBasedFraming);
@@ -376,10 +357,6 @@ inline bool IsPromiseBasedClientCallEnabled() {
 inline bool IsPromiseBasedServerCallEnabled() {
   return IsExperimentEnabled(kExperimentIdPromiseBasedServerCall);
 }
-#define GRPC_EXPERIMENT_IS_INCLUDED_RED_MAX_CONCURRENT_STREAMS
-inline bool IsRedMaxConcurrentStreamsEnabled() {
-  return IsExperimentEnabled(kExperimentIdRedMaxConcurrentStreams);
-}
 #define GRPC_EXPERIMENT_IS_INCLUDED_REGISTERED_METHOD_LOOKUP_IN_TRANSPORT
 inline bool IsRegisteredMethodLookupInTransportEnabled() {
   return IsExperimentEnabled(kExperimentIdRegisteredMethodLookupInTransport);
@@ -428,6 +405,10 @@ inline bool IsTraceRecordCallopsEnabled() {
 inline bool IsUnconstrainedMaxQuotaBufferSizeEnabled() {
   return IsExperimentEnabled(kExperimentIdUnconstrainedMaxQuotaBufferSize);
 }
+#define GRPC_EXPERIMENT_IS_INCLUDED_V3_BACKEND_METRIC_FILTER
+inline bool IsV3BackendMetricFilterEnabled() {
+  return IsExperimentEnabled(kExperimentIdV3BackendMetricFilter);
+}
 #define GRPC_EXPERIMENT_IS_INCLUDED_V3_CHANNEL_IDLE_FILTERS
 inline bool IsV3ChannelIdleFiltersEnabled() {
   return IsExperimentEnabled(kExperimentIdV3ChannelIdleFilters);
diff --git a/src/core/lib/experiments/experiments.yaml b/src/core/lib/experiments/experiments.yaml
index 36d3f2baaa1..7c92753a819 100644
--- a/src/core/lib/experiments/experiments.yaml
+++ b/src/core/lib/experiments/experiments.yaml
@@ -107,11 +107,6 @@
   owner: yashkt@google.com
   test_tags: []
   allow_in_fuzzing_config: false
-- name: memory_pressure_controller
-  description: New memory pressure controller
-  expiry: 2024/05/05
-  owner: ctiller@google.com
-  test_tags: [resource_quota_test]
 - name: monitoring_experiment
   description: Placeholder experiment to prove/disprove our monitoring is working
   expiry: never-ever
@@ -123,13 +118,6 @@
   expiry: 2024/01/15
   owner: ctiller@google.com
   test_tags: [flow_control_test]
-- name: overload_protection
-  description:
-    If chttp2 has more streams than it can handle open, send RST_STREAM immediately
-    on new streams appearing.
-  expiry: 2024/03/03
-  owner: ctiller@google.com
-  test_tags: [flow_control_test]
 - name: peer_state_based_framing
   description:
     If set, the max sizes of frames sent to lower layers is controlled based
@@ -177,13 +165,6 @@
   expiry: 2024/06/14
   owner: ctiller@google.com
   test_tags: ["core_end2end_test", "cpp_end2end_test", "xds_end2end_test", "logging_test"]
-- name: red_max_concurrent_streams
-  description:
-    Perform random early rejection of requests that would exceed a newly reduced
-    MAX_CONCURRENT_STREAMS but are allowed by the current.
-  expiry: 2024/03/03
-  owner: ctiller@google.com
-  test_tags: [flow_control_test]
 - name: registered_method_lookup_in_transport
   description:
     Change registered method's lookup point to transport
@@ -253,6 +234,12 @@
   expiry: 2024/02/01
   owner: ctiller@google.com
   test_tags: [resource_quota_test]
+- name: v3_backend_metric_filter
+  description:
+    Use the backend metric filter utilizing the v3 filter api
+  expiry: 2024/05/05
+  owner: ctiller@google.com
+  test_tags: []
 - name: v3_channel_idle_filters
   description:
     Use the v3 filter API version of the idle filters.
diff --git a/src/core/lib/experiments/rollouts.yaml b/src/core/lib/experiments/rollouts.yaml
index 160a12e55a0..a49bcd7e6af 100644
--- a/src/core/lib/experiments/rollouts.yaml
+++ b/src/core/lib/experiments/rollouts.yaml
@@ -78,12 +78,8 @@
   default: false
 - name: keepalive_server_fix
   default: false
-- name: memory_pressure_controller
-  default: false
 - name: monitoring_experiment
   default: true
-- name: overload_protection
-  default: true
 - name: peer_state_based_framing
   default: false
 - name: pending_queue_cap
@@ -94,8 +90,6 @@
   default: false
 - name: promise_based_server_call
   default: false
-- name: red_max_concurrent_streams
-  default: false
 - name: registered_method_lookup_in_transport
   default: true
 - name: registered_methods_map
diff --git a/src/core/lib/gprpp/debug_location.h b/src/core/lib/gprpp/debug_location.h
index 7e021fd9f78..c6c9b682869 100644
--- a/src/core/lib/gprpp/debug_location.h
+++ b/src/core/lib/gprpp/debug_location.h
@@ -81,6 +81,15 @@ class DebugLocation {
 };
 #endif
 
+template <typename T>
+struct ValueWithDebugLocation {
+  // NOLINTNEXTLINE
+  ValueWithDebugLocation(T&& value, DebugLocation debug_location = {})
+      : value(std::forward<T>(value)), debug_location(debug_location) {}
+  T value;
+  GPR_NO_UNIQUE_ADDRESS DebugLocation debug_location;
+};
+
 #define DEBUG_LOCATION ::grpc_core::DebugLocation(__FILE__, __LINE__)
 
 }  // namespace grpc_core
diff --git a/src/core/lib/promise/detail/seq_state.h b/src/core/lib/promise/detail/seq_state.h
index 97547465fcc..147ff10e6f1 100644
--- a/src/core/lib/promise/detail/seq_state.h
+++ b/src/core/lib/promise/detail/seq_state.h
@@ -2754,6 +2754,3047 @@ struct SeqState<Traits, P, F0, F1, F2, F3, F4, F5, F6, F7> {
   }
 };
 
+template <template <typename> class Traits, typename P, typename F0,
+          typename F1, typename F2, typename F3, typename F4, typename F5,
+          typename F6, typename F7, typename F8>
+struct SeqState<Traits, P, F0, F1, F2, F3, F4, F5, F6, F7, F8> {
+  using Promise0 = PromiseLike<P>;
+  using PromiseResult0 = typename Promise0::Result;
+  using PromiseResultTraits0 = Traits<PromiseResult0>;
+  using NextFactory0 =
+      OncePromiseFactory<typename PromiseResultTraits0::UnwrappedType, F0>;
+  using Promise1 = typename NextFactory0::Promise;
+  using PromiseResult1 = typename Promise1::Result;
+  using PromiseResultTraits1 = Traits<PromiseResult1>;
+  using NextFactory1 =
+      OncePromiseFactory<typename PromiseResultTraits1::UnwrappedType, F1>;
+  using Promise2 = typename NextFactory1::Promise;
+  using PromiseResult2 = typename Promise2::Result;
+  using PromiseResultTraits2 = Traits<PromiseResult2>;
+  using NextFactory2 =
+      OncePromiseFactory<typename PromiseResultTraits2::UnwrappedType, F2>;
+  using Promise3 = typename NextFactory2::Promise;
+  using PromiseResult3 = typename Promise3::Result;
+  using PromiseResultTraits3 = Traits<PromiseResult3>;
+  using NextFactory3 =
+      OncePromiseFactory<typename PromiseResultTraits3::UnwrappedType, F3>;
+  using Promise4 = typename NextFactory3::Promise;
+  using PromiseResult4 = typename Promise4::Result;
+  using PromiseResultTraits4 = Traits<PromiseResult4>;
+  using NextFactory4 =
+      OncePromiseFactory<typename PromiseResultTraits4::UnwrappedType, F4>;
+  using Promise5 = typename NextFactory4::Promise;
+  using PromiseResult5 = typename Promise5::Result;
+  using PromiseResultTraits5 = Traits<PromiseResult5>;
+  using NextFactory5 =
+      OncePromiseFactory<typename PromiseResultTraits5::UnwrappedType, F5>;
+  using Promise6 = typename NextFactory5::Promise;
+  using PromiseResult6 = typename Promise6::Result;
+  using PromiseResultTraits6 = Traits<PromiseResult6>;
+  using NextFactory6 =
+      OncePromiseFactory<typename PromiseResultTraits6::UnwrappedType, F6>;
+  using Promise7 = typename NextFactory6::Promise;
+  using PromiseResult7 = typename Promise7::Result;
+  using PromiseResultTraits7 = Traits<PromiseResult7>;
+  using NextFactory7 =
+      OncePromiseFactory<typename PromiseResultTraits7::UnwrappedType, F7>;
+  using Promise8 = typename NextFactory7::Promise;
+  using PromiseResult8 = typename Promise8::Result;
+  using PromiseResultTraits8 = Traits<PromiseResult8>;
+  using NextFactory8 =
+      OncePromiseFactory<typename PromiseResultTraits8::UnwrappedType, F8>;
+  using Promise9 = typename NextFactory8::Promise;
+  using PromiseResult9 = typename Promise9::Result;
+  using PromiseResultTraits9 = Traits<PromiseResult9>;
+  using Result = typename PromiseResultTraits9::WrappedType;
+  struct Running0 {
+    GPR_NO_UNIQUE_ADDRESS Promise0 current_promise;
+    GPR_NO_UNIQUE_ADDRESS NextFactory0 next_factory;
+  };
+  struct Running1 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running0 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise1 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory1 next_factory;
+  };
+  struct Running2 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running1 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise2 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory2 next_factory;
+  };
+  struct Running3 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running2 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise3 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory3 next_factory;
+  };
+  struct Running4 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running3 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise4 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory4 next_factory;
+  };
+  struct Running5 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running4 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise5 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory5 next_factory;
+  };
+  struct Running6 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running5 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise6 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory6 next_factory;
+  };
+  struct Running7 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running6 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise7 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory7 next_factory;
+  };
+  struct Running8 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running7 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise8 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory8 next_factory;
+  };
+  union {
+    GPR_NO_UNIQUE_ADDRESS Running8 prior;
+    GPR_NO_UNIQUE_ADDRESS Promise9 current_promise;
+  };
+  enum class State : uint8_t {
+    kState0,
+    kState1,
+    kState2,
+    kState3,
+    kState4,
+    kState5,
+    kState6,
+    kState7,
+    kState8,
+    kState9
+  };
+  GPR_NO_UNIQUE_ADDRESS State state = State::kState0;
+  GPR_NO_UNIQUE_ADDRESS DebugLocation whence;
+
+  SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6,
+           F7&& f7, F8&& f8, DebugLocation whence) noexcept
+      : whence(whence) {
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.current_promise,
+        std::forward<P>(p));
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        std::forward<F0>(f0));
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+              std::forward<F1>(f1));
+    Construct(&prior.prior.prior.prior.prior.prior.prior.next_factory,
+              std::forward<F2>(f2));
+    Construct(&prior.prior.prior.prior.prior.prior.next_factory,
+              std::forward<F3>(f3));
+    Construct(&prior.prior.prior.prior.prior.next_factory,
+              std::forward<F4>(f4));
+    Construct(&prior.prior.prior.prior.next_factory, std::forward<F5>(f5));
+    Construct(&prior.prior.prior.next_factory, std::forward<F6>(f6));
+    Construct(&prior.prior.next_factory, std::forward<F7>(f7));
+    Construct(&prior.next_factory, std::forward<F8>(f8));
+  }
+  ~SeqState() {
+    switch (state) {
+      case State::kState0:
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .current_promise);
+        goto tail0;
+      case State::kState1:
+        Destruct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise);
+        goto tail1;
+      case State::kState2:
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.current_promise);
+        goto tail2;
+      case State::kState3:
+        Destruct(&prior.prior.prior.prior.prior.prior.current_promise);
+        goto tail3;
+      case State::kState4:
+        Destruct(&prior.prior.prior.prior.prior.current_promise);
+        goto tail4;
+      case State::kState5:
+        Destruct(&prior.prior.prior.prior.current_promise);
+        goto tail5;
+      case State::kState6:
+        Destruct(&prior.prior.prior.current_promise);
+        goto tail6;
+      case State::kState7:
+        Destruct(&prior.prior.current_promise);
+        goto tail7;
+      case State::kState8:
+        Destruct(&prior.current_promise);
+        goto tail8;
+      case State::kState9:
+        Destruct(&current_promise);
+        return;
+    }
+  tail0:
+    Destruct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+  tail1:
+    Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+  tail2:
+    Destruct(&prior.prior.prior.prior.prior.prior.prior.next_factory);
+  tail3:
+    Destruct(&prior.prior.prior.prior.prior.prior.next_factory);
+  tail4:
+    Destruct(&prior.prior.prior.prior.prior.next_factory);
+  tail5:
+    Destruct(&prior.prior.prior.prior.next_factory);
+  tail6:
+    Destruct(&prior.prior.prior.next_factory);
+  tail7:
+    Destruct(&prior.prior.next_factory);
+  tail8:
+    Destruct(&prior.next_factory);
+  }
+  SeqState(const SeqState& other) noexcept
+      : state(other.state), whence(other.whence) {
+    GPR_ASSERT(state == State::kState0);
+    Construct(&prior.current_promise, other.prior.current_promise);
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        other.prior.prior.prior.prior.prior.prior.prior.prior.prior
+            .next_factory);
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        other.prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.next_factory,
+              other.prior.prior.prior.next_factory);
+    Construct(&prior.prior.next_factory, other.prior.prior.next_factory);
+    Construct(&prior.next_factory, other.prior.next_factory);
+  }
+  SeqState& operator=(const SeqState& other) = delete;
+  SeqState(SeqState&& other) noexcept
+      : state(other.state), whence(other.whence) {
+    switch (state) {
+      case State::kState0:
+        Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                       .current_promise,
+                  std::move(other.prior.prior.prior.prior.prior.prior.prior
+                                .prior.prior.current_promise));
+        goto tail0;
+      case State::kState1:
+        Construct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise,
+            std::move(other.prior.prior.prior.prior.prior.prior.prior.prior
+                          .current_promise));
+        goto tail1;
+      case State::kState2:
+        Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise,
+                  std::move(other.prior.prior.prior.prior.prior.prior.prior
+                                .current_promise));
+        goto tail2;
+      case State::kState3:
+        Construct(
+            &prior.prior.prior.prior.prior.prior.current_promise,
+            std::move(
+                other.prior.prior.prior.prior.prior.prior.current_promise));
+        goto tail3;
+      case State::kState4:
+        Construct(
+            &prior.prior.prior.prior.prior.current_promise,
+            std::move(other.prior.prior.prior.prior.prior.current_promise));
+        goto tail4;
+      case State::kState5:
+        Construct(&prior.prior.prior.prior.current_promise,
+                  std::move(other.prior.prior.prior.prior.current_promise));
+        goto tail5;
+      case State::kState6:
+        Construct(&prior.prior.prior.current_promise,
+                  std::move(other.prior.prior.prior.current_promise));
+        goto tail6;
+      case State::kState7:
+        Construct(&prior.prior.current_promise,
+                  std::move(other.prior.prior.current_promise));
+        goto tail7;
+      case State::kState8:
+        Construct(&prior.current_promise,
+                  std::move(other.prior.current_promise));
+        goto tail8;
+      case State::kState9:
+        Construct(&current_promise, std::move(other.current_promise));
+        return;
+    }
+  tail0:
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        std::move(other.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .next_factory));
+  tail1:
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.prior.prior.prior.prior.prior
+                            .next_factory));
+  tail2:
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.next_factory,
+        std::move(
+            other.prior.prior.prior.prior.prior.prior.prior.next_factory));
+  tail3:
+    Construct(
+        &prior.prior.prior.prior.prior.prior.next_factory,
+        std::move(other.prior.prior.prior.prior.prior.prior.next_factory));
+  tail4:
+    Construct(&prior.prior.prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.prior.prior.next_factory));
+  tail5:
+    Construct(&prior.prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.prior.next_factory));
+  tail6:
+    Construct(&prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.next_factory));
+  tail7:
+    Construct(&prior.prior.next_factory,
+              std::move(other.prior.prior.next_factory));
+  tail8:
+    Construct(&prior.next_factory, std::move(other.prior.next_factory));
+  }
+  SeqState& operator=(SeqState&& other) = delete;
+  Poll<Result> PollOnce() {
+    switch (state) {
+      case State::kState0: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 1/10", this);
+        }
+        auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior
+                          .current_promise();
+        PromiseResult0* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 1/10 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits0::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits0::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits0::IsOk(*p)) {
+          return PromiseResultTraits0::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .current_promise);
+        auto next_promise = PromiseResultTraits0::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .next_factory);
+        Construct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise,
+            std::move(next_promise));
+        state = State::kState1;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState1: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 2/10", this);
+        }
+        auto result =
+            prior.prior.prior.prior.prior.prior.prior.prior.current_promise();
+        PromiseResult1* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 2/10 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits1::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits1::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits1::IsOk(*p)) {
+          return PromiseResultTraits1::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits1::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState2;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState2: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 3/10", this);
+        }
+        auto result =
+            prior.prior.prior.prior.prior.prior.prior.current_promise();
+        PromiseResult2* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 3/10 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits2::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits2::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits2::IsOk(*p)) {
+          return PromiseResultTraits2::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits2::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState3;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState3: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 4/10", this);
+        }
+        auto result = prior.prior.prior.prior.prior.prior.current_promise();
+        PromiseResult3* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 4/10 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits3::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits3::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits3::IsOk(*p)) {
+          return PromiseResultTraits3::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits3::CallFactory(
+            &prior.prior.prior.prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState4;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState4: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 5/10", this);
+        }
+        auto result = prior.prior.prior.prior.prior.current_promise();
+        PromiseResult4* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 5/10 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits4::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits4::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits4::IsOk(*p)) {
+          return PromiseResultTraits4::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits4::CallFactory(
+            &prior.prior.prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState5;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState5: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 6/10", this);
+        }
+        auto result = prior.prior.prior.prior.current_promise();
+        PromiseResult5* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 6/10 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits5::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits5::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits5::IsOk(*p)) {
+          return PromiseResultTraits5::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits5::CallFactory(
+            &prior.prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.current_promise, std::move(next_promise));
+        state = State::kState6;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState6: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 7/10", this);
+        }
+        auto result = prior.prior.prior.current_promise();
+        PromiseResult6* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 7/10 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits6::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits6::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits6::IsOk(*p)) {
+          return PromiseResultTraits6::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits6::CallFactory(
+            &prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.next_factory);
+        Construct(&prior.prior.current_promise, std::move(next_promise));
+        state = State::kState7;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState7: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 8/10", this);
+        }
+        auto result = prior.prior.current_promise();
+        PromiseResult7* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 8/10 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits7::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits7::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits7::IsOk(*p)) {
+          return PromiseResultTraits7::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits7::CallFactory(
+            &prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.next_factory);
+        Construct(&prior.current_promise, std::move(next_promise));
+        state = State::kState8;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState8: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 9/10", this);
+        }
+        auto result = prior.current_promise();
+        PromiseResult8* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 9/10 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits8::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits8::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits8::IsOk(*p)) {
+          return PromiseResultTraits8::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.current_promise);
+        auto next_promise = PromiseResultTraits8::CallFactory(
+            &prior.next_factory, std::move(*p));
+        Destruct(&prior.next_factory);
+        Construct(&current_promise, std::move(next_promise));
+        state = State::kState9;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      default:
+      case State::kState9: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 10/10", this);
+        }
+        auto result = current_promise();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: poll step 10/10 gets %s", this,
+                  result.ready() ? "ready" : "pending");
+        }
+        auto* p = result.value_if_ready();
+        if (p == nullptr) return Pending{};
+        return Result(std::move(*p));
+      }
+    }
+  }
+};
+
+template <template <typename> class Traits, typename P, typename F0,
+          typename F1, typename F2, typename F3, typename F4, typename F5,
+          typename F6, typename F7, typename F8, typename F9>
+struct SeqState<Traits, P, F0, F1, F2, F3, F4, F5, F6, F7, F8, F9> {
+  using Promise0 = PromiseLike<P>;
+  using PromiseResult0 = typename Promise0::Result;
+  using PromiseResultTraits0 = Traits<PromiseResult0>;
+  using NextFactory0 =
+      OncePromiseFactory<typename PromiseResultTraits0::UnwrappedType, F0>;
+  using Promise1 = typename NextFactory0::Promise;
+  using PromiseResult1 = typename Promise1::Result;
+  using PromiseResultTraits1 = Traits<PromiseResult1>;
+  using NextFactory1 =
+      OncePromiseFactory<typename PromiseResultTraits1::UnwrappedType, F1>;
+  using Promise2 = typename NextFactory1::Promise;
+  using PromiseResult2 = typename Promise2::Result;
+  using PromiseResultTraits2 = Traits<PromiseResult2>;
+  using NextFactory2 =
+      OncePromiseFactory<typename PromiseResultTraits2::UnwrappedType, F2>;
+  using Promise3 = typename NextFactory2::Promise;
+  using PromiseResult3 = typename Promise3::Result;
+  using PromiseResultTraits3 = Traits<PromiseResult3>;
+  using NextFactory3 =
+      OncePromiseFactory<typename PromiseResultTraits3::UnwrappedType, F3>;
+  using Promise4 = typename NextFactory3::Promise;
+  using PromiseResult4 = typename Promise4::Result;
+  using PromiseResultTraits4 = Traits<PromiseResult4>;
+  using NextFactory4 =
+      OncePromiseFactory<typename PromiseResultTraits4::UnwrappedType, F4>;
+  using Promise5 = typename NextFactory4::Promise;
+  using PromiseResult5 = typename Promise5::Result;
+  using PromiseResultTraits5 = Traits<PromiseResult5>;
+  using NextFactory5 =
+      OncePromiseFactory<typename PromiseResultTraits5::UnwrappedType, F5>;
+  using Promise6 = typename NextFactory5::Promise;
+  using PromiseResult6 = typename Promise6::Result;
+  using PromiseResultTraits6 = Traits<PromiseResult6>;
+  using NextFactory6 =
+      OncePromiseFactory<typename PromiseResultTraits6::UnwrappedType, F6>;
+  using Promise7 = typename NextFactory6::Promise;
+  using PromiseResult7 = typename Promise7::Result;
+  using PromiseResultTraits7 = Traits<PromiseResult7>;
+  using NextFactory7 =
+      OncePromiseFactory<typename PromiseResultTraits7::UnwrappedType, F7>;
+  using Promise8 = typename NextFactory7::Promise;
+  using PromiseResult8 = typename Promise8::Result;
+  using PromiseResultTraits8 = Traits<PromiseResult8>;
+  using NextFactory8 =
+      OncePromiseFactory<typename PromiseResultTraits8::UnwrappedType, F8>;
+  using Promise9 = typename NextFactory8::Promise;
+  using PromiseResult9 = typename Promise9::Result;
+  using PromiseResultTraits9 = Traits<PromiseResult9>;
+  using NextFactory9 =
+      OncePromiseFactory<typename PromiseResultTraits9::UnwrappedType, F9>;
+  using Promise10 = typename NextFactory9::Promise;
+  using PromiseResult10 = typename Promise10::Result;
+  using PromiseResultTraits10 = Traits<PromiseResult10>;
+  using Result = typename PromiseResultTraits10::WrappedType;
+  struct Running0 {
+    GPR_NO_UNIQUE_ADDRESS Promise0 current_promise;
+    GPR_NO_UNIQUE_ADDRESS NextFactory0 next_factory;
+  };
+  struct Running1 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running0 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise1 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory1 next_factory;
+  };
+  struct Running2 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running1 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise2 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory2 next_factory;
+  };
+  struct Running3 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running2 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise3 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory3 next_factory;
+  };
+  struct Running4 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running3 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise4 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory4 next_factory;
+  };
+  struct Running5 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running4 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise5 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory5 next_factory;
+  };
+  struct Running6 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running5 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise6 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory6 next_factory;
+  };
+  struct Running7 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running6 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise7 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory7 next_factory;
+  };
+  struct Running8 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running7 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise8 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory8 next_factory;
+  };
+  struct Running9 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running8 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise9 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory9 next_factory;
+  };
+  union {
+    GPR_NO_UNIQUE_ADDRESS Running9 prior;
+    GPR_NO_UNIQUE_ADDRESS Promise10 current_promise;
+  };
+  enum class State : uint8_t {
+    kState0,
+    kState1,
+    kState2,
+    kState3,
+    kState4,
+    kState5,
+    kState6,
+    kState7,
+    kState8,
+    kState9,
+    kState10
+  };
+  GPR_NO_UNIQUE_ADDRESS State state = State::kState0;
+  GPR_NO_UNIQUE_ADDRESS DebugLocation whence;
+
+  SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6,
+           F7&& f7, F8&& f8, F9&& f9, DebugLocation whence) noexcept
+      : whence(whence) {
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .current_promise,
+              std::forward<P>(p));
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .next_factory,
+              std::forward<F0>(f0));
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        std::forward<F1>(f1));
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+              std::forward<F2>(f2));
+    Construct(&prior.prior.prior.prior.prior.prior.prior.next_factory,
+              std::forward<F3>(f3));
+    Construct(&prior.prior.prior.prior.prior.prior.next_factory,
+              std::forward<F4>(f4));
+    Construct(&prior.prior.prior.prior.prior.next_factory,
+              std::forward<F5>(f5));
+    Construct(&prior.prior.prior.prior.next_factory, std::forward<F6>(f6));
+    Construct(&prior.prior.prior.next_factory, std::forward<F7>(f7));
+    Construct(&prior.prior.next_factory, std::forward<F8>(f8));
+    Construct(&prior.next_factory, std::forward<F9>(f9));
+  }
+  ~SeqState() {
+    switch (state) {
+      case State::kState0:
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .current_promise);
+        goto tail0;
+      case State::kState1:
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .current_promise);
+        goto tail1;
+      case State::kState2:
+        Destruct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise);
+        goto tail2;
+      case State::kState3:
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.current_promise);
+        goto tail3;
+      case State::kState4:
+        Destruct(&prior.prior.prior.prior.prior.prior.current_promise);
+        goto tail4;
+      case State::kState5:
+        Destruct(&prior.prior.prior.prior.prior.current_promise);
+        goto tail5;
+      case State::kState6:
+        Destruct(&prior.prior.prior.prior.current_promise);
+        goto tail6;
+      case State::kState7:
+        Destruct(&prior.prior.prior.current_promise);
+        goto tail7;
+      case State::kState8:
+        Destruct(&prior.prior.current_promise);
+        goto tail8;
+      case State::kState9:
+        Destruct(&prior.current_promise);
+        goto tail9;
+      case State::kState10:
+        Destruct(&current_promise);
+        return;
+    }
+  tail0:
+    Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                  .next_factory);
+  tail1:
+    Destruct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+  tail2:
+    Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+  tail3:
+    Destruct(&prior.prior.prior.prior.prior.prior.prior.next_factory);
+  tail4:
+    Destruct(&prior.prior.prior.prior.prior.prior.next_factory);
+  tail5:
+    Destruct(&prior.prior.prior.prior.prior.next_factory);
+  tail6:
+    Destruct(&prior.prior.prior.prior.next_factory);
+  tail7:
+    Destruct(&prior.prior.prior.next_factory);
+  tail8:
+    Destruct(&prior.prior.next_factory);
+  tail9:
+    Destruct(&prior.next_factory);
+  }
+  SeqState(const SeqState& other) noexcept
+      : state(other.state), whence(other.whence) {
+    GPR_ASSERT(state == State::kState0);
+    Construct(&prior.current_promise, other.prior.current_promise);
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .next_factory,
+              other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                  .next_factory);
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        other.prior.prior.prior.prior.prior.prior.prior.prior.prior
+            .next_factory);
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        other.prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.next_factory,
+              other.prior.prior.prior.next_factory);
+    Construct(&prior.prior.next_factory, other.prior.prior.next_factory);
+    Construct(&prior.next_factory, other.prior.next_factory);
+  }
+  SeqState& operator=(const SeqState& other) = delete;
+  SeqState(SeqState&& other) noexcept
+      : state(other.state), whence(other.whence) {
+    switch (state) {
+      case State::kState0:
+        Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                       .current_promise,
+                  std::move(other.prior.prior.prior.prior.prior.prior.prior
+                                .prior.prior.prior.current_promise));
+        goto tail0;
+      case State::kState1:
+        Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                       .current_promise,
+                  std::move(other.prior.prior.prior.prior.prior.prior.prior
+                                .prior.prior.current_promise));
+        goto tail1;
+      case State::kState2:
+        Construct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise,
+            std::move(other.prior.prior.prior.prior.prior.prior.prior.prior
+                          .current_promise));
+        goto tail2;
+      case State::kState3:
+        Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise,
+                  std::move(other.prior.prior.prior.prior.prior.prior.prior
+                                .current_promise));
+        goto tail3;
+      case State::kState4:
+        Construct(
+            &prior.prior.prior.prior.prior.prior.current_promise,
+            std::move(
+                other.prior.prior.prior.prior.prior.prior.current_promise));
+        goto tail4;
+      case State::kState5:
+        Construct(
+            &prior.prior.prior.prior.prior.current_promise,
+            std::move(other.prior.prior.prior.prior.prior.current_promise));
+        goto tail5;
+      case State::kState6:
+        Construct(&prior.prior.prior.prior.current_promise,
+                  std::move(other.prior.prior.prior.prior.current_promise));
+        goto tail6;
+      case State::kState7:
+        Construct(&prior.prior.prior.current_promise,
+                  std::move(other.prior.prior.prior.current_promise));
+        goto tail7;
+      case State::kState8:
+        Construct(&prior.prior.current_promise,
+                  std::move(other.prior.prior.current_promise));
+        goto tail8;
+      case State::kState9:
+        Construct(&prior.current_promise,
+                  std::move(other.prior.current_promise));
+        goto tail9;
+      case State::kState10:
+        Construct(&current_promise, std::move(other.current_promise));
+        return;
+    }
+  tail0:
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .next_factory,
+              std::move(other.prior.prior.prior.prior.prior.prior.prior.prior
+                            .prior.prior.next_factory));
+  tail1:
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        std::move(other.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .next_factory));
+  tail2:
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.prior.prior.prior.prior.prior
+                            .next_factory));
+  tail3:
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.next_factory,
+        std::move(
+            other.prior.prior.prior.prior.prior.prior.prior.next_factory));
+  tail4:
+    Construct(
+        &prior.prior.prior.prior.prior.prior.next_factory,
+        std::move(other.prior.prior.prior.prior.prior.prior.next_factory));
+  tail5:
+    Construct(&prior.prior.prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.prior.prior.next_factory));
+  tail6:
+    Construct(&prior.prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.prior.next_factory));
+  tail7:
+    Construct(&prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.next_factory));
+  tail8:
+    Construct(&prior.prior.next_factory,
+              std::move(other.prior.prior.next_factory));
+  tail9:
+    Construct(&prior.next_factory, std::move(other.prior.next_factory));
+  }
+  SeqState& operator=(SeqState&& other) = delete;
+  Poll<Result> PollOnce() {
+    switch (state) {
+      case State::kState0: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 1/11", this);
+        }
+        auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior
+                          .prior.current_promise();
+        PromiseResult0* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 1/11 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits0::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits0::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits0::IsOk(*p)) {
+          return PromiseResultTraits0::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .current_promise);
+        auto next_promise = PromiseResultTraits0::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                 .next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .next_factory);
+        Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                       .current_promise,
+                  std::move(next_promise));
+        state = State::kState1;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState1: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 2/11", this);
+        }
+        auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior
+                          .current_promise();
+        PromiseResult1* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 2/11 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits1::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits1::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits1::IsOk(*p)) {
+          return PromiseResultTraits1::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .current_promise);
+        auto next_promise = PromiseResultTraits1::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .next_factory);
+        Construct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise,
+            std::move(next_promise));
+        state = State::kState2;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState2: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 3/11", this);
+        }
+        auto result =
+            prior.prior.prior.prior.prior.prior.prior.prior.current_promise();
+        PromiseResult2* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 3/11 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits2::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits2::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits2::IsOk(*p)) {
+          return PromiseResultTraits2::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits2::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState3;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState3: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 4/11", this);
+        }
+        auto result =
+            prior.prior.prior.prior.prior.prior.prior.current_promise();
+        PromiseResult3* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 4/11 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits3::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits3::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits3::IsOk(*p)) {
+          return PromiseResultTraits3::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits3::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState4;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState4: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 5/11", this);
+        }
+        auto result = prior.prior.prior.prior.prior.prior.current_promise();
+        PromiseResult4* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 5/11 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits4::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits4::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits4::IsOk(*p)) {
+          return PromiseResultTraits4::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits4::CallFactory(
+            &prior.prior.prior.prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState5;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState5: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 6/11", this);
+        }
+        auto result = prior.prior.prior.prior.prior.current_promise();
+        PromiseResult5* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 6/11 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits5::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits5::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits5::IsOk(*p)) {
+          return PromiseResultTraits5::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits5::CallFactory(
+            &prior.prior.prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState6;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState6: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 7/11", this);
+        }
+        auto result = prior.prior.prior.prior.current_promise();
+        PromiseResult6* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 7/11 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits6::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits6::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits6::IsOk(*p)) {
+          return PromiseResultTraits6::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits6::CallFactory(
+            &prior.prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.current_promise, std::move(next_promise));
+        state = State::kState7;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState7: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 8/11", this);
+        }
+        auto result = prior.prior.prior.current_promise();
+        PromiseResult7* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 8/11 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits7::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits7::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits7::IsOk(*p)) {
+          return PromiseResultTraits7::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits7::CallFactory(
+            &prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.next_factory);
+        Construct(&prior.prior.current_promise, std::move(next_promise));
+        state = State::kState8;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState8: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 9/11", this);
+        }
+        auto result = prior.prior.current_promise();
+        PromiseResult8* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 9/11 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits8::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits8::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits8::IsOk(*p)) {
+          return PromiseResultTraits8::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits8::CallFactory(
+            &prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.next_factory);
+        Construct(&prior.current_promise, std::move(next_promise));
+        state = State::kState9;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState9: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 10/11", this);
+        }
+        auto result = prior.current_promise();
+        PromiseResult9* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 10/11 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits9::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits9::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits9::IsOk(*p)) {
+          return PromiseResultTraits9::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.current_promise);
+        auto next_promise = PromiseResultTraits9::CallFactory(
+            &prior.next_factory, std::move(*p));
+        Destruct(&prior.next_factory);
+        Construct(&current_promise, std::move(next_promise));
+        state = State::kState10;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      default:
+      case State::kState10: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 11/11", this);
+        }
+        auto result = current_promise();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: poll step 11/11 gets %s", this,
+                  result.ready() ? "ready" : "pending");
+        }
+        auto* p = result.value_if_ready();
+        if (p == nullptr) return Pending{};
+        return Result(std::move(*p));
+      }
+    }
+  }
+};
+
+template <template <typename> class Traits, typename P, typename F0,
+          typename F1, typename F2, typename F3, typename F4, typename F5,
+          typename F6, typename F7, typename F8, typename F9, typename F10>
+struct SeqState<Traits, P, F0, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10> {
+  using Promise0 = PromiseLike<P>;
+  using PromiseResult0 = typename Promise0::Result;
+  using PromiseResultTraits0 = Traits<PromiseResult0>;
+  using NextFactory0 =
+      OncePromiseFactory<typename PromiseResultTraits0::UnwrappedType, F0>;
+  using Promise1 = typename NextFactory0::Promise;
+  using PromiseResult1 = typename Promise1::Result;
+  using PromiseResultTraits1 = Traits<PromiseResult1>;
+  using NextFactory1 =
+      OncePromiseFactory<typename PromiseResultTraits1::UnwrappedType, F1>;
+  using Promise2 = typename NextFactory1::Promise;
+  using PromiseResult2 = typename Promise2::Result;
+  using PromiseResultTraits2 = Traits<PromiseResult2>;
+  using NextFactory2 =
+      OncePromiseFactory<typename PromiseResultTraits2::UnwrappedType, F2>;
+  using Promise3 = typename NextFactory2::Promise;
+  using PromiseResult3 = typename Promise3::Result;
+  using PromiseResultTraits3 = Traits<PromiseResult3>;
+  using NextFactory3 =
+      OncePromiseFactory<typename PromiseResultTraits3::UnwrappedType, F3>;
+  using Promise4 = typename NextFactory3::Promise;
+  using PromiseResult4 = typename Promise4::Result;
+  using PromiseResultTraits4 = Traits<PromiseResult4>;
+  using NextFactory4 =
+      OncePromiseFactory<typename PromiseResultTraits4::UnwrappedType, F4>;
+  using Promise5 = typename NextFactory4::Promise;
+  using PromiseResult5 = typename Promise5::Result;
+  using PromiseResultTraits5 = Traits<PromiseResult5>;
+  using NextFactory5 =
+      OncePromiseFactory<typename PromiseResultTraits5::UnwrappedType, F5>;
+  using Promise6 = typename NextFactory5::Promise;
+  using PromiseResult6 = typename Promise6::Result;
+  using PromiseResultTraits6 = Traits<PromiseResult6>;
+  using NextFactory6 =
+      OncePromiseFactory<typename PromiseResultTraits6::UnwrappedType, F6>;
+  using Promise7 = typename NextFactory6::Promise;
+  using PromiseResult7 = typename Promise7::Result;
+  using PromiseResultTraits7 = Traits<PromiseResult7>;
+  using NextFactory7 =
+      OncePromiseFactory<typename PromiseResultTraits7::UnwrappedType, F7>;
+  using Promise8 = typename NextFactory7::Promise;
+  using PromiseResult8 = typename Promise8::Result;
+  using PromiseResultTraits8 = Traits<PromiseResult8>;
+  using NextFactory8 =
+      OncePromiseFactory<typename PromiseResultTraits8::UnwrappedType, F8>;
+  using Promise9 = typename NextFactory8::Promise;
+  using PromiseResult9 = typename Promise9::Result;
+  using PromiseResultTraits9 = Traits<PromiseResult9>;
+  using NextFactory9 =
+      OncePromiseFactory<typename PromiseResultTraits9::UnwrappedType, F9>;
+  using Promise10 = typename NextFactory9::Promise;
+  using PromiseResult10 = typename Promise10::Result;
+  using PromiseResultTraits10 = Traits<PromiseResult10>;
+  using NextFactory10 =
+      OncePromiseFactory<typename PromiseResultTraits10::UnwrappedType, F10>;
+  using Promise11 = typename NextFactory10::Promise;
+  using PromiseResult11 = typename Promise11::Result;
+  using PromiseResultTraits11 = Traits<PromiseResult11>;
+  using Result = typename PromiseResultTraits11::WrappedType;
+  struct Running0 {
+    GPR_NO_UNIQUE_ADDRESS Promise0 current_promise;
+    GPR_NO_UNIQUE_ADDRESS NextFactory0 next_factory;
+  };
+  struct Running1 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running0 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise1 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory1 next_factory;
+  };
+  struct Running2 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running1 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise2 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory2 next_factory;
+  };
+  struct Running3 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running2 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise3 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory3 next_factory;
+  };
+  struct Running4 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running3 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise4 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory4 next_factory;
+  };
+  struct Running5 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running4 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise5 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory5 next_factory;
+  };
+  struct Running6 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running5 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise6 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory6 next_factory;
+  };
+  struct Running7 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running6 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise7 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory7 next_factory;
+  };
+  struct Running8 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running7 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise8 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory8 next_factory;
+  };
+  struct Running9 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running8 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise9 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory9 next_factory;
+  };
+  struct Running10 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running9 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise10 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory10 next_factory;
+  };
+  union {
+    GPR_NO_UNIQUE_ADDRESS Running10 prior;
+    GPR_NO_UNIQUE_ADDRESS Promise11 current_promise;
+  };
+  enum class State : uint8_t {
+    kState0,
+    kState1,
+    kState2,
+    kState3,
+    kState4,
+    kState5,
+    kState6,
+    kState7,
+    kState8,
+    kState9,
+    kState10,
+    kState11
+  };
+  GPR_NO_UNIQUE_ADDRESS State state = State::kState0;
+  GPR_NO_UNIQUE_ADDRESS DebugLocation whence;
+
+  SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6,
+           F7&& f7, F8&& f8, F9&& f9, F10&& f10, DebugLocation whence) noexcept
+      : whence(whence) {
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .current_promise,
+              std::forward<P>(p));
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .next_factory,
+              std::forward<F0>(f0));
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .next_factory,
+              std::forward<F1>(f1));
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        std::forward<F2>(f2));
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+              std::forward<F3>(f3));
+    Construct(&prior.prior.prior.prior.prior.prior.prior.next_factory,
+              std::forward<F4>(f4));
+    Construct(&prior.prior.prior.prior.prior.prior.next_factory,
+              std::forward<F5>(f5));
+    Construct(&prior.prior.prior.prior.prior.next_factory,
+              std::forward<F6>(f6));
+    Construct(&prior.prior.prior.prior.next_factory, std::forward<F7>(f7));
+    Construct(&prior.prior.prior.next_factory, std::forward<F8>(f8));
+    Construct(&prior.prior.next_factory, std::forward<F9>(f9));
+    Construct(&prior.next_factory, std::forward<F10>(f10));
+  }
+  ~SeqState() {
+    switch (state) {
+      case State::kState0:
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .prior.current_promise);
+        goto tail0;
+      case State::kState1:
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .current_promise);
+        goto tail1;
+      case State::kState2:
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .current_promise);
+        goto tail2;
+      case State::kState3:
+        Destruct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise);
+        goto tail3;
+      case State::kState4:
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.current_promise);
+        goto tail4;
+      case State::kState5:
+        Destruct(&prior.prior.prior.prior.prior.prior.current_promise);
+        goto tail5;
+      case State::kState6:
+        Destruct(&prior.prior.prior.prior.prior.current_promise);
+        goto tail6;
+      case State::kState7:
+        Destruct(&prior.prior.prior.prior.current_promise);
+        goto tail7;
+      case State::kState8:
+        Destruct(&prior.prior.prior.current_promise);
+        goto tail8;
+      case State::kState9:
+        Destruct(&prior.prior.current_promise);
+        goto tail9;
+      case State::kState10:
+        Destruct(&prior.current_promise);
+        goto tail10;
+      case State::kState11:
+        Destruct(&current_promise);
+        return;
+    }
+  tail0:
+    Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                  .next_factory);
+  tail1:
+    Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                  .next_factory);
+  tail2:
+    Destruct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+  tail3:
+    Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+  tail4:
+    Destruct(&prior.prior.prior.prior.prior.prior.prior.next_factory);
+  tail5:
+    Destruct(&prior.prior.prior.prior.prior.prior.next_factory);
+  tail6:
+    Destruct(&prior.prior.prior.prior.prior.next_factory);
+  tail7:
+    Destruct(&prior.prior.prior.prior.next_factory);
+  tail8:
+    Destruct(&prior.prior.prior.next_factory);
+  tail9:
+    Destruct(&prior.prior.next_factory);
+  tail10:
+    Destruct(&prior.next_factory);
+  }
+  SeqState(const SeqState& other) noexcept
+      : state(other.state), whence(other.whence) {
+    GPR_ASSERT(state == State::kState0);
+    Construct(&prior.current_promise, other.prior.current_promise);
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .next_factory,
+              other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                  .prior.next_factory);
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .next_factory,
+              other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                  .next_factory);
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        other.prior.prior.prior.prior.prior.prior.prior.prior.prior
+            .next_factory);
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        other.prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.next_factory,
+              other.prior.prior.prior.next_factory);
+    Construct(&prior.prior.next_factory, other.prior.prior.next_factory);
+    Construct(&prior.next_factory, other.prior.next_factory);
+  }
+  SeqState& operator=(const SeqState& other) = delete;
+  SeqState(SeqState&& other) noexcept
+      : state(other.state), whence(other.whence) {
+    switch (state) {
+      case State::kState0:
+        Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                       .prior.current_promise,
+                  std::move(other.prior.prior.prior.prior.prior.prior.prior
+                                .prior.prior.prior.prior.current_promise));
+        goto tail0;
+      case State::kState1:
+        Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                       .current_promise,
+                  std::move(other.prior.prior.prior.prior.prior.prior.prior
+                                .prior.prior.prior.current_promise));
+        goto tail1;
+      case State::kState2:
+        Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                       .current_promise,
+                  std::move(other.prior.prior.prior.prior.prior.prior.prior
+                                .prior.prior.current_promise));
+        goto tail2;
+      case State::kState3:
+        Construct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise,
+            std::move(other.prior.prior.prior.prior.prior.prior.prior.prior
+                          .current_promise));
+        goto tail3;
+      case State::kState4:
+        Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise,
+                  std::move(other.prior.prior.prior.prior.prior.prior.prior
+                                .current_promise));
+        goto tail4;
+      case State::kState5:
+        Construct(
+            &prior.prior.prior.prior.prior.prior.current_promise,
+            std::move(
+                other.prior.prior.prior.prior.prior.prior.current_promise));
+        goto tail5;
+      case State::kState6:
+        Construct(
+            &prior.prior.prior.prior.prior.current_promise,
+            std::move(other.prior.prior.prior.prior.prior.current_promise));
+        goto tail6;
+      case State::kState7:
+        Construct(&prior.prior.prior.prior.current_promise,
+                  std::move(other.prior.prior.prior.prior.current_promise));
+        goto tail7;
+      case State::kState8:
+        Construct(&prior.prior.prior.current_promise,
+                  std::move(other.prior.prior.prior.current_promise));
+        goto tail8;
+      case State::kState9:
+        Construct(&prior.prior.current_promise,
+                  std::move(other.prior.prior.current_promise));
+        goto tail9;
+      case State::kState10:
+        Construct(&prior.current_promise,
+                  std::move(other.prior.current_promise));
+        goto tail10;
+      case State::kState11:
+        Construct(&current_promise, std::move(other.current_promise));
+        return;
+    }
+  tail0:
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .next_factory,
+              std::move(other.prior.prior.prior.prior.prior.prior.prior.prior
+                            .prior.prior.prior.next_factory));
+  tail1:
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .next_factory,
+              std::move(other.prior.prior.prior.prior.prior.prior.prior.prior
+                            .prior.prior.next_factory));
+  tail2:
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        std::move(other.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .next_factory));
+  tail3:
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.prior.prior.prior.prior.prior
+                            .next_factory));
+  tail4:
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.next_factory,
+        std::move(
+            other.prior.prior.prior.prior.prior.prior.prior.next_factory));
+  tail5:
+    Construct(
+        &prior.prior.prior.prior.prior.prior.next_factory,
+        std::move(other.prior.prior.prior.prior.prior.prior.next_factory));
+  tail6:
+    Construct(&prior.prior.prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.prior.prior.next_factory));
+  tail7:
+    Construct(&prior.prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.prior.next_factory));
+  tail8:
+    Construct(&prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.next_factory));
+  tail9:
+    Construct(&prior.prior.next_factory,
+              std::move(other.prior.prior.next_factory));
+  tail10:
+    Construct(&prior.next_factory, std::move(other.prior.next_factory));
+  }
+  SeqState& operator=(SeqState&& other) = delete;
+  Poll<Result> PollOnce() {
+    switch (state) {
+      case State::kState0: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 1/12", this);
+        }
+        auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior
+                          .prior.prior.current_promise();
+        PromiseResult0* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 1/12 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits0::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits0::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits0::IsOk(*p)) {
+          return PromiseResultTraits0::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .prior.current_promise);
+        auto next_promise = PromiseResultTraits0::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                 .next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .prior.next_factory);
+        Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                       .current_promise,
+                  std::move(next_promise));
+        state = State::kState1;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState1: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 2/12", this);
+        }
+        auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior
+                          .prior.current_promise();
+        PromiseResult1* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 2/12 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits1::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits1::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits1::IsOk(*p)) {
+          return PromiseResultTraits1::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .current_promise);
+        auto next_promise = PromiseResultTraits1::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                 .next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .next_factory);
+        Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                       .current_promise,
+                  std::move(next_promise));
+        state = State::kState2;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState2: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 3/12", this);
+        }
+        auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior
+                          .current_promise();
+        PromiseResult2* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 3/12 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits2::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits2::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits2::IsOk(*p)) {
+          return PromiseResultTraits2::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .current_promise);
+        auto next_promise = PromiseResultTraits2::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .next_factory);
+        Construct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise,
+            std::move(next_promise));
+        state = State::kState3;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState3: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 4/12", this);
+        }
+        auto result =
+            prior.prior.prior.prior.prior.prior.prior.prior.current_promise();
+        PromiseResult3* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 4/12 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits3::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits3::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits3::IsOk(*p)) {
+          return PromiseResultTraits3::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits3::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState4;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState4: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 5/12", this);
+        }
+        auto result =
+            prior.prior.prior.prior.prior.prior.prior.current_promise();
+        PromiseResult4* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 5/12 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits4::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits4::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits4::IsOk(*p)) {
+          return PromiseResultTraits4::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits4::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState5;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState5: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 6/12", this);
+        }
+        auto result = prior.prior.prior.prior.prior.prior.current_promise();
+        PromiseResult5* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 6/12 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits5::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits5::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits5::IsOk(*p)) {
+          return PromiseResultTraits5::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits5::CallFactory(
+            &prior.prior.prior.prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState6;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState6: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 7/12", this);
+        }
+        auto result = prior.prior.prior.prior.prior.current_promise();
+        PromiseResult6* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 7/12 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits6::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits6::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits6::IsOk(*p)) {
+          return PromiseResultTraits6::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits6::CallFactory(
+            &prior.prior.prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState7;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState7: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 8/12", this);
+        }
+        auto result = prior.prior.prior.prior.current_promise();
+        PromiseResult7* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 8/12 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits7::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits7::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits7::IsOk(*p)) {
+          return PromiseResultTraits7::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits7::CallFactory(
+            &prior.prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.current_promise, std::move(next_promise));
+        state = State::kState8;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState8: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 9/12", this);
+        }
+        auto result = prior.prior.prior.current_promise();
+        PromiseResult8* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 9/12 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits8::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits8::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits8::IsOk(*p)) {
+          return PromiseResultTraits8::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits8::CallFactory(
+            &prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.next_factory);
+        Construct(&prior.prior.current_promise, std::move(next_promise));
+        state = State::kState9;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState9: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 10/12", this);
+        }
+        auto result = prior.prior.current_promise();
+        PromiseResult9* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 10/12 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits9::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits9::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits9::IsOk(*p)) {
+          return PromiseResultTraits9::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits9::CallFactory(
+            &prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.next_factory);
+        Construct(&prior.current_promise, std::move(next_promise));
+        state = State::kState10;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState10: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 11/12", this);
+        }
+        auto result = prior.current_promise();
+        PromiseResult10* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 11/12 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits10::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits10::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits10::IsOk(*p)) {
+          return PromiseResultTraits10::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.current_promise);
+        auto next_promise = PromiseResultTraits10::CallFactory(
+            &prior.next_factory, std::move(*p));
+        Destruct(&prior.next_factory);
+        Construct(&current_promise, std::move(next_promise));
+        state = State::kState11;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      default:
+      case State::kState11: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 12/12", this);
+        }
+        auto result = current_promise();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: poll step 12/12 gets %s", this,
+                  result.ready() ? "ready" : "pending");
+        }
+        auto* p = result.value_if_ready();
+        if (p == nullptr) return Pending{};
+        return Result(std::move(*p));
+      }
+    }
+  }
+};
+
+template <template <typename> class Traits, typename P, typename F0,
+          typename F1, typename F2, typename F3, typename F4, typename F5,
+          typename F6, typename F7, typename F8, typename F9, typename F10,
+          typename F11>
+struct SeqState<Traits, P, F0, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11> {
+  using Promise0 = PromiseLike<P>;
+  using PromiseResult0 = typename Promise0::Result;
+  using PromiseResultTraits0 = Traits<PromiseResult0>;
+  using NextFactory0 =
+      OncePromiseFactory<typename PromiseResultTraits0::UnwrappedType, F0>;
+  using Promise1 = typename NextFactory0::Promise;
+  using PromiseResult1 = typename Promise1::Result;
+  using PromiseResultTraits1 = Traits<PromiseResult1>;
+  using NextFactory1 =
+      OncePromiseFactory<typename PromiseResultTraits1::UnwrappedType, F1>;
+  using Promise2 = typename NextFactory1::Promise;
+  using PromiseResult2 = typename Promise2::Result;
+  using PromiseResultTraits2 = Traits<PromiseResult2>;
+  using NextFactory2 =
+      OncePromiseFactory<typename PromiseResultTraits2::UnwrappedType, F2>;
+  using Promise3 = typename NextFactory2::Promise;
+  using PromiseResult3 = typename Promise3::Result;
+  using PromiseResultTraits3 = Traits<PromiseResult3>;
+  using NextFactory3 =
+      OncePromiseFactory<typename PromiseResultTraits3::UnwrappedType, F3>;
+  using Promise4 = typename NextFactory3::Promise;
+  using PromiseResult4 = typename Promise4::Result;
+  using PromiseResultTraits4 = Traits<PromiseResult4>;
+  using NextFactory4 =
+      OncePromiseFactory<typename PromiseResultTraits4::UnwrappedType, F4>;
+  using Promise5 = typename NextFactory4::Promise;
+  using PromiseResult5 = typename Promise5::Result;
+  using PromiseResultTraits5 = Traits<PromiseResult5>;
+  using NextFactory5 =
+      OncePromiseFactory<typename PromiseResultTraits5::UnwrappedType, F5>;
+  using Promise6 = typename NextFactory5::Promise;
+  using PromiseResult6 = typename Promise6::Result;
+  using PromiseResultTraits6 = Traits<PromiseResult6>;
+  using NextFactory6 =
+      OncePromiseFactory<typename PromiseResultTraits6::UnwrappedType, F6>;
+  using Promise7 = typename NextFactory6::Promise;
+  using PromiseResult7 = typename Promise7::Result;
+  using PromiseResultTraits7 = Traits<PromiseResult7>;
+  using NextFactory7 =
+      OncePromiseFactory<typename PromiseResultTraits7::UnwrappedType, F7>;
+  using Promise8 = typename NextFactory7::Promise;
+  using PromiseResult8 = typename Promise8::Result;
+  using PromiseResultTraits8 = Traits<PromiseResult8>;
+  using NextFactory8 =
+      OncePromiseFactory<typename PromiseResultTraits8::UnwrappedType, F8>;
+  using Promise9 = typename NextFactory8::Promise;
+  using PromiseResult9 = typename Promise9::Result;
+  using PromiseResultTraits9 = Traits<PromiseResult9>;
+  using NextFactory9 =
+      OncePromiseFactory<typename PromiseResultTraits9::UnwrappedType, F9>;
+  using Promise10 = typename NextFactory9::Promise;
+  using PromiseResult10 = typename Promise10::Result;
+  using PromiseResultTraits10 = Traits<PromiseResult10>;
+  using NextFactory10 =
+      OncePromiseFactory<typename PromiseResultTraits10::UnwrappedType, F10>;
+  using Promise11 = typename NextFactory10::Promise;
+  using PromiseResult11 = typename Promise11::Result;
+  using PromiseResultTraits11 = Traits<PromiseResult11>;
+  using NextFactory11 =
+      OncePromiseFactory<typename PromiseResultTraits11::UnwrappedType, F11>;
+  using Promise12 = typename NextFactory11::Promise;
+  using PromiseResult12 = typename Promise12::Result;
+  using PromiseResultTraits12 = Traits<PromiseResult12>;
+  using Result = typename PromiseResultTraits12::WrappedType;
+  struct Running0 {
+    GPR_NO_UNIQUE_ADDRESS Promise0 current_promise;
+    GPR_NO_UNIQUE_ADDRESS NextFactory0 next_factory;
+  };
+  struct Running1 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running0 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise1 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory1 next_factory;
+  };
+  struct Running2 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running1 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise2 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory2 next_factory;
+  };
+  struct Running3 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running2 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise3 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory3 next_factory;
+  };
+  struct Running4 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running3 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise4 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory4 next_factory;
+  };
+  struct Running5 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running4 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise5 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory5 next_factory;
+  };
+  struct Running6 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running5 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise6 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory6 next_factory;
+  };
+  struct Running7 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running6 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise7 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory7 next_factory;
+  };
+  struct Running8 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running7 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise8 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory8 next_factory;
+  };
+  struct Running9 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running8 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise9 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory9 next_factory;
+  };
+  struct Running10 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running9 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise10 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory10 next_factory;
+  };
+  struct Running11 {
+    union {
+      GPR_NO_UNIQUE_ADDRESS Running10 prior;
+      GPR_NO_UNIQUE_ADDRESS Promise11 current_promise;
+    };
+    GPR_NO_UNIQUE_ADDRESS NextFactory11 next_factory;
+  };
+  union {
+    GPR_NO_UNIQUE_ADDRESS Running11 prior;
+    GPR_NO_UNIQUE_ADDRESS Promise12 current_promise;
+  };
+  enum class State : uint8_t {
+    kState0,
+    kState1,
+    kState2,
+    kState3,
+    kState4,
+    kState5,
+    kState6,
+    kState7,
+    kState8,
+    kState9,
+    kState10,
+    kState11,
+    kState12
+  };
+  GPR_NO_UNIQUE_ADDRESS State state = State::kState0;
+  GPR_NO_UNIQUE_ADDRESS DebugLocation whence;
+
+  SeqState(P&& p, F0&& f0, F1&& f1, F2&& f2, F3&& f3, F4&& f4, F5&& f5, F6&& f6,
+           F7&& f7, F8&& f8, F9&& f9, F10&& f10, F11&& f11,
+           DebugLocation whence) noexcept
+      : whence(whence) {
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .prior.current_promise,
+              std::forward<P>(p));
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .prior.next_factory,
+              std::forward<F0>(f0));
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .next_factory,
+              std::forward<F1>(f1));
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .next_factory,
+              std::forward<F2>(f2));
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        std::forward<F3>(f3));
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+              std::forward<F4>(f4));
+    Construct(&prior.prior.prior.prior.prior.prior.prior.next_factory,
+              std::forward<F5>(f5));
+    Construct(&prior.prior.prior.prior.prior.prior.next_factory,
+              std::forward<F6>(f6));
+    Construct(&prior.prior.prior.prior.prior.next_factory,
+              std::forward<F7>(f7));
+    Construct(&prior.prior.prior.prior.next_factory, std::forward<F8>(f8));
+    Construct(&prior.prior.prior.next_factory, std::forward<F9>(f9));
+    Construct(&prior.prior.next_factory, std::forward<F10>(f10));
+    Construct(&prior.next_factory, std::forward<F11>(f11));
+  }
+  ~SeqState() {
+    switch (state) {
+      case State::kState0:
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .prior.prior.current_promise);
+        goto tail0;
+      case State::kState1:
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .prior.current_promise);
+        goto tail1;
+      case State::kState2:
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .current_promise);
+        goto tail2;
+      case State::kState3:
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .current_promise);
+        goto tail3;
+      case State::kState4:
+        Destruct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise);
+        goto tail4;
+      case State::kState5:
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.current_promise);
+        goto tail5;
+      case State::kState6:
+        Destruct(&prior.prior.prior.prior.prior.prior.current_promise);
+        goto tail6;
+      case State::kState7:
+        Destruct(&prior.prior.prior.prior.prior.current_promise);
+        goto tail7;
+      case State::kState8:
+        Destruct(&prior.prior.prior.prior.current_promise);
+        goto tail8;
+      case State::kState9:
+        Destruct(&prior.prior.prior.current_promise);
+        goto tail9;
+      case State::kState10:
+        Destruct(&prior.prior.current_promise);
+        goto tail10;
+      case State::kState11:
+        Destruct(&prior.current_promise);
+        goto tail11;
+      case State::kState12:
+        Destruct(&current_promise);
+        return;
+    }
+  tail0:
+    Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                  .prior.next_factory);
+  tail1:
+    Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                  .next_factory);
+  tail2:
+    Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                  .next_factory);
+  tail3:
+    Destruct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+  tail4:
+    Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+  tail5:
+    Destruct(&prior.prior.prior.prior.prior.prior.prior.next_factory);
+  tail6:
+    Destruct(&prior.prior.prior.prior.prior.prior.next_factory);
+  tail7:
+    Destruct(&prior.prior.prior.prior.prior.next_factory);
+  tail8:
+    Destruct(&prior.prior.prior.prior.next_factory);
+  tail9:
+    Destruct(&prior.prior.prior.next_factory);
+  tail10:
+    Destruct(&prior.prior.next_factory);
+  tail11:
+    Destruct(&prior.next_factory);
+  }
+  SeqState(const SeqState& other) noexcept
+      : state(other.state), whence(other.whence) {
+    GPR_ASSERT(state == State::kState0);
+    Construct(&prior.current_promise, other.prior.current_promise);
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .prior.next_factory,
+              other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                  .prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .next_factory,
+              other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                  .prior.next_factory);
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .next_factory,
+              other.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                  .next_factory);
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        other.prior.prior.prior.prior.prior.prior.prior.prior.prior
+            .next_factory);
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        other.prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.prior.next_factory,
+              other.prior.prior.prior.prior.next_factory);
+    Construct(&prior.prior.prior.next_factory,
+              other.prior.prior.prior.next_factory);
+    Construct(&prior.prior.next_factory, other.prior.prior.next_factory);
+    Construct(&prior.next_factory, other.prior.next_factory);
+  }
+  SeqState& operator=(const SeqState& other) = delete;
+  SeqState(SeqState&& other) noexcept
+      : state(other.state), whence(other.whence) {
+    switch (state) {
+      case State::kState0:
+        Construct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                 .prior.current_promise,
+            std::move(other.prior.prior.prior.prior.prior.prior.prior.prior
+                          .prior.prior.prior.prior.current_promise));
+        goto tail0;
+      case State::kState1:
+        Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                       .prior.current_promise,
+                  std::move(other.prior.prior.prior.prior.prior.prior.prior
+                                .prior.prior.prior.prior.current_promise));
+        goto tail1;
+      case State::kState2:
+        Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                       .current_promise,
+                  std::move(other.prior.prior.prior.prior.prior.prior.prior
+                                .prior.prior.prior.current_promise));
+        goto tail2;
+      case State::kState3:
+        Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                       .current_promise,
+                  std::move(other.prior.prior.prior.prior.prior.prior.prior
+                                .prior.prior.current_promise));
+        goto tail3;
+      case State::kState4:
+        Construct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise,
+            std::move(other.prior.prior.prior.prior.prior.prior.prior.prior
+                          .current_promise));
+        goto tail4;
+      case State::kState5:
+        Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise,
+                  std::move(other.prior.prior.prior.prior.prior.prior.prior
+                                .current_promise));
+        goto tail5;
+      case State::kState6:
+        Construct(
+            &prior.prior.prior.prior.prior.prior.current_promise,
+            std::move(
+                other.prior.prior.prior.prior.prior.prior.current_promise));
+        goto tail6;
+      case State::kState7:
+        Construct(
+            &prior.prior.prior.prior.prior.current_promise,
+            std::move(other.prior.prior.prior.prior.prior.current_promise));
+        goto tail7;
+      case State::kState8:
+        Construct(&prior.prior.prior.prior.current_promise,
+                  std::move(other.prior.prior.prior.prior.current_promise));
+        goto tail8;
+      case State::kState9:
+        Construct(&prior.prior.prior.current_promise,
+                  std::move(other.prior.prior.prior.current_promise));
+        goto tail9;
+      case State::kState10:
+        Construct(&prior.prior.current_promise,
+                  std::move(other.prior.prior.current_promise));
+        goto tail10;
+      case State::kState11:
+        Construct(&prior.current_promise,
+                  std::move(other.prior.current_promise));
+        goto tail11;
+      case State::kState12:
+        Construct(&current_promise, std::move(other.current_promise));
+        return;
+    }
+  tail0:
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .prior.next_factory,
+              std::move(other.prior.prior.prior.prior.prior.prior.prior.prior
+                            .prior.prior.prior.prior.next_factory));
+  tail1:
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .next_factory,
+              std::move(other.prior.prior.prior.prior.prior.prior.prior.prior
+                            .prior.prior.prior.next_factory));
+  tail2:
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                   .next_factory,
+              std::move(other.prior.prior.prior.prior.prior.prior.prior.prior
+                            .prior.prior.next_factory));
+  tail3:
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+        std::move(other.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .next_factory));
+  tail4:
+    Construct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.prior.prior.prior.prior.prior
+                            .next_factory));
+  tail5:
+    Construct(
+        &prior.prior.prior.prior.prior.prior.prior.next_factory,
+        std::move(
+            other.prior.prior.prior.prior.prior.prior.prior.next_factory));
+  tail6:
+    Construct(
+        &prior.prior.prior.prior.prior.prior.next_factory,
+        std::move(other.prior.prior.prior.prior.prior.prior.next_factory));
+  tail7:
+    Construct(&prior.prior.prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.prior.prior.next_factory));
+  tail8:
+    Construct(&prior.prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.prior.next_factory));
+  tail9:
+    Construct(&prior.prior.prior.next_factory,
+              std::move(other.prior.prior.prior.next_factory));
+  tail10:
+    Construct(&prior.prior.next_factory,
+              std::move(other.prior.prior.next_factory));
+  tail11:
+    Construct(&prior.next_factory, std::move(other.prior.next_factory));
+  }
+  SeqState& operator=(SeqState&& other) = delete;
+  Poll<Result> PollOnce() {
+    switch (state) {
+      case State::kState0: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 1/13", this);
+        }
+        auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior
+                          .prior.prior.prior.current_promise();
+        PromiseResult0* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 1/13 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits0::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits0::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits0::IsOk(*p)) {
+          return PromiseResultTraits0::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits0::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                 .prior.next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                       .prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState1;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState1: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 2/13", this);
+        }
+        auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior
+                          .prior.prior.current_promise();
+        PromiseResult1* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 2/13 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits1::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits1::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits1::IsOk(*p)) {
+          return PromiseResultTraits1::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .prior.current_promise);
+        auto next_promise = PromiseResultTraits1::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                 .next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .prior.next_factory);
+        Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                       .current_promise,
+                  std::move(next_promise));
+        state = State::kState2;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState2: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 3/13", this);
+        }
+        auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior
+                          .prior.current_promise();
+        PromiseResult2* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 3/13 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits2::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits2::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits2::IsOk(*p)) {
+          return PromiseResultTraits2::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .current_promise);
+        auto next_promise = PromiseResultTraits2::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                 .next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .next_factory);
+        Construct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                       .current_promise,
+                  std::move(next_promise));
+        state = State::kState3;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState3: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 4/13", this);
+        }
+        auto result = prior.prior.prior.prior.prior.prior.prior.prior.prior
+                          .current_promise();
+        PromiseResult3* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 4/13 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits3::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits3::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits3::IsOk(*p)) {
+          return PromiseResultTraits3::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .current_promise);
+        auto next_promise = PromiseResultTraits3::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.prior
+                      .next_factory);
+        Construct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise,
+            std::move(next_promise));
+        state = State::kState4;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState4: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 5/13", this);
+        }
+        auto result =
+            prior.prior.prior.prior.prior.prior.prior.prior.current_promise();
+        PromiseResult4* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 5/13 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits4::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits4::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits4::IsOk(*p)) {
+          return PromiseResultTraits4::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(
+            &prior.prior.prior.prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits4::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.prior.next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState5;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState5: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 6/13", this);
+        }
+        auto result =
+            prior.prior.prior.prior.prior.prior.prior.current_promise();
+        PromiseResult5* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 6/13 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits5::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits5::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits5::IsOk(*p)) {
+          return PromiseResultTraits5::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits5::CallFactory(
+            &prior.prior.prior.prior.prior.prior.prior.next_factory,
+            std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState6;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState6: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 7/13", this);
+        }
+        auto result = prior.prior.prior.prior.prior.prior.current_promise();
+        PromiseResult6* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 7/13 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits6::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits6::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits6::IsOk(*p)) {
+          return PromiseResultTraits6::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits6::CallFactory(
+            &prior.prior.prior.prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState7;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState7: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 8/13", this);
+        }
+        auto result = prior.prior.prior.prior.prior.current_promise();
+        PromiseResult7* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 8/13 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits7::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits7::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits7::IsOk(*p)) {
+          return PromiseResultTraits7::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits7::CallFactory(
+            &prior.prior.prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.prior.current_promise,
+                  std::move(next_promise));
+        state = State::kState8;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState8: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 9/13", this);
+        }
+        auto result = prior.prior.prior.prior.current_promise();
+        PromiseResult8* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 9/13 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits8::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits8::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits8::IsOk(*p)) {
+          return PromiseResultTraits8::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits8::CallFactory(
+            &prior.prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.prior.next_factory);
+        Construct(&prior.prior.prior.current_promise, std::move(next_promise));
+        state = State::kState9;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState9: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 10/13", this);
+        }
+        auto result = prior.prior.prior.current_promise();
+        PromiseResult9* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 10/13 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits9::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits9::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits9::IsOk(*p)) {
+          return PromiseResultTraits9::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits9::CallFactory(
+            &prior.prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.prior.next_factory);
+        Construct(&prior.prior.current_promise, std::move(next_promise));
+        state = State::kState10;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState10: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 11/13", this);
+        }
+        auto result = prior.prior.current_promise();
+        PromiseResult10* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 11/13 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits10::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits10::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits10::IsOk(*p)) {
+          return PromiseResultTraits10::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.prior.current_promise);
+        auto next_promise = PromiseResultTraits10::CallFactory(
+            &prior.prior.next_factory, std::move(*p));
+        Destruct(&prior.prior.next_factory);
+        Construct(&prior.current_promise, std::move(next_promise));
+        state = State::kState11;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      case State::kState11: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 12/13", this);
+        }
+        auto result = prior.current_promise();
+        PromiseResult11* p = result.value_if_ready();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(
+              whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+              "seq[%p]: poll step 12/13 gets %s", this,
+              p != nullptr
+                  ? (PromiseResultTraits11::IsOk(*p)
+                         ? "ready"
+                         : absl::StrCat("early-error:",
+                                        PromiseResultTraits11::ErrorString(*p))
+                               .c_str())
+                  : "pending");
+        }
+        if (p == nullptr) return Pending{};
+        if (!PromiseResultTraits11::IsOk(*p)) {
+          return PromiseResultTraits11::template ReturnValue<Result>(
+              std::move(*p));
+        }
+        Destruct(&prior.current_promise);
+        auto next_promise = PromiseResultTraits11::CallFactory(
+            &prior.next_factory, std::move(*p));
+        Destruct(&prior.next_factory);
+        Construct(&current_promise, std::move(next_promise));
+        state = State::kState12;
+      }
+        ABSL_FALLTHROUGH_INTENDED;
+      default:
+      case State::kState12: {
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: begin poll step 13/13", this);
+        }
+        auto result = current_promise();
+        if (grpc_trace_promise_primitives.enabled()) {
+          gpr_log(whence.file(), whence.line(), GPR_LOG_SEVERITY_DEBUG,
+                  "seq[%p]: poll step 13/13 gets %s", this,
+                  result.ready() ? "ready" : "pending");
+        }
+        auto* p = result.value_if_ready();
+        if (p == nullptr) return Pending{};
+        return Result(std::move(*p));
+      }
+    }
+  }
+};
+
 }  // namespace promise_detail
 }  // namespace grpc_core
 
diff --git a/src/core/lib/promise/detail/status.h b/src/core/lib/promise/detail/status.h
index 1063f329193..bfc649e6c48 100644
--- a/src/core/lib/promise/detail/status.h
+++ b/src/core/lib/promise/detail/status.h
@@ -45,6 +45,11 @@ inline absl::Status IntoStatus(absl::Status* status) {
 // can participate in TrySeq as result types that affect control flow.
 inline bool IsStatusOk(const absl::Status& status) { return status.ok(); }
 
+template <typename T>
+inline bool IsStatusOk(const absl::StatusOr<T>& status) {
+  return status.ok();
+}
+
 template <typename To, typename From, typename SfinaeVoid = void>
 struct StatusCastImpl;
 
@@ -59,20 +64,52 @@ struct StatusCastImpl<To, const To&> {
 };
 
 template <typename T>
-struct StatusCastImpl<absl::StatusOr<T>, absl::Status> {
-  static absl::StatusOr<T> Cast(absl::Status&& t) { return std::move(t); }
+struct StatusCastImpl<absl::Status, absl::StatusOr<T>> {
+  static absl::Status Cast(absl::StatusOr<T>&& t) {
+    return std::move(t.status());
+  }
 };
 
 template <typename T>
-struct StatusCastImpl<absl::StatusOr<T>, const absl::Status&> {
-  static absl::StatusOr<T> Cast(const absl::Status& t) { return t; }
+struct StatusCastImpl<absl::Status, absl::StatusOr<T>&> {
+  static absl::Status Cast(const absl::StatusOr<T>& t) { return t.status(); }
 };
 
+template <typename T>
+struct StatusCastImpl<absl::Status, const absl::StatusOr<T>&> {
+  static absl::Status Cast(const absl::StatusOr<T>& t) { return t.status(); }
+};
+
+// StatusCast<> allows casting from one status-bearing type to another,
+// regardless of whether the status indicates success or failure.
+// This means that we can go from StatusOr to Status safely, but not in the
+// opposite direction.
+// For cases where the status is guaranteed to be a failure (and hence not
+// needing to preserve values) see FailureStatusCast<> below.
 template <typename To, typename From>
 To StatusCast(From&& from) {
   return StatusCastImpl<To, From>::Cast(std::forward<From>(from));
 }
 
+template <typename To, typename From, typename SfinaeVoid = void>
+struct FailureStatusCastImpl : public StatusCastImpl<To, From> {};
+
+template <typename T>
+struct FailureStatusCastImpl<absl::StatusOr<T>, absl::Status> {
+  static absl::StatusOr<T> Cast(absl::Status&& t) { return std::move(t); }
+};
+
+template <typename T>
+struct FailureStatusCastImpl<absl::StatusOr<T>, const absl::Status&> {
+  static absl::StatusOr<T> Cast(const absl::Status& t) { return t; }
+};
+
+template <typename To, typename From>
+To FailureStatusCast(From&& from) {
+  GPR_DEBUG_ASSERT(!IsStatusOk(from));
+  return FailureStatusCastImpl<To, From>::Cast(std::forward<From>(from));
+}
+
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_LIB_PROMISE_DETAIL_STATUS_H
diff --git a/src/core/lib/promise/detail/switch.h b/src/core/lib/promise/detail/switch.h
deleted file mode 100644
index a823b260609..00000000000
--- a/src/core/lib/promise/detail/switch.h
+++ /dev/null
@@ -1,1455 +0,0 @@
-//
-// Copyright 2021 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-//
-// Automatically generated by tools/codegen/core/gen_switch.py
-//
-
-#ifndef GRPC_SRC_CORE_LIB_PROMISE_DETAIL_SWITCH_H
-#define GRPC_SRC_CORE_LIB_PROMISE_DETAIL_SWITCH_H
-
-#include <grpc/support/port_platform.h>
-
-#include <stdlib.h>
-
-namespace grpc_core {
-
-template <typename R, typename F0>
-R Switch(char idx, F0 f0) {
-  switch (idx) {
-    case 0:
-      return f0();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1>
-R Switch(char idx, F0 f0, F1 f1) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2>
-R Switch(char idx, F0 f0, F1 f1, F2 f2) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16, typename F17>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16, F17 f17) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-    case 17:
-      return f17();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16, typename F17, typename F18>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16, F17 f17, F18 f18) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-    case 17:
-      return f17();
-    case 18:
-      return f18();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16, typename F17, typename F18,
-          typename F19>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16, F17 f17, F18 f18, F19 f19) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-    case 17:
-      return f17();
-    case 18:
-      return f18();
-    case 19:
-      return f19();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16, typename F17, typename F18,
-          typename F19, typename F20>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16, F17 f17, F18 f18, F19 f19, F20 f20) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-    case 17:
-      return f17();
-    case 18:
-      return f18();
-    case 19:
-      return f19();
-    case 20:
-      return f20();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16, typename F17, typename F18,
-          typename F19, typename F20, typename F21>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16, F17 f17, F18 f18, F19 f19, F20 f20, F21 f21) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-    case 17:
-      return f17();
-    case 18:
-      return f18();
-    case 19:
-      return f19();
-    case 20:
-      return f20();
-    case 21:
-      return f21();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16, typename F17, typename F18,
-          typename F19, typename F20, typename F21, typename F22>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16, F17 f17, F18 f18, F19 f19, F20 f20, F21 f21, F22 f22) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-    case 17:
-      return f17();
-    case 18:
-      return f18();
-    case 19:
-      return f19();
-    case 20:
-      return f20();
-    case 21:
-      return f21();
-    case 22:
-      return f22();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16, typename F17, typename F18,
-          typename F19, typename F20, typename F21, typename F22, typename F23>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16, F17 f17, F18 f18, F19 f19, F20 f20, F21 f21, F22 f22,
-         F23 f23) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-    case 17:
-      return f17();
-    case 18:
-      return f18();
-    case 19:
-      return f19();
-    case 20:
-      return f20();
-    case 21:
-      return f21();
-    case 22:
-      return f22();
-    case 23:
-      return f23();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16, typename F17, typename F18,
-          typename F19, typename F20, typename F21, typename F22, typename F23,
-          typename F24>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16, F17 f17, F18 f18, F19 f19, F20 f20, F21 f21, F22 f22, F23 f23,
-         F24 f24) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-    case 17:
-      return f17();
-    case 18:
-      return f18();
-    case 19:
-      return f19();
-    case 20:
-      return f20();
-    case 21:
-      return f21();
-    case 22:
-      return f22();
-    case 23:
-      return f23();
-    case 24:
-      return f24();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16, typename F17, typename F18,
-          typename F19, typename F20, typename F21, typename F22, typename F23,
-          typename F24, typename F25>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16, F17 f17, F18 f18, F19 f19, F20 f20, F21 f21, F22 f22, F23 f23,
-         F24 f24, F25 f25) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-    case 17:
-      return f17();
-    case 18:
-      return f18();
-    case 19:
-      return f19();
-    case 20:
-      return f20();
-    case 21:
-      return f21();
-    case 22:
-      return f22();
-    case 23:
-      return f23();
-    case 24:
-      return f24();
-    case 25:
-      return f25();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16, typename F17, typename F18,
-          typename F19, typename F20, typename F21, typename F22, typename F23,
-          typename F24, typename F25, typename F26>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16, F17 f17, F18 f18, F19 f19, F20 f20, F21 f21, F22 f22, F23 f23,
-         F24 f24, F25 f25, F26 f26) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-    case 17:
-      return f17();
-    case 18:
-      return f18();
-    case 19:
-      return f19();
-    case 20:
-      return f20();
-    case 21:
-      return f21();
-    case 22:
-      return f22();
-    case 23:
-      return f23();
-    case 24:
-      return f24();
-    case 25:
-      return f25();
-    case 26:
-      return f26();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16, typename F17, typename F18,
-          typename F19, typename F20, typename F21, typename F22, typename F23,
-          typename F24, typename F25, typename F26, typename F27>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16, F17 f17, F18 f18, F19 f19, F20 f20, F21 f21, F22 f22, F23 f23,
-         F24 f24, F25 f25, F26 f26, F27 f27) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-    case 17:
-      return f17();
-    case 18:
-      return f18();
-    case 19:
-      return f19();
-    case 20:
-      return f20();
-    case 21:
-      return f21();
-    case 22:
-      return f22();
-    case 23:
-      return f23();
-    case 24:
-      return f24();
-    case 25:
-      return f25();
-    case 26:
-      return f26();
-    case 27:
-      return f27();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16, typename F17, typename F18,
-          typename F19, typename F20, typename F21, typename F22, typename F23,
-          typename F24, typename F25, typename F26, typename F27, typename F28>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16, F17 f17, F18 f18, F19 f19, F20 f20, F21 f21, F22 f22, F23 f23,
-         F24 f24, F25 f25, F26 f26, F27 f27, F28 f28) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-    case 17:
-      return f17();
-    case 18:
-      return f18();
-    case 19:
-      return f19();
-    case 20:
-      return f20();
-    case 21:
-      return f21();
-    case 22:
-      return f22();
-    case 23:
-      return f23();
-    case 24:
-      return f24();
-    case 25:
-      return f25();
-    case 26:
-      return f26();
-    case 27:
-      return f27();
-    case 28:
-      return f28();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16, typename F17, typename F18,
-          typename F19, typename F20, typename F21, typename F22, typename F23,
-          typename F24, typename F25, typename F26, typename F27, typename F28,
-          typename F29>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16, F17 f17, F18 f18, F19 f19, F20 f20, F21 f21, F22 f22, F23 f23,
-         F24 f24, F25 f25, F26 f26, F27 f27, F28 f28, F29 f29) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-    case 17:
-      return f17();
-    case 18:
-      return f18();
-    case 19:
-      return f19();
-    case 20:
-      return f20();
-    case 21:
-      return f21();
-    case 22:
-      return f22();
-    case 23:
-      return f23();
-    case 24:
-      return f24();
-    case 25:
-      return f25();
-    case 26:
-      return f26();
-    case 27:
-      return f27();
-    case 28:
-      return f28();
-    case 29:
-      return f29();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16, typename F17, typename F18,
-          typename F19, typename F20, typename F21, typename F22, typename F23,
-          typename F24, typename F25, typename F26, typename F27, typename F28,
-          typename F29, typename F30>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16, F17 f17, F18 f18, F19 f19, F20 f20, F21 f21, F22 f22, F23 f23,
-         F24 f24, F25 f25, F26 f26, F27 f27, F28 f28, F29 f29, F30 f30) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-    case 17:
-      return f17();
-    case 18:
-      return f18();
-    case 19:
-      return f19();
-    case 20:
-      return f20();
-    case 21:
-      return f21();
-    case 22:
-      return f22();
-    case 23:
-      return f23();
-    case 24:
-      return f24();
-    case 25:
-      return f25();
-    case 26:
-      return f26();
-    case 27:
-      return f27();
-    case 28:
-      return f28();
-    case 29:
-      return f29();
-    case 30:
-      return f30();
-  }
-  abort();
-}
-
-template <typename R, typename F0, typename F1, typename F2, typename F3,
-          typename F4, typename F5, typename F6, typename F7, typename F8,
-          typename F9, typename F10, typename F11, typename F12, typename F13,
-          typename F14, typename F15, typename F16, typename F17, typename F18,
-          typename F19, typename F20, typename F21, typename F22, typename F23,
-          typename F24, typename F25, typename F26, typename F27, typename F28,
-          typename F29, typename F30, typename F31>
-R Switch(char idx, F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7,
-         F8 f8, F9 f9, F10 f10, F11 f11, F12 f12, F13 f13, F14 f14, F15 f15,
-         F16 f16, F17 f17, F18 f18, F19 f19, F20 f20, F21 f21, F22 f22, F23 f23,
-         F24 f24, F25 f25, F26 f26, F27 f27, F28 f28, F29 f29, F30 f30,
-         F31 f31) {
-  switch (idx) {
-    case 0:
-      return f0();
-    case 1:
-      return f1();
-    case 2:
-      return f2();
-    case 3:
-      return f3();
-    case 4:
-      return f4();
-    case 5:
-      return f5();
-    case 6:
-      return f6();
-    case 7:
-      return f7();
-    case 8:
-      return f8();
-    case 9:
-      return f9();
-    case 10:
-      return f10();
-    case 11:
-      return f11();
-    case 12:
-      return f12();
-    case 13:
-      return f13();
-    case 14:
-      return f14();
-    case 15:
-      return f15();
-    case 16:
-      return f16();
-    case 17:
-      return f17();
-    case 18:
-      return f18();
-    case 19:
-      return f19();
-    case 20:
-      return f20();
-    case 21:
-      return f21();
-    case 22:
-      return f22();
-    case 23:
-      return f23();
-    case 24:
-      return f24();
-    case 25:
-      return f25();
-    case 26:
-      return f26();
-    case 27:
-      return f27();
-    case 28:
-      return f28();
-    case 29:
-      return f29();
-    case 30:
-      return f30();
-    case 31:
-      return f31();
-  }
-  abort();
-}
-
-}  // namespace grpc_core
-
-#endif  // GRPC_SRC_CORE_LIB_PROMISE_DETAIL_SWITCH_H
diff --git a/src/core/lib/promise/event_engine_wakeup_scheduler.h b/src/core/lib/promise/event_engine_wakeup_scheduler.h
index 792ee9d4439..3e489c87fc6 100644
--- a/src/core/lib/promise/event_engine_wakeup_scheduler.h
+++ b/src/core/lib/promise/event_engine_wakeup_scheduler.h
@@ -33,7 +33,9 @@ class EventEngineWakeupScheduler {
   explicit EventEngineWakeupScheduler(
       std::shared_ptr<grpc_event_engine::experimental::EventEngine>
           event_engine)
-      : event_engine_(std::move(event_engine)) {}
+      : event_engine_(std::move(event_engine)) {
+    GPR_ASSERT(event_engine_ != nullptr);
+  }
 
   template <typename ActivityType>
   class BoundScheduler
diff --git a/src/core/lib/promise/if.h b/src/core/lib/promise/if.h
index e659ad30ed8..2c81fd7e38a 100644
--- a/src/core/lib/promise/if.h
+++ b/src/core/lib/promise/if.h
@@ -192,6 +192,10 @@ class If<bool, T, F> {
 // If it returns failure, returns failure for the entire combinator.
 // If it returns true, evaluates the second promise.
 // If it returns false, evaluates the third promise.
+// If C is a constant, it's guaranteed that one of the promise factories
+// if_true or if_false will be evaluated before returning from this function.
+// This makes it safe to capture lambda arguments in the promise factory by
+// reference.
 template <typename C, typename T, typename F>
 promise_detail::If<C, T, F> If(C condition, T if_true, F if_false) {
   return promise_detail::If<C, T, F>(std::move(condition), std::move(if_true),
diff --git a/src/core/lib/promise/inter_activity_pipe.h b/src/core/lib/promise/inter_activity_pipe.h
index a7594fb26a2..4578cbb3c62 100644
--- a/src/core/lib/promise/inter_activity_pipe.h
+++ b/src/core/lib/promise/inter_activity_pipe.h
@@ -113,9 +113,9 @@ class InterActivityPipe {
       if (center_ != nullptr) center_->MarkClosed();
     }
 
-    bool IsClose() { return center_->IsClosed(); }
+    bool IsClosed() { return center_->IsClosed(); }
 
-    void MarkClose() {
+    void MarkClosed() {
       if (center_ != nullptr) center_->MarkClosed();
     }
 
@@ -146,6 +146,12 @@ class InterActivityPipe {
       return [center = center_]() { return center->Next(); };
     }
 
+    bool IsClose() { return center_->IsClosed(); }
+
+    void MarkClose() {
+      if (center_ != nullptr) center_->MarkClosed();
+    }
+
    private:
     RefCountedPtr<Center> center_;
   };
diff --git a/src/core/lib/promise/mpsc.h b/src/core/lib/promise/mpsc.h
index c12544282f6..8bbbfc4c8ec 100644
--- a/src/core/lib/promise/mpsc.h
+++ b/src/core/lib/promise/mpsc.h
@@ -103,14 +103,12 @@ class Center : public RefCounted<Center<T>> {
 
   // Mark that the receiver is closed.
   void ReceiverClosed() {
-    MutexLock lock(&mu_);
+    ReleasableMutexLock lock(&mu_);
+    if (receiver_closed_) return;
     receiver_closed_ = true;
-  }
-
-  // Return whether the receiver is closed.
-  bool IsClosed() {
-    MutexLock lock(&mu_);
-    return receiver_closed_;
+    auto wakeups = send_wakers_.TakeWakeupSet();
+    lock.Release();
+    wakeups.Wakeup();
   }
 
  private:
@@ -131,8 +129,8 @@ class MpscReceiver;
 template <typename T>
 class MpscSender {
  public:
-  MpscSender(const MpscSender&) = delete;
-  MpscSender& operator=(const MpscSender&) = delete;
+  MpscSender(const MpscSender&) = default;
+  MpscSender& operator=(const MpscSender&) = default;
   MpscSender(MpscSender&&) noexcept = default;
   MpscSender& operator=(MpscSender&&) noexcept = default;
 
@@ -140,7 +138,10 @@ class MpscSender {
   // Resolves to true if sent, false if the receiver was closed (and the value
   // will never be successfully sent).
   auto Send(T t) {
-    return [this, t = std::move(t)]() mutable { return center_->PollSend(t); };
+    return [center = center_, t = std::move(t)]() mutable -> Poll<bool> {
+      if (center == nullptr) return false;
+      return center->PollSend(t);
+    };
   }
 
   bool UnbufferedImmediateSend(T t) {
@@ -170,7 +171,6 @@ class MpscReceiver {
   ~MpscReceiver() {
     if (center_ != nullptr) center_->ReceiverClosed();
   }
-  bool IsClosed() { return center_->IsClosed(); }
   void MarkClosed() {
     if (center_ != nullptr) center_->ReceiverClosed();
   }
diff --git a/src/core/lib/promise/party.cc b/src/core/lib/promise/party.cc
index 275d06445a4..d2cf5177f93 100644
--- a/src/core/lib/promise/party.cc
+++ b/src/core/lib/promise/party.cc
@@ -227,40 +227,42 @@ void Party::RunLocked() {
 bool Party::RunParty() {
   ScopedActivity activity(this);
   promise_detail::Context<Arena> arena_ctx(arena_);
-  return sync_.RunParty([this](int i) {
-    // If the participant is null, skip.
-    // This allows participants to complete whilst wakers still exist
-    // somewhere.
-    auto* participant = participants_[i].load(std::memory_order_acquire);
-    if (participant == nullptr) {
-      if (grpc_trace_promise_primitives.enabled()) {
-        gpr_log(GPR_DEBUG, "%s[party] wakeup %d already complete",
-                DebugTag().c_str(), i);
-      }
-      return false;
-    }
-    absl::string_view name;
+  return sync_.RunParty([this](int i) { return RunOneParticipant(i); });
+}
+
+bool Party::RunOneParticipant(int i) {
+  // If the participant is null, skip.
+  // This allows participants to complete whilst wakers still exist
+  // somewhere.
+  auto* participant = participants_[i].load(std::memory_order_acquire);
+  if (participant == nullptr) {
     if (grpc_trace_promise_primitives.enabled()) {
-      name = participant->name();
-      gpr_log(GPR_DEBUG, "%s[%s] begin job %d", DebugTag().c_str(),
-              std::string(name).c_str(), i);
+      gpr_log(GPR_DEBUG, "%s[party] wakeup %d already complete",
+              DebugTag().c_str(), i);
     }
-    // Poll the participant.
-    currently_polling_ = i;
-    bool done = participant->PollParticipantPromise();
-    currently_polling_ = kNotPolling;
-    if (done) {
-      if (!name.empty()) {
-        gpr_log(GPR_DEBUG, "%s[%s] end poll and finish job %d",
-                DebugTag().c_str(), std::string(name).c_str(), i);
-      }
-      participants_[i].store(nullptr, std::memory_order_relaxed);
-    } else if (!name.empty()) {
-      gpr_log(GPR_DEBUG, "%s[%s] end poll", DebugTag().c_str(),
-              std::string(name).c_str());
+    return false;
+  }
+  absl::string_view name;
+  if (grpc_trace_promise_primitives.enabled()) {
+    name = participant->name();
+    gpr_log(GPR_DEBUG, "%s[%s] begin job %d", DebugTag().c_str(),
+            std::string(name).c_str(), i);
+  }
+  // Poll the participant.
+  currently_polling_ = i;
+  bool done = participant->PollParticipantPromise();
+  currently_polling_ = kNotPolling;
+  if (done) {
+    if (!name.empty()) {
+      gpr_log(GPR_DEBUG, "%s[%s] end poll and finish job %d",
+              DebugTag().c_str(), std::string(name).c_str(), i);
     }
-    return done;
-  });
+    participants_[i].store(nullptr, std::memory_order_relaxed);
+  } else if (!name.empty()) {
+    gpr_log(GPR_DEBUG, "%s[%s] end poll", DebugTag().c_str(),
+            std::string(name).c_str());
+  }
+  return done;
 }
 
 void Party::AddParticipants(Participant** participants, size_t count) {
diff --git a/src/core/lib/promise/party.h b/src/core/lib/promise/party.h
index 1ff098f3aa3..a6c0aca1789 100644
--- a/src/core/lib/promise/party.h
+++ b/src/core/lib/promise/party.h
@@ -102,7 +102,8 @@ class PartySyncUsingAtomics {
   template <typename F>
   GRPC_MUST_USE_RESULT bool RunParty(F poll_one_participant) {
     uint64_t prev_state;
-    do {
+    iteration_.fetch_add(1, std::memory_order_relaxed);
+    for (;;) {
       // Grab the current state, and clear the wakeup bits & add flag.
       prev_state = state_.fetch_and(kRefMask | kLocked | kAllocatedMask,
                                     std::memory_order_acquire);
@@ -133,9 +134,23 @@ class PartySyncUsingAtomics {
       // TODO(ctiller): consider mitigations for the accidental wakeup on owning
       // waker creation case -- I currently expect this will be more expensive
       // than this quick loop.
-    } while (!state_.compare_exchange_weak(
-        prev_state, (prev_state & (kRefMask | kAllocatedMask)),
-        std::memory_order_acq_rel, std::memory_order_acquire));
+      if (wake_after_poll_ == 0) {
+        if (state_.compare_exchange_weak(
+                prev_state, (prev_state & (kRefMask | kAllocatedMask)),
+                std::memory_order_acq_rel, std::memory_order_acquire)) {
+          return false;
+        }
+      } else {
+        if (state_.compare_exchange_weak(
+                prev_state,
+                (prev_state & (kRefMask | kAllocatedMask | kLocked)) |
+                    wake_after_poll_,
+                std::memory_order_acq_rel, std::memory_order_acquire)) {
+          iteration_.fetch_add(1, std::memory_order_relaxed);
+          wake_after_poll_ = 0;
+        }
+      }
+    }
     return false;
   }
 
@@ -186,6 +201,11 @@ class PartySyncUsingAtomics {
   // Returns true if the caller should run the party.
   GRPC_MUST_USE_RESULT bool ScheduleWakeup(WakeupMask mask);
 
+  void WakeAfterPoll(WakeupMask mask) { wake_after_poll_ |= mask; }
+  uint32_t iteration() const {
+    return iteration_.load(std::memory_order_relaxed);
+  }
+
  private:
   bool UnreffedLast();
 
@@ -225,6 +245,8 @@ class PartySyncUsingAtomics {
   static constexpr uint64_t kOneRef = 1ull << kRefShift;
 
   std::atomic<uint64_t> state_;
+  std::atomic<uint32_t> iteration_{0};
+  WakeupMask wake_after_poll_ = 0;
 };
 
 class PartySyncUsingMutex {
@@ -358,6 +380,20 @@ class Party : public Activity, private Wakeable {
 
   Arena* arena() const { return arena_; }
 
+  // Return a promise that resolves to Empty{} when the current party poll is
+  // complete.
+  // This is useful for implementing batching and the like: we can hold some
+  // action until the rest of the party resolves itself.
+  auto AfterCurrentPoll() {
+    GPR_DEBUG_ASSERT(Activity::current() == this);
+    sync_.WakeAfterPoll(CurrentParticipant());
+    return [this, iteration = sync_.iteration()]() -> Poll<Empty> {
+      GPR_DEBUG_ASSERT(Activity::current() == this);
+      if (iteration == sync_.iteration()) return Pending{};
+      return Empty{};
+    };
+  }
+
   class BulkSpawner {
    public:
     explicit BulkSpawner(Party* party) : party_(party) {}
@@ -548,6 +584,7 @@ class Party : public Activity, private Wakeable {
 
   // Add a participant (backs Spawn, after type erasure to ParticipantFactory).
   void AddParticipants(Participant** participant, size_t count);
+  bool RunOneParticipant(int i);
 
   virtual grpc_event_engine::experimental::EventEngine* event_engine()
       const = 0;
diff --git a/src/core/lib/promise/seq.h b/src/core/lib/promise/seq.h
index 0724a820575..1f1ea758ee2 100644
--- a/src/core/lib/promise/seq.h
+++ b/src/core/lib/promise/seq.h
@@ -159,6 +159,51 @@ promise_detail::Seq<F0, F1, F2, F3, F4, F5, F6, F7> Seq(
       std::move(f5), std::move(f6), std::move(f7), whence);
 }
 
+template <typename F0, typename F1, typename F2, typename F3, typename F4,
+          typename F5, typename F6, typename F7, typename F8>
+promise_detail::Seq<F0, F1, F2, F3, F4, F5, F6, F7, F8> Seq(
+    F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8,
+    DebugLocation whence = {}) {
+  return promise_detail::Seq<F0, F1, F2, F3, F4, F5, F6, F7, F8>(
+      std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4),
+      std::move(f5), std::move(f6), std::move(f7), std::move(f8), whence);
+}
+
+template <typename F0, typename F1, typename F2, typename F3, typename F4,
+          typename F5, typename F6, typename F7, typename F8, typename F9>
+promise_detail::Seq<F0, F1, F2, F3, F4, F5, F6, F7, F8, F9> Seq(
+    F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, F9 f9,
+    DebugLocation whence = {}) {
+  return promise_detail::Seq<F0, F1, F2, F3, F4, F5, F6, F7, F8, F9>(
+      std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4),
+      std::move(f5), std::move(f6), std::move(f7), std::move(f8), std::move(f9),
+      whence);
+}
+
+template <typename F0, typename F1, typename F2, typename F3, typename F4,
+          typename F5, typename F6, typename F7, typename F8, typename F9,
+          typename F10>
+promise_detail::Seq<F0, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10> Seq(
+    F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, F9 f9,
+    F10 f10, DebugLocation whence = {}) {
+  return promise_detail::Seq<F0, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10>(
+      std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4),
+      std::move(f5), std::move(f6), std::move(f7), std::move(f8), std::move(f9),
+      std::move(f10), whence);
+}
+
+template <typename F0, typename F1, typename F2, typename F3, typename F4,
+          typename F5, typename F6, typename F7, typename F8, typename F9,
+          typename F10, typename F11>
+promise_detail::Seq<F0, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11> Seq(
+    F0 f0, F1 f1, F2 f2, F3 f3, F4 f4, F5 f5, F6 f6, F7 f7, F8 f8, F9 f9,
+    F10 f10, F11 f11, DebugLocation whence = {}) {
+  return promise_detail::Seq<F0, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11>(
+      std::move(f0), std::move(f1), std::move(f2), std::move(f3), std::move(f4),
+      std::move(f5), std::move(f6), std::move(f7), std::move(f8), std::move(f9),
+      std::move(f10), std::move(f11), whence);
+}
+
 // Execute a sequence of operations of unknown length.
 // Asynchronously:
 //   for (element in (begin, end)) {
diff --git a/src/core/lib/promise/status_flag.h b/src/core/lib/promise/status_flag.h
index d9067509c32..c8c9c0ba41e 100644
--- a/src/core/lib/promise/status_flag.h
+++ b/src/core/lib/promise/status_flag.h
@@ -95,6 +95,30 @@ struct StatusCastImpl<absl::Status, const StatusFlag&> {
   }
 };
 
+template <typename T>
+struct FailureStatusCastImpl<absl::StatusOr<T>, StatusFlag> {
+  static absl::StatusOr<T> Cast(StatusFlag flag) {
+    GPR_DEBUG_ASSERT(!flag.ok());
+    return absl::CancelledError();
+  }
+};
+
+template <typename T>
+struct FailureStatusCastImpl<absl::StatusOr<T>, StatusFlag&> {
+  static absl::StatusOr<T> Cast(StatusFlag flag) {
+    GPR_DEBUG_ASSERT(!flag.ok());
+    return absl::CancelledError();
+  }
+};
+
+template <typename T>
+struct FailureStatusCastImpl<absl::StatusOr<T>, const StatusFlag&> {
+  static absl::StatusOr<T> Cast(StatusFlag flag) {
+    GPR_DEBUG_ASSERT(!flag.ok());
+    return absl::CancelledError();
+  }
+};
+
 // A value if an operation was successful, or a failure flag if not.
 template <typename T>
 class ValueOrFailure {
diff --git a/src/core/lib/promise/switch.h b/src/core/lib/promise/switch.h
new file mode 100644
index 00000000000..1bb05507ef2
--- /dev/null
+++ b/src/core/lib/promise/switch.h
@@ -0,0 +1,72 @@
+// Copyright 2023 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GRPC_SRC_CORE_LIB_PROMISE_SWITCH_H
+#define GRPC_SRC_CORE_LIB_PROMISE_SWITCH_H
+
+#include <grpc/support/port_platform.h>
+
+#include <memory>
+#include <utility>
+
+#include "src/core/lib/promise/detail/promise_factory.h"
+#include "src/core/lib/promise/if.h"
+
+namespace grpc_core {
+
+namespace promise_detail {
+template <typename D, typename F>
+struct Case {
+  D discriminator;
+  F factory;
+};
+
+template <typename F>
+struct Default {
+  F factory;
+};
+}  // namespace promise_detail
+
+template <typename D, typename PromiseFactory>
+auto Case(D discriminator, PromiseFactory f) {
+  return promise_detail::Case<D, PromiseFactory>{discriminator, std::move(f)};
+}
+
+template <typename PromiseFactory>
+auto Default(PromiseFactory f) {
+  return promise_detail::Default<PromiseFactory>{std::move(f)};
+}
+
+// Given a list of cases that result in promise factories, return a single
+// promise chosen by the discriminator (the first argument of this function).
+// e.g.:
+// Switch(1, Case<1>([] { return 43; }), Case<2>([] { return 44; }))
+// resolves to 43.
+// TODO(ctiller): consider writing a code-generator like we do for seq/join
+// so that this lowers into a C switch statement.
+template <typename D, typename F>
+auto Switch(D, promise_detail::Default<F> def) {
+  return promise_detail::OncePromiseFactory<void, F>(std::move(def.factory))
+      .Make();
+}
+
+template <typename D, typename F, typename... Others>
+auto Switch(D discriminator, promise_detail::Case<D, F> c, Others... others) {
+  return If(discriminator == c.discriminator, std::move(c.factory),
+            Switch(discriminator, std::move(others)...));
+}
+
+}  // namespace grpc_core
+
+#endif  // GRPC_SRC_CORE_LIB_PROMISE_SWITCH_H
diff --git a/src/core/lib/promise/try_join.h b/src/core/lib/promise/try_join.h
index be3354dc9b7..29cd06d5be4 100644
--- a/src/core/lib/promise/try_join.h
+++ b/src/core/lib/promise/try_join.h
@@ -75,16 +75,16 @@ struct TryJoinTraits {
   }
   template <typename R>
   static R EarlyReturn(absl::Status x) {
-    return StatusCast<R>(std::move(x));
+    return FailureStatusCast<R>(std::move(x));
   }
   template <typename R>
   static R EarlyReturn(StatusFlag x) {
-    return StatusCast<R>(x);
+    return FailureStatusCast<R>(x);
   }
   template <typename R, typename T>
   static R EarlyReturn(const ValueOrFailure<T>& x) {
     GPR_ASSERT(!x.ok());
-    return StatusCast<R>(Failure{});
+    return FailureStatusCast<R>(Failure{});
   }
   template <typename... A>
   static auto FinalReturn(A&&... a) {
diff --git a/src/core/lib/promise/try_seq.h b/src/core/lib/promise/try_seq.h
index ca04904ab1d..ab9777d1afb 100644
--- a/src/core/lib/promise/try_seq.h
+++ b/src/core/lib/promise/try_seq.h
@@ -76,7 +76,7 @@ struct TrySeqTraitsWithSfinae<absl::StatusOr<T>> {
   }
   template <typename R>
   static R ReturnValue(absl::StatusOr<T>&& status) {
-    return StatusCast<R>(status.status());
+    return FailureStatusCast<R>(status.status());
   }
   template <typename F, typename Elem>
   static auto CallSeqFactory(F& f, Elem&& elem, absl::StatusOr<T> value)
@@ -86,11 +86,26 @@ struct TrySeqTraitsWithSfinae<absl::StatusOr<T>> {
   template <typename Result, typename RunNext>
   static Poll<Result> CheckResultAndRunNext(absl::StatusOr<T> prior,
                                             RunNext run_next) {
-    if (!prior.ok()) return StatusCast<Result>(prior.status());
+    if (!prior.ok()) return FailureStatusCast<Result>(prior.status());
     return run_next(std::move(prior));
   }
 };
 
+template <typename T>
+struct AllowGenericTrySeqTraits {
+  static constexpr bool value = true;
+};
+
+template <>
+struct AllowGenericTrySeqTraits<absl::Status> {
+  static constexpr bool value = false;
+};
+
+template <typename T>
+struct AllowGenericTrySeqTraits<absl::StatusOr<T>> {
+  static constexpr bool value = false;
+};
+
 template <typename T, typename AnyType = void>
 struct TakeValueExists {
   static constexpr bool value = false;
@@ -107,7 +122,7 @@ template <typename T>
 struct TrySeqTraitsWithSfinae<
     T, absl::enable_if_t<
            std::is_same<decltype(IsStatusOk(std::declval<T>())), bool>::value &&
-               !TakeValueExists<T>::value,
+               !TakeValueExists<T>::value && AllowGenericTrySeqTraits<T>::value,
            void>> {
   using UnwrappedType = void;
   using WrappedType = T;
@@ -121,7 +136,7 @@ struct TrySeqTraitsWithSfinae<
   }
   template <typename R>
   static R ReturnValue(T&& status) {
-    return StatusCast<R>(std::move(status));
+    return FailureStatusCast<R>(std::move(status));
   }
   template <typename Result, typename RunNext>
   static Poll<Result> CheckResultAndRunNext(T prior, RunNext run_next) {
@@ -133,7 +148,7 @@ template <typename T>
 struct TrySeqTraitsWithSfinae<
     T, absl::enable_if_t<
            std::is_same<decltype(IsStatusOk(std::declval<T>())), bool>::value &&
-               TakeValueExists<T>::value,
+               TakeValueExists<T>::value && AllowGenericTrySeqTraits<T>::value,
            void>> {
   using UnwrappedType = decltype(TakeValue(std::declval<T>()));
   using WrappedType = T;
@@ -148,7 +163,7 @@ struct TrySeqTraitsWithSfinae<
   template <typename R>
   static R ReturnValue(T&& status) {
     GPR_DEBUG_ASSERT(!IsStatusOk(status));
-    return StatusCast<R>(status.status());
+    return FailureStatusCast<R>(status.status());
   }
   template <typename Result, typename RunNext>
   static Poll<Result> CheckResultAndRunNext(T prior, RunNext run_next) {
@@ -170,7 +185,7 @@ struct TrySeqTraitsWithSfinae<absl::Status> {
   }
   template <typename R>
   static R ReturnValue(absl::Status&& status) {
-    return StatusCast<R>(std::move(status));
+    return FailureStatusCast<R>(std::move(status));
   }
   template <typename Result, typename RunNext>
   static Poll<Result> CheckResultAndRunNext(absl::Status prior,
diff --git a/src/core/lib/resource_quota/arena.h b/src/core/lib/resource_quota/arena.h
index 9c0c812d4c3..edcab2caf87 100644
--- a/src/core/lib/resource_quota/arena.h
+++ b/src/core/lib/resource_quota/arena.h
@@ -180,7 +180,7 @@ class Arena {
   template <typename T, typename... Args>
   T* New(Args&&... args) {
     T* t = static_cast<T*>(Alloc(sizeof(T)));
-    Construct(t, std::forward<Args>(args)...);
+    new (t) T(std::forward<Args>(args)...);
     return t;
   }
 
@@ -333,7 +333,7 @@ class Arena {
   //          value in Arena::PoolSizes, and so this may pessimize total
   //          arena size.
   template <typename T, typename... Args>
-  PoolPtr<T> MakePooled(Args&&... args) {
+  static PoolPtr<T> MakePooled(Args&&... args) {
     return PoolPtr<T>(new T(std::forward<Args>(args)...), PooledDeleter());
   }
 
diff --git a/src/core/lib/resource_quota/memory_quota.cc b/src/core/lib/resource_quota/memory_quota.cc
index 0e63e45b4df..fb3542b9dc4 100644
--- a/src/core/lib/resource_quota/memory_quota.cc
+++ b/src/core/lib/resource_quota/memory_quota.cc
@@ -658,14 +658,9 @@ BasicMemoryQuota::PressureInfo BasicMemoryQuota::GetPressureInfo() {
   if (size < 1) return PressureInfo{1, 1, 1};
   PressureInfo pressure_info;
   pressure_info.instantaneous_pressure = std::max(0.0, (size - free) / size);
-  if (IsMemoryPressureControllerEnabled()) {
-    pressure_info.pressure_control_value =
-        pressure_tracker_.AddSampleAndGetControlValue(
-            pressure_info.instantaneous_pressure);
-  } else {
-    pressure_info.pressure_control_value =
-        std::min(pressure_info.instantaneous_pressure, 1.0);
-  }
+  pressure_info.pressure_control_value =
+      pressure_tracker_.AddSampleAndGetControlValue(
+          pressure_info.instantaneous_pressure);
   pressure_info.max_recommended_allocation_size = quota_size / 16;
   return pressure_info;
 }
diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.cc b/src/core/lib/security/authorization/grpc_server_authz_filter.cc
index 8de911b5469..8e7f4fa3977 100644
--- a/src/core/lib/security/authorization/grpc_server_authz_filter.cc
+++ b/src/core/lib/security/authorization/grpc_server_authz_filter.cc
@@ -39,6 +39,12 @@ namespace grpc_core {
 
 TraceFlag grpc_authz_trace(false, "grpc_authz_api");
 
+const NoInterceptor GrpcServerAuthzFilter::Call::OnServerInitialMetadata;
+const NoInterceptor GrpcServerAuthzFilter::Call::OnServerTrailingMetadata;
+const NoInterceptor GrpcServerAuthzFilter::Call::OnClientToServerMessage;
+const NoInterceptor GrpcServerAuthzFilter::Call::OnServerToClientMessage;
+const NoInterceptor GrpcServerAuthzFilter::Call::OnFinalize;
+
 GrpcServerAuthzFilter::GrpcServerAuthzFilter(
     RefCountedPtr<grpc_auth_context> auth_context, grpc_endpoint* endpoint,
     RefCountedPtr<grpc_authorization_policy_provider> provider)
@@ -61,9 +67,8 @@ absl::StatusOr<GrpcServerAuthzFilter> GrpcServerAuthzFilter::Create(
       /*endpoint=*/nullptr, provider->Ref());
 }
 
-bool GrpcServerAuthzFilter::IsAuthorized(
-    const ClientMetadataHandle& initial_metadata) {
-  EvaluateArgs args(initial_metadata.get(), &per_channel_evaluate_args_);
+bool GrpcServerAuthzFilter::IsAuthorized(ClientMetadata& initial_metadata) {
+  EvaluateArgs args(&initial_metadata, &per_channel_evaluate_args_);
   if (GRPC_TRACE_FLAG_ENABLED(grpc_authz_trace)) {
     gpr_log(GPR_DEBUG,
             "checking request: url_path=%s, transport_security_type=%s, "
@@ -105,14 +110,12 @@ bool GrpcServerAuthzFilter::IsAuthorized(
   return false;
 }
 
-ArenaPromise<ServerMetadataHandle> GrpcServerAuthzFilter::MakeCallPromise(
-    CallArgs call_args, NextPromiseFactory next_promise_factory) {
-  if (!IsAuthorized(call_args.client_initial_metadata)) {
-    return ArenaPromise<ServerMetadataHandle>(
-        Immediate(ServerMetadataFromStatus(absl::PermissionDeniedError(
-            "Unauthorized RPC request rejected."))));
+absl::Status GrpcServerAuthzFilter::Call::OnClientInitialMetadata(
+    ClientMetadata& md, GrpcServerAuthzFilter* filter) {
+  if (!filter->IsAuthorized(md)) {
+    return absl::PermissionDeniedError("Unauthorized RPC request rejected.");
   }
-  return next_promise_factory(std::move(call_args));
+  return absl::OkStatus();
 }
 
 const grpc_channel_filter GrpcServerAuthzFilter::kFilterVtable =
diff --git a/src/core/lib/security/authorization/grpc_server_authz_filter.h b/src/core/lib/security/authorization/grpc_server_authz_filter.h
index a26db877082..e4727f1f789 100644
--- a/src/core/lib/security/authorization/grpc_server_authz_filter.h
+++ b/src/core/lib/security/authorization/grpc_server_authz_filter.h
@@ -34,22 +34,31 @@
 
 namespace grpc_core {
 
-class GrpcServerAuthzFilter final : public ChannelFilter {
+class GrpcServerAuthzFilter final
+    : public ImplementChannelFilter<GrpcServerAuthzFilter> {
  public:
   static const grpc_channel_filter kFilterVtable;
 
   static absl::StatusOr<GrpcServerAuthzFilter> Create(const ChannelArgs& args,
                                                       ChannelFilter::Args);
 
-  ArenaPromise<ServerMetadataHandle> MakeCallPromise(
-      CallArgs call_args, NextPromiseFactory next_promise_factory) override;
+  class Call {
+   public:
+    absl::Status OnClientInitialMetadata(ClientMetadata& md,
+                                         GrpcServerAuthzFilter* filter);
+    static const NoInterceptor OnServerInitialMetadata;
+    static const NoInterceptor OnServerTrailingMetadata;
+    static const NoInterceptor OnClientToServerMessage;
+    static const NoInterceptor OnServerToClientMessage;
+    static const NoInterceptor OnFinalize;
+  };
 
  private:
   GrpcServerAuthzFilter(
       RefCountedPtr<grpc_auth_context> auth_context, grpc_endpoint* endpoint,
       RefCountedPtr<grpc_authorization_policy_provider> provider);
 
-  bool IsAuthorized(const ClientMetadataHandle& initial_metadata);
+  bool IsAuthorized(ClientMetadata& initial_metadata);
 
   RefCountedPtr<grpc_auth_context> auth_context_;
   EvaluateArgs::PerChannelArgs per_channel_evaluate_args_;
diff --git a/src/core/lib/slice/slice_buffer.h b/src/core/lib/slice/slice_buffer.h
index 2626bd4a0e9..0c1bfe9d901 100644
--- a/src/core/lib/slice/slice_buffer.h
+++ b/src/core/lib/slice/slice_buffer.h
@@ -50,6 +50,9 @@ namespace grpc_core {
 class SliceBuffer {
  public:
   explicit SliceBuffer() { grpc_slice_buffer_init(&slice_buffer_); }
+  explicit SliceBuffer(Slice slice) : SliceBuffer() {
+    Append(std::move(slice));
+  }
   SliceBuffer(const SliceBuffer& other) = delete;
   SliceBuffer(SliceBuffer&& other) noexcept {
     grpc_slice_buffer_init(&slice_buffer_);
diff --git a/src/core/lib/surface/builtins.cc b/src/core/lib/surface/builtins.cc
index 189eb79072b..303fbb4dadc 100644
--- a/src/core/lib/surface/builtins.cc
+++ b/src/core/lib/surface/builtins.cc
@@ -27,7 +27,7 @@ namespace grpc_core {
 void RegisterBuiltins(CoreConfiguration::Builder* builder) {
   RegisterServerCallTracerFilter(builder);
   builder->channel_init()
-      ->RegisterFilter(GRPC_CLIENT_LAME_CHANNEL, &LameClientFilter::kFilter)
+      ->RegisterFilter<LameClientFilter>(GRPC_CLIENT_LAME_CHANNEL)
       .Terminal();
   builder->channel_init()
       ->RegisterFilter(GRPC_SERVER_CHANNEL, &Server::kServerTopFilter)
diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc
index 1bb29fa6e25..d6d6a8537c6 100644
--- a/src/core/lib/surface/call.cc
+++ b/src/core/lib/surface/call.cc
@@ -859,7 +859,7 @@ grpc_error_handle FilterStackCall::Create(grpc_call_create_args* args,
         args->server->server_call_tracer_factory() != nullptr) {
       auto* server_call_tracer =
           args->server->server_call_tracer_factory()->CreateNewServerCallTracer(
-              arena);
+              arena, args->server->channel_args());
       if (server_call_tracer != nullptr) {
         // Note that we are setting both
         // GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE and
@@ -3426,7 +3426,7 @@ ServerPromiseBasedCall::ServerPromiseBasedCall(Arena* arena,
   if (args->server->server_call_tracer_factory() != nullptr) {
     auto* server_call_tracer =
         args->server->server_call_tracer_factory()->CreateNewServerCallTracer(
-            arena);
+            arena, args->server->channel_args());
     if (server_call_tracer != nullptr) {
       // Note that we are setting both
       // GRPC_CONTEXT_CALL_TRACER_ANNOTATION_INTERFACE and
@@ -4063,17 +4063,13 @@ void ServerCallSpine::CommitBatch(const grpc_op* ops, size_t nops,
 }
 
 RefCountedPtr<CallSpineInterface> MakeServerCall(Server* server,
-                                                 Channel* channel) {
-  const auto initial_size = channel->CallSizeEstimate();
-  global_stats().IncrementCallInitialSize(initial_size);
-  auto alloc = Arena::CreateWithAlloc(initial_size, sizeof(ServerCallSpine),
-                                      channel->allocator());
-  auto* call = new (alloc.second) ServerCallSpine(server, channel, alloc.first);
-  return RefCountedPtr<ServerCallSpine>(call);
+                                                 Channel* channel,
+                                                 Arena* arena) {
+  return RefCountedPtr<ServerCallSpine>(
+      arena->New<ServerCallSpine>(server, channel, arena));
 }
 #else
-RefCountedPtr<CallSpineInterface> MakeServerCall(Server* server,
-                                                 Channel* channel) {
+RefCountedPtr<CallSpineInterface> MakeServerCall(Server*, Channel*, Arena*) {
   Crash("not implemented");
 }
 #endif
diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h
index 6653bb6a0dd..520cf13505c 100644
--- a/src/core/lib/surface/call.h
+++ b/src/core/lib/surface/call.h
@@ -160,7 +160,8 @@ template <>
 struct ContextType<CallContext> {};
 
 RefCountedPtr<CallSpineInterface> MakeServerCall(Server* server,
-                                                 Channel* channel);
+                                                 Channel* channel,
+                                                 Arena* arena);
 
 }  // namespace grpc_core
 
diff --git a/src/core/lib/surface/channel.cc b/src/core/lib/surface/channel.cc
index ca8927fc7e3..17d36b50e9a 100644
--- a/src/core/lib/surface/channel.cc
+++ b/src/core/lib/surface/channel.cc
@@ -376,7 +376,6 @@ namespace grpc_core {
 
 RegisteredCall* Channel::RegisterCall(const char* method, const char* host) {
   MutexLock lock(&registration_table_.mu);
-  registration_table_.method_registration_attempts++;
   auto key = std::make_pair(std::string(host != nullptr ? host : ""),
                             std::string(method != nullptr ? method : ""));
   auto rc_posn = registration_table_.map.find(key);
diff --git a/src/core/lib/surface/channel.h b/src/core/lib/surface/channel.h
index 2efe91fbfc2..f6e4f7ed932 100644
--- a/src/core/lib/surface/channel.h
+++ b/src/core/lib/surface/channel.h
@@ -103,7 +103,6 @@ struct CallRegistrationTable {
   // C++ or other wrapped language Channel that registered these calls).
   std::map<std::pair<std::string, std::string>, RegisteredCall> map
       ABSL_GUARDED_BY(mu);
-  int method_registration_attempts ABSL_GUARDED_BY(mu) = 0;
 };
 
 class Channel : public RefCounted<Channel>,
@@ -150,11 +149,6 @@ class Channel : public RefCounted<Channel>,
     return registration_table_.map.size();
   }
 
-  int TestOnlyRegistrationAttempts() {
-    MutexLock lock(&registration_table_.mu);
-    return registration_table_.method_registration_attempts;
-  }
-
   grpc_event_engine::experimental::EventEngine* event_engine() const {
     return channel_stack_->EventEngine();
   }
diff --git a/src/core/lib/surface/channel_init.h b/src/core/lib/surface/channel_init.h
index 12a441f0c40..344fe2c4dbb 100644
--- a/src/core/lib/surface/channel_init.h
+++ b/src/core/lib/surface/channel_init.h
@@ -87,11 +87,30 @@ class ChannelInit {
     // Ensure that this filter is placed *after* the filters listed here.
     // By Build() time all filters listed here must also be registered against
     // the same channel stack type as this registration.
+    template <typename Filter>
+    FilterRegistration& After() {
+      return After({&Filter::kFilter});
+    }
+    // Ensure that this filter is placed *before* the filters listed here.
+    // By Build() time all filters listed here must also be registered against
+    // the same channel stack type as this registration.
+    template <typename Filter>
+    FilterRegistration& Before() {
+      return Before({&Filter::kFilter});
+    }
+
+    // Ensure that this filter is placed *after* the filters listed here.
+    // By Build() time all filters listed here must also be registered against
+    // the same channel stack type as this registration.
+    // TODO(ctiller): remove in favor of the version that does not mention
+    // grpc_channel_filter
     FilterRegistration& After(
         std::initializer_list<const grpc_channel_filter*> filters);
     // Ensure that this filter is placed *before* the filters listed here.
     // By Build() time all filters listed here must also be registered against
     // the same channel stack type as this registration.
+    // TODO(ctiller): remove in favor of the version that does not mention
+    // grpc_channel_filter
     FilterRegistration& Before(
         std::initializer_list<const grpc_channel_filter*> filters);
     // Add a predicate for this filters inclusion.
@@ -145,9 +164,16 @@ class ChannelInit {
     // This occurs first during channel build time.
     // The FilterRegistration methods can be called to declaratively define
     // properties of the filter being registered.
+    // TODO(ctiller): remove in favor of the version that does not mention
+    // grpc_channel_filter
     FilterRegistration& RegisterFilter(grpc_channel_stack_type type,
                                        const grpc_channel_filter* filter,
                                        SourceLocation registration_source = {});
+    template <typename Filter>
+    FilterRegistration& RegisterFilter(
+        grpc_channel_stack_type type, SourceLocation registration_source = {}) {
+      return RegisterFilter(type, &Filter::kFilter, registration_source);
+    }
 
     // Register a post processor for the builder.
     // These run after the main graph has been placed into the builder.
diff --git a/src/core/lib/surface/init.cc b/src/core/lib/surface/init.cc
index cf11feaf491..2c2b566cd46 100644
--- a/src/core/lib/surface/init.cc
+++ b/src/core/lib/surface/init.cc
@@ -67,25 +67,26 @@ static bool g_shutting_down ABSL_GUARDED_BY(g_init_mu) = false;
 namespace grpc_core {
 void RegisterSecurityFilters(CoreConfiguration::Builder* builder) {
   builder->channel_init()
-      ->RegisterFilter(GRPC_CLIENT_SUBCHANNEL, &ClientAuthFilter::kFilter)
+      ->RegisterFilter<ClientAuthFilter>(GRPC_CLIENT_SUBCHANNEL)
       .IfHasChannelArg(GRPC_ARG_SECURITY_CONNECTOR);
   builder->channel_init()
-      ->RegisterFilter(GRPC_CLIENT_DIRECT_CHANNEL, &ClientAuthFilter::kFilter)
+      ->RegisterFilter<ClientAuthFilter>(GRPC_CLIENT_DIRECT_CHANNEL)
       .IfHasChannelArg(GRPC_ARG_SECURITY_CONNECTOR);
   if (IsV3ServerAuthFilterEnabled()) {
     builder->channel_init()
-        ->RegisterFilter(GRPC_SERVER_CHANNEL, &ServerAuthFilter::kFilter)
+        ->RegisterFilter<ServerAuthFilter>(GRPC_SERVER_CHANNEL)
         .IfHasChannelArg(GRPC_SERVER_CREDENTIALS_ARG);
   } else {
     builder->channel_init()
-        ->RegisterFilter(GRPC_SERVER_CHANNEL, &LegacyServerAuthFilter::kFilter)
+        ->RegisterFilter<LegacyServerAuthFilter>(GRPC_SERVER_CHANNEL)
         .IfHasChannelArg(GRPC_SERVER_CREDENTIALS_ARG);
   }
   builder->channel_init()
       ->RegisterFilter(GRPC_SERVER_CHANNEL,
                        &GrpcServerAuthzFilter::kFilterVtable)
       .IfHasChannelArg(GRPC_ARG_AUTHORIZATION_POLICY_PROVIDER)
-      .After({&ServerAuthFilter::kFilter, &LegacyServerAuthFilter::kFilter});
+      .After<ServerAuthFilter>()
+      .After<LegacyServerAuthFilter>();
 }
 }  // namespace grpc_core
 
diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc
index 249dca33497..e53a609cfb1 100644
--- a/src/core/lib/surface/server.cc
+++ b/src/core/lib/surface/server.cc
@@ -51,6 +51,7 @@
 #include "src/core/lib/channel/channel_trace.h"
 #include "src/core/lib/channel/channelz.h"
 #include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/debug/stats.h"
 #include "src/core/lib/experiments/experiments.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/crash.h"
@@ -829,7 +830,11 @@ RefCountedPtr<channelz::ServerNode> CreateChannelzNode(
 Server::Server(const ChannelArgs& args)
     : channel_args_(args),
       channelz_node_(CreateChannelzNode(args)),
-      server_call_tracer_factory_(ServerCallTracerFactory::Get(args)) {}
+      server_call_tracer_factory_(ServerCallTracerFactory::Get(args)),
+      max_time_in_pending_queue_(Duration::Seconds(
+          channel_args_
+              .GetInt(GRPC_ARG_SERVER_MAX_UNREQUESTED_TIME_IN_SERVER_SECONDS)
+              .value_or(30))) {}
 
 Server::~Server() {
   // Remove the cq pollsets from the config_fetcher.
@@ -1293,6 +1298,20 @@ Server::ChannelData::~ChannelData() {
   }
 }
 
+Arena* Server::ChannelData::CreateArena() {
+  const auto initial_size = channel_->CallSizeEstimate();
+  global_stats().IncrementCallInitialSize(initial_size);
+  return Arena::Create(initial_size, channel_->allocator());
+}
+
+absl::StatusOr<CallInitiator> Server::ChannelData::CreateCall(
+    ClientMetadata& client_initial_metadata, Arena* arena) {
+  SetRegisteredMethodOnMetadata(client_initial_metadata);
+  auto call = MakeServerCall(server_.get(), channel_.get(), arena);
+  InitCall(call);
+  return CallInitiator(std::move(call));
+}
+
 void Server::ChannelData::InitTransport(RefCountedPtr<Server> server,
                                         RefCountedPtr<Channel> channel,
                                         size_t cq_idx, Transport* transport,
@@ -1325,13 +1344,7 @@ void Server::ChannelData::InitTransport(RefCountedPtr<Server> server,
   }
   if (transport->server_transport() != nullptr) {
     ++accept_stream_types;
-    transport->server_transport()->SetAcceptFunction(
-        [this](ClientMetadata& metadata) {
-          SetRegisteredMethodOnMetadata(metadata);
-          auto call = MakeServerCall(server_.get(), channel_.get());
-          InitCall(call);
-          return CallInitiator(std::move(call));
-        });
+    transport->server_transport()->SetAcceptor(this);
   }
   GPR_ASSERT(accept_stream_types == 1);
   op->start_connectivity_watch = MakeOrphanable<ConnectivityWatcher>(this);
diff --git a/src/core/lib/surface/server.h b/src/core/lib/surface/server.h
index 83d5bc6a8d3..4bb6fce3fae 100644
--- a/src/core/lib/surface/server.h
+++ b/src/core/lib/surface/server.h
@@ -218,7 +218,7 @@ class Server : public InternallyRefCounted<Server>,
   class AllocatingRequestMatcherBatch;
   class AllocatingRequestMatcherRegistered;
 
-  class ChannelData {
+  class ChannelData final : public ServerTransport::Acceptor {
    public:
     ChannelData() = default;
     ~ChannelData();
@@ -241,6 +241,10 @@ class Server : public InternallyRefCounted<Server>,
         grpc_channel_element* elem, CallArgs call_args, NextPromiseFactory);
     void InitCall(RefCountedPtr<CallSpineInterface> call);
 
+    Arena* CreateArena() override;
+    absl::StatusOr<CallInitiator> CreateCall(
+        ClientMetadata& client_initial_metadata, Arena* arena) override;
+
    private:
     class ConnectivityWatcher;
 
@@ -489,7 +493,7 @@ class Server : public InternallyRefCounted<Server>,
           0,
           channel_args_.GetInt(GRPC_ARG_SERVER_MAX_PENDING_REQUESTS_HARD_LIMIT)
               .value_or(3000)))};
-  Duration max_time_in_pending_queue_{Duration::Seconds(30)};
+  const Duration max_time_in_pending_queue_;
   absl::BitGen bitgen_ ABSL_GUARDED_BY(mu_call_);
 
   std::list<ChannelData*> channels_;
diff --git a/src/core/lib/transport/pid_controller.cc b/src/core/lib/transport/pid_controller.cc
deleted file mode 100644
index ca654b7d05c..00000000000
--- a/src/core/lib/transport/pid_controller.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-//
-// Copyright 2016 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-
-#include <grpc/support/port_platform.h>
-
-#include "src/core/lib/transport/pid_controller.h"
-
-#include "src/core/lib/gpr/useful.h"
-
-namespace grpc_core {
-
-PidController::PidController(const Args& args)
-    : last_control_value_(args.initial_control_value()), args_(args) {}
-
-double PidController::Update(double error, double dt) {
-  if (dt <= 0) return last_control_value_;
-  // integrate error using the trapezoid rule
-  error_integral_ += dt * (last_error_ + error) * 0.5;
-  error_integral_ =
-      Clamp(error_integral_, -args_.integral_range(), args_.integral_range());
-  double diff_error = (error - last_error_) / dt;
-  // calculate derivative of control value vs time
-  double dc_dt = args_.gain_p() * error + args_.gain_i() * error_integral_ +
-                 args_.gain_d() * diff_error;
-  // and perform trapezoidal integration
-  double new_control_value =
-      last_control_value_ + dt * (last_dc_dt_ + dc_dt) * 0.5;
-  new_control_value = Clamp(new_control_value, args_.min_control_value(),
-                            args_.max_control_value());
-  last_error_ = error;
-  last_dc_dt_ = dc_dt;
-  last_control_value_ = new_control_value;
-  return new_control_value;
-}
-
-}  // namespace grpc_core
diff --git a/src/core/lib/transport/pid_controller.h b/src/core/lib/transport/pid_controller.h
deleted file mode 100644
index 856c78c667e..00000000000
--- a/src/core/lib/transport/pid_controller.h
+++ /dev/null
@@ -1,116 +0,0 @@
-//
-//
-// Copyright 2016 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-
-#ifndef GRPC_SRC_CORE_LIB_TRANSPORT_PID_CONTROLLER_H
-#define GRPC_SRC_CORE_LIB_TRANSPORT_PID_CONTROLLER_H
-
-#include <grpc/support/port_platform.h>
-
-#include <limits>
-
-// \file Simple PID controller.
-// Implements a proportional-integral-derivative controller.
-// Used when we want to iteratively control a variable to converge some other
-// observed value to a 'set-point'.
-// Gains can be set to adjust sensitivity to current error (p), the integral
-// of error (i), and the derivative of error (d).
-
-namespace grpc_core {
-
-class PidController {
- public:
-  class Args {
-   public:
-    double gain_p() const { return gain_p_; }
-    double gain_i() const { return gain_i_; }
-    double gain_d() const { return gain_d_; }
-    double initial_control_value() const { return initial_control_value_; }
-    double min_control_value() const { return min_control_value_; }
-    double max_control_value() const { return max_control_value_; }
-    double integral_range() const { return integral_range_; }
-
-    Args& set_gain_p(double gain_p) {
-      gain_p_ = gain_p;
-      return *this;
-    }
-    Args& set_gain_i(double gain_i) {
-      gain_i_ = gain_i;
-      return *this;
-    }
-    Args& set_gain_d(double gain_d) {
-      gain_d_ = gain_d;
-      return *this;
-    }
-    Args& set_initial_control_value(double initial_control_value) {
-      initial_control_value_ = initial_control_value;
-      return *this;
-    }
-    Args& set_min_control_value(double min_control_value) {
-      min_control_value_ = min_control_value;
-      return *this;
-    }
-    Args& set_max_control_value(double max_control_value) {
-      max_control_value_ = max_control_value;
-      return *this;
-    }
-    Args& set_integral_range(double integral_range) {
-      integral_range_ = integral_range;
-      return *this;
-    }
-
-   private:
-    double gain_p_ = 0.0;
-    double gain_i_ = 0.0;
-    double gain_d_ = 0.0;
-    double initial_control_value_ = 0.0;
-    double min_control_value_ = std::numeric_limits<double>::min();
-    double max_control_value_ = std::numeric_limits<double>::max();
-    double integral_range_ = std::numeric_limits<double>::max();
-  };
-
-  explicit PidController(const Args& args);
-
-  /// Reset the controller internal state: useful when the environment has
-  /// changed significantly
-  void Reset() {
-    last_error_ = 0.0;
-    last_dc_dt_ = 0.0;
-    error_integral_ = 0.0;
-  }
-
-  /// Update the controller: given a current error estimate, and the time since
-  /// the last update, returns a new control value
-  double Update(double error, double dt);
-
-  /// Returns the last control value calculated
-  double last_control_value() const { return last_control_value_; }
-
-  /// Returns the current error integral (mostly for testing)
-  double error_integral() const { return error_integral_; }
-
- private:
-  double last_error_ = 0.0;
-  double error_integral_ = 0.0;
-  double last_control_value_;
-  double last_dc_dt_ = 0.0;
-  const Args args_;
-};
-
-}  // namespace grpc_core
-
-#endif  // GRPC_SRC_CORE_LIB_TRANSPORT_PID_CONTROLLER_H
diff --git a/src/core/lib/transport/promise_endpoint.h b/src/core/lib/transport/promise_endpoint.h
index 9627df75320..fbdc467cbb8 100644
--- a/src/core/lib/transport/promise_endpoint.h
+++ b/src/core/lib/transport/promise_endpoint.h
@@ -69,24 +69,26 @@ class PromiseEndpoint {
   auto Write(SliceBuffer data) {
     // Assert previous write finishes.
     GPR_ASSERT(!write_state_->complete.load(std::memory_order_relaxed));
-    // TODO(ladynana): Replace this with `SliceBufferCast<>` when it is
-    // available.
-    grpc_slice_buffer_swap(write_state_->buffer.c_slice_buffer(),
-                           data.c_slice_buffer());
-    // If `Write()` returns true immediately, the callback will not be called.
-    // We still need to call our callback to pick up the result.
-    write_state_->waker = Activity::current()->MakeNonOwningWaker();
-    const bool completed = endpoint_->Write(
-        [write_state = write_state_](absl::Status status) {
-          write_state->Complete(std::move(status));
-        },
-        &write_state_->buffer, nullptr /* uses default arguments */);
+    bool completed;
+    if (data.Length() == 0) {
+      completed = true;
+    } else {
+      // TODO(ladynana): Replace this with `SliceBufferCast<>` when it is
+      // available.
+      grpc_slice_buffer_swap(write_state_->buffer.c_slice_buffer(),
+                             data.c_slice_buffer());
+      // If `Write()` returns true immediately, the callback will not be called.
+      // We still need to call our callback to pick up the result.
+      write_state_->waker = Activity::current()->MakeNonOwningWaker();
+      completed = endpoint_->Write(
+          [write_state = write_state_](absl::Status status) {
+            write_state->Complete(std::move(status));
+          },
+          &write_state_->buffer, nullptr /* uses default arguments */);
+      if (completed) write_state_->waker = Waker();
+    }
     return If(
-        completed,
-        [this]() {
-          write_state_->waker = Waker();
-          return []() { return absl::OkStatus(); };
-        },
+        completed, []() { return []() { return absl::OkStatus(); }; },
         [this]() {
           return [write_state = write_state_]() -> Poll<absl::Status> {
             // If current write isn't finished return `Pending()`, else return
@@ -157,7 +159,7 @@ class PromiseEndpoint {
               grpc_slice_buffer_move_first(read_state->buffer.c_slice_buffer(),
                                            num_bytes, ret.c_slice_buffer());
               read_state->complete.store(false, std::memory_order_relaxed);
-              return ret;
+              return std::move(ret);
             }
             read_state->complete.store(false, std::memory_order_relaxed);
             return std::move(read_state->result);
diff --git a/src/core/lib/transport/transport.cc b/src/core/lib/transport/transport.cc
index ab405804065..bad5c4b8590 100644
--- a/src/core/lib/transport/transport.cc
+++ b/src/core/lib/transport/transport.cc
@@ -291,9 +291,8 @@ void ForwardCall(CallHandler call_handler, CallInitiator call_initiator,
                          return call_initiator.SpawnWaitable(
                              "send_message",
                              [msg = std::move(msg), call_initiator]() mutable {
-                               return call_initiator.CancelIfFails(Map(
-                                   call_initiator.PushMessage(std::move(msg)),
-                                   [](bool r) { return StatusFlag(r); }));
+                               return call_initiator.CancelIfFails(
+                                   call_initiator.PushMessage(std::move(msg)));
                              });
                        });
       });
@@ -317,8 +316,7 @@ void ForwardCall(CallHandler call_handler, CallInitiator call_initiator,
                           "recv_message",
                           [msg = std::move(msg), call_handler]() mutable {
                             return call_handler.CancelIfFails(
-                                Map(call_handler.PushMessage(std::move(msg)),
-                                    [](bool r) { return StatusFlag(r); }));
+                                call_handler.PushMessage(std::move(msg)));
                           });
                     }),
             ImmediateOkStatus())),
@@ -334,4 +332,10 @@ void ForwardCall(CallHandler call_handler, CallInitiator call_initiator,
   });
 }
 
+CallInitiatorAndHandler MakeCall(
+    grpc_event_engine::experimental::EventEngine* event_engine, Arena* arena) {
+  auto spine = CallSpine::Create(event_engine, arena);
+  return {CallInitiator(spine), CallHandler(spine)};
+}
+
 }  // namespace grpc_core
diff --git a/src/core/lib/transport/transport.h b/src/core/lib/transport/transport.h
index c9f138c8f09..5a7e09bdb43 100644
--- a/src/core/lib/transport/transport.h
+++ b/src/core/lib/transport/transport.h
@@ -258,6 +258,20 @@ class CallSpineInterface {
   virtual Pipe<MessageHandle>& server_to_client_messages() = 0;
   virtual Pipe<ServerMetadataHandle>& server_trailing_metadata() = 0;
   virtual Latch<ServerMetadataHandle>& cancel_latch() = 0;
+  // Add a callback to be called when server trailing metadata is received.
+  void OnDone(absl::AnyInvocable<void()> fn) {
+    if (on_done_ == nullptr) {
+      on_done_ = std::move(fn);
+      return;
+    }
+    on_done_ = [first = std::move(fn), next = std::move(on_done_)]() mutable {
+      first();
+      next();
+    };
+  }
+  void CallOnDone() {
+    if (on_done_ != nullptr) std::exchange(on_done_, nullptr)();
+  }
   virtual Party& party() = 0;
   virtual void IncrementRefCount() = 0;
   virtual void Unref() = 0;
@@ -276,6 +290,11 @@ class CallSpineInterface {
     auto& c = cancel_latch();
     if (c.is_set()) return absl::nullopt;
     c.Set(std::move(metadata));
+    CallOnDone();
+    client_initial_metadata().sender.CloseWithError();
+    server_initial_metadata().sender.CloseWithError();
+    client_to_server_messages().sender.CloseWithError();
+    server_to_client_messages().sender.CloseWithError();
     return absl::nullopt;
   }
 
@@ -325,11 +344,18 @@ class CallSpineInterface {
       }
     });
   }
+
+ private:
+  absl::AnyInvocable<void()> on_done_{nullptr};
 };
 
-class CallSpine final : public CallSpineInterface {
+class CallSpine final : public CallSpineInterface, public Party {
  public:
-  CallSpine() { Crash("unimplemented"); }
+  static RefCountedPtr<CallSpine> Create(
+      grpc_event_engine::experimental::EventEngine* event_engine,
+      Arena* arena) {
+    return RefCountedPtr<CallSpine>(arena->New<CallSpine>(event_engine, arena));
+  }
 
   Pipe<ClientMetadataHandle>& client_initial_metadata() override {
     return client_initial_metadata_;
@@ -347,23 +373,57 @@ class CallSpine final : public CallSpineInterface {
     return server_trailing_metadata_;
   }
   Latch<ServerMetadataHandle>& cancel_latch() override { return cancel_latch_; }
-  Party& party() override { Crash("unimplemented"); }
-  void IncrementRefCount() override { Crash("unimplemented"); }
-  void Unref() override { Crash("unimplemented"); }
+  Party& party() override { return *this; }
+  void IncrementRefCount() override { Party::IncrementRefCount(); }
+  void Unref() override { Party::Unref(); }
 
  private:
+  friend class Arena;
+  CallSpine(grpc_event_engine::experimental::EventEngine* event_engine,
+            Arena* arena)
+      : Party(arena, 1), event_engine_(event_engine) {}
+
+  class ScopedContext : public ScopedActivity,
+                        public promise_detail::Context<Arena> {
+   public:
+    explicit ScopedContext(CallSpine* spine)
+        : ScopedActivity(&spine->party()), Context<Arena>(spine->arena()) {}
+  };
+
+  bool RunParty() override {
+    ScopedContext context(this);
+    return Party::RunParty();
+  }
+
+  void PartyOver() override {
+    Arena* a = arena();
+    {
+      ScopedContext context(this);
+      CancelRemainingParticipants();
+      a->DestroyManagedNewObjects();
+    }
+    this->~CallSpine();
+    a->Destroy();
+  }
+
+  grpc_event_engine::experimental::EventEngine* event_engine() const override {
+    return event_engine_;
+  }
+
   // Initial metadata from client to server
-  Pipe<ClientMetadataHandle> client_initial_metadata_;
+  Pipe<ClientMetadataHandle> client_initial_metadata_{arena()};
   // Initial metadata from server to client
-  Pipe<ServerMetadataHandle> server_initial_metadata_;
+  Pipe<ServerMetadataHandle> server_initial_metadata_{arena()};
   // Messages travelling from the application to the transport.
-  Pipe<MessageHandle> client_to_server_messages_;
+  Pipe<MessageHandle> client_to_server_messages_{arena()};
   // Messages travelling from the transport to the application.
-  Pipe<MessageHandle> server_to_client_messages_;
+  Pipe<MessageHandle> server_to_client_messages_{arena()};
   // Trailing metadata from server to client
-  Pipe<ServerMetadataHandle> server_trailing_metadata_;
+  Pipe<ServerMetadataHandle> server_trailing_metadata_{arena()};
   // Latch that can be set to terminate the call
   Latch<ServerMetadataHandle> cancel_latch_;
+  // Event engine associated with this call
+  grpc_event_engine::experimental::EventEngine* const event_engine_;
 };
 
 class CallInitiator {
@@ -405,7 +465,14 @@ class CallInitiator {
 
   auto PushMessage(MessageHandle message) {
     GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
-    return spine_->client_to_server_messages().sender.Push(std::move(message));
+    return Map(
+        spine_->client_to_server_messages().sender.Push(std::move(message)),
+        [](bool r) { return StatusFlag(r); });
+  }
+
+  void FinishSends() {
+    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
+    spine_->client_to_server_messages().sender.Close();
   }
 
   template <typename Promise>
@@ -413,6 +480,12 @@ class CallInitiator {
     return spine_->CancelIfFails(std::move(promise));
   }
 
+  void Cancel() {
+    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
+    std::ignore =
+        spine_->Cancel(ServerMetadataFromStatus(absl::CancelledError()));
+  }
+
   template <typename PromiseFactory>
   void SpawnGuarded(absl::string_view name, PromiseFactory promise_factory) {
     spine_->SpawnGuarded(name, std::move(promise_factory));
@@ -428,8 +501,10 @@ class CallInitiator {
     return spine_->party().SpawnWaitable(name, std::move(promise_factory));
   }
 
+  Arena* arena() { return spine_->party().arena(); }
+
  private:
-  const RefCountedPtr<CallSpineInterface> spine_;
+  RefCountedPtr<CallSpineInterface> spine_;
 };
 
 class CallHandler {
@@ -447,14 +522,16 @@ class CallHandler {
                });
   }
 
-  auto PushServerInitialMetadata(ClientMetadataHandle md) {
+  auto PushServerInitialMetadata(ServerMetadataHandle md) {
     GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
     return Map(spine_->server_initial_metadata().sender.Push(std::move(md)),
                [](bool ok) { return StatusFlag(ok); });
   }
 
-  auto PushServerTrailingMetadata(ClientMetadataHandle md) {
+  auto PushServerTrailingMetadata(ServerMetadataHandle md) {
     GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
+    spine_->server_to_client_messages().sender.Close();
+    spine_->CallOnDone();
     return Map(spine_->server_trailing_metadata().sender.Push(std::move(md)),
                [](bool ok) { return StatusFlag(ok); });
   }
@@ -466,9 +543,18 @@ class CallHandler {
 
   auto PushMessage(MessageHandle message) {
     GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
-    return spine_->server_to_client_messages().sender.Push(std::move(message));
+    return Map(
+        spine_->server_to_client_messages().sender.Push(std::move(message)),
+        [](bool ok) { return StatusFlag(ok); });
   }
 
+  void Cancel(ServerMetadataHandle status) {
+    GPR_DEBUG_ASSERT(Activity::current() == &spine_->party());
+    std::ignore = spine_->Cancel(std::move(status));
+  }
+
+  void OnDone(absl::AnyInvocable<void()> fn) { spine_->OnDone(std::move(fn)); }
+
   template <typename Promise>
   auto CancelIfFails(Promise promise) {
     return spine_->CancelIfFails(std::move(promise));
@@ -489,8 +575,10 @@ class CallHandler {
     return spine_->party().SpawnWaitable(name, std::move(promise_factory));
   }
 
+  Arena* arena() { return spine_->party().arena(); }
+
  private:
-  const RefCountedPtr<CallSpineInterface> spine_;
+  RefCountedPtr<CallSpineInterface> spine_;
 };
 
 struct CallInitiatorAndHandler {
@@ -498,13 +586,16 @@ struct CallInitiatorAndHandler {
   CallHandler handler;
 };
 
+CallInitiatorAndHandler MakeCall(
+    grpc_event_engine::experimental::EventEngine* event_engine, Arena* arena);
+
 template <typename CallHalf>
-auto OutgoingMessages(CallHalf& h) {
+auto OutgoingMessages(CallHalf h) {
   struct Wrapper {
-    CallHalf& h;
+    CallHalf h;
     auto Next() { return h.PullMessage(); }
   };
-  return Wrapper{h};
+  return Wrapper{std::move(h)};
 }
 
 // Forward a call from `call_handler` to `call_initiator` (with initial metadata
@@ -925,14 +1016,24 @@ class ClientTransport {
 
 class ServerTransport {
  public:
-  // AcceptFunction takes initial metadata for a new call and returns a
-  // CallInitiator object for it, for the transport to use to communicate with
-  // the CallHandler object passed to the application.
-  using AcceptFunction =
-      absl::AnyInvocable<absl::StatusOr<CallInitiator>(ClientMetadata&) const>;
+  // Acceptor helps transports create calls.
+  class Acceptor {
+   public:
+    // Returns an arena that can be used to allocate memory for initial metadata
+    // parsing, and later passed to CreateCall() as the underlying arena for
+    // that call.
+    virtual Arena* CreateArena() = 0;
+    // Create a call at the server (or fail)
+    // arena must have been previously allocated by CreateArena()
+    virtual absl::StatusOr<CallInitiator> CreateCall(
+        ClientMetadata& client_initial_metadata, Arena* arena) = 0;
+
+   protected:
+    ~Acceptor() = default;
+  };
 
   // Called once slightly after transport setup to register the accept function.
-  virtual void SetAcceptFunction(AcceptFunction accept_function) = 0;
+  virtual void SetAcceptor(Acceptor* acceptor) = 0;
 
  protected:
   ~ServerTransport() = default;
diff --git a/src/core/tsi/ssl_transport_security.cc b/src/core/tsi/ssl_transport_security.cc
index 77fc1f38342..f85080be2b6 100644
--- a/src/core/tsi/ssl_transport_security.cc
+++ b/src/core/tsi/ssl_transport_security.cc
@@ -269,13 +269,14 @@ static tsi_result ssl_get_x509_common_name(X509* cert, unsigned char** utf8,
   X509_NAME* subject_name = X509_get_subject_name(cert);
   int utf8_returned_size = 0;
   if (subject_name == nullptr) {
-    gpr_log(GPR_INFO, "Could not get subject name from certificate.");
+    gpr_log(GPR_DEBUG, "Could not get subject name from certificate.");
     return TSI_NOT_FOUND;
   }
   common_name_index =
       X509_NAME_get_index_by_NID(subject_name, NID_commonName, -1);
   if (common_name_index == -1) {
-    gpr_log(GPR_INFO, "Could not get common name of subject from certificate.");
+    gpr_log(GPR_DEBUG,
+            "Could not get common name of subject from certificate.");
     return TSI_NOT_FOUND;
   }
   common_name_entry = X509_NAME_get_entry(subject_name, common_name_index);
diff --git a/src/cpp/client/channel_test_peer.cc b/src/cpp/client/channel_test_peer.cc
index e8b2f72c058..f694a749d16 100644
--- a/src/cpp/client/channel_test_peer.cc
+++ b/src/cpp/client/channel_test_peer.cc
@@ -29,10 +29,5 @@ int ChannelTestPeer::registered_calls() const {
       ->TestOnlyRegisteredCalls();
 }
 
-int ChannelTestPeer::registration_attempts() const {
-  return grpc_core::Channel::FromC(channel_->c_channel_)
-      ->TestOnlyRegistrationAttempts();
-}
-
 }  // namespace testing
 }  // namespace grpc
diff --git a/src/cpp/ext/csm/csm_observability.cc b/src/cpp/ext/csm/csm_observability.cc
index 625120ac2e2..de55e1e9d73 100644
--- a/src/cpp/ext/csm/csm_observability.cc
+++ b/src/cpp/ext/csm/csm_observability.cc
@@ -42,6 +42,58 @@
 #include "src/cpp/ext/otel/otel_plugin.h"
 
 namespace grpc {
+
+namespace internal {
+
+bool CsmServerSelector(const grpc_core::ChannelArgs& args) {
+  return args.GetBool(GRPC_ARG_XDS_ENABLED_SERVER).value_or(false);
+}
+
+bool CsmChannelTargetSelector(absl::string_view target) {
+  auto uri = grpc_core::URI::Parse(target);
+  if (!uri.ok()) {
+    gpr_log(GPR_ERROR, "Failed to parse URI: %s", std::string(target).c_str());
+    return false;
+  }
+  // CSM channels should have an "xds" scheme
+  if (uri->scheme() != "xds") {
+    return false;
+  }
+  // If set, the authority should be TD
+  if (!uri->authority().empty() &&
+      uri->authority() != "traffic-director-global.xds.googleapis.com") {
+    return false;
+  }
+  return true;
+}
+
+class CsmOpenTelemetryPluginOption
+    : public grpc::internal::InternalOpenTelemetryPluginOption {
+ public:
+  CsmOpenTelemetryPluginOption()
+      : labels_injector_(std::make_unique<internal::ServiceMeshLabelsInjector>(
+            google::cloud::otel::MakeResourceDetector()
+                ->Detect()
+                .GetAttributes())) {}
+
+  bool IsActiveOnClientChannel(absl::string_view target) const override {
+    return CsmChannelTargetSelector(target);
+  }
+
+  bool IsActiveOnServer(const grpc_core::ChannelArgs& args) const override {
+    return CsmServerSelector(args);
+  }
+
+  const grpc::internal::LabelsInjector* labels_injector() const override {
+    return labels_injector_.get();
+  }
+
+ private:
+  std::unique_ptr<internal::ServiceMeshLabelsInjector> labels_injector_;
+};
+
+}  // namespace internal
+
 namespace experimental {
 
 //
@@ -78,9 +130,7 @@ CsmObservabilityBuilder::SetGenericMethodAttributeFilter(
 }
 
 absl::StatusOr<CsmObservability> CsmObservabilityBuilder::BuildAndRegister() {
-  builder_->SetServerSelector([](const grpc_core::ChannelArgs& args) {
-    return args.GetBool(GRPC_ARG_XDS_ENABLED_SERVER).value_or(false);
-  });
+  builder_->SetServerSelector(internal::CsmServerSelector);
   builder_->SetTargetSelector(internal::CsmChannelTargetSelector);
   builder_->SetLabelsInjector(
       std::make_unique<internal::ServiceMeshLabelsInjector>(
@@ -91,27 +141,10 @@ absl::StatusOr<CsmObservability> CsmObservabilityBuilder::BuildAndRegister() {
   return CsmObservability();
 }
 
-}  // namespace experimental
-
-namespace internal {
-
-bool CsmChannelTargetSelector(absl::string_view target) {
-  auto uri = grpc_core::URI::Parse(target);
-  if (!uri.ok()) {
-    gpr_log(GPR_ERROR, "Failed to parse URI: %s", std::string(target).c_str());
-    return false;
-  }
-  // CSM channels should have an "xds" scheme
-  if (uri->scheme() != "xds") {
-    return false;
-  }
-  // If set, the authority should be TD
-  if (!uri->authority().empty() &&
-      uri->authority() != "traffic-director-global.xds.googleapis.com") {
-    return false;
-  }
-  return true;
+std::unique_ptr<OpenTelemetryPluginOption> MakeCsmOpenTelemetryPluginOption() {
+  return std::make_unique<grpc::internal::CsmOpenTelemetryPluginOption>();
 }
 
-}  // namespace internal
+}  // namespace experimental
+
 }  // namespace grpc
diff --git a/src/cpp/ext/csm/metadata_exchange.cc b/src/cpp/ext/csm/metadata_exchange.cc
index c1beaddb483..e0a34827658 100644
--- a/src/cpp/ext/csm/metadata_exchange.cc
+++ b/src/cpp/ext/csm/metadata_exchange.cc
@@ -404,7 +404,7 @@ ServiceMeshLabelsInjector::ServiceMeshLabelsInjector(
 }
 
 std::unique_ptr<LabelsIterable> ServiceMeshLabelsInjector::GetLabels(
-    grpc_metadata_batch* incoming_initial_metadata) {
+    grpc_metadata_batch* incoming_initial_metadata) const {
   auto peer_metadata =
       incoming_initial_metadata->Take(grpc_core::XEnvoyPeerMetadata());
   return std::make_unique<MeshLabelsIterable>(
@@ -414,7 +414,7 @@ std::unique_ptr<LabelsIterable> ServiceMeshLabelsInjector::GetLabels(
 
 void ServiceMeshLabelsInjector::AddLabels(
     grpc_metadata_batch* outgoing_initial_metadata,
-    LabelsIterable* labels_from_incoming_metadata) {
+    LabelsIterable* labels_from_incoming_metadata) const {
   // On the server, if the labels from incoming metadata did not have a
   // non-empty base64 encoded "x-envoy-peer-metadata", do not perform metadata
   // exchange.
diff --git a/src/cpp/ext/csm/metadata_exchange.h b/src/cpp/ext/csm/metadata_exchange.h
index 9205b39306f..c2c24ff2843 100644
--- a/src/cpp/ext/csm/metadata_exchange.h
+++ b/src/cpp/ext/csm/metadata_exchange.h
@@ -43,12 +43,12 @@ class ServiceMeshLabelsInjector : public LabelsInjector {
   // Read the incoming initial metadata to get the set of labels to be added to
   // metrics.
   std::unique_ptr<LabelsIterable> GetLabels(
-      grpc_metadata_batch* incoming_initial_metadata) override;
+      grpc_metadata_batch* incoming_initial_metadata) const override;
 
   // Modify the outgoing initial metadata with metadata information to be sent
   // to the peer.
   void AddLabels(grpc_metadata_batch* outgoing_initial_metadata,
-                 LabelsIterable* labels_from_incoming_metadata) override;
+                 LabelsIterable* labels_from_incoming_metadata) const override;
 
  private:
   std::vector<std::pair<absl::string_view, std::string>> local_labels_;
diff --git a/src/cpp/ext/filters/census/server_call_tracer.cc b/src/cpp/ext/filters/census/server_call_tracer.cc
index 20971ab18d2..33534b9a28e 100644
--- a/src/cpp/ext/filters/census/server_call_tracer.cc
+++ b/src/cpp/ext/filters/census/server_call_tracer.cc
@@ -265,7 +265,7 @@ void OpenCensusServerCallTracer::RecordEnd(
 
 grpc_core::ServerCallTracer*
 OpenCensusServerCallTracerFactory::CreateNewServerCallTracer(
-    grpc_core::Arena* arena) {
+    grpc_core::Arena* arena, const grpc_core::ChannelArgs& /*args*/) {
   return arena->ManagedNew<OpenCensusServerCallTracer>();
 }
 
diff --git a/src/cpp/ext/filters/census/server_call_tracer.h b/src/cpp/ext/filters/census/server_call_tracer.h
index 7eb95c62c1a..4a11b4e8c53 100644
--- a/src/cpp/ext/filters/census/server_call_tracer.h
+++ b/src/cpp/ext/filters/census/server_call_tracer.h
@@ -31,7 +31,7 @@ class OpenCensusServerCallTracerFactory
     : public grpc_core::ServerCallTracerFactory {
  public:
   grpc_core::ServerCallTracer* CreateNewServerCallTracer(
-      grpc_core::Arena* arena) override;
+      grpc_core::Arena* arena, const grpc_core::ChannelArgs& /*args*/) override;
 };
 
 }  // namespace internal
diff --git a/src/cpp/ext/otel/key_value_iterable.h b/src/cpp/ext/otel/key_value_iterable.h
index 9395326c53f..89d0e6a2630 100644
--- a/src/cpp/ext/otel/key_value_iterable.h
+++ b/src/cpp/ext/otel/key_value_iterable.h
@@ -50,9 +50,13 @@ class KeyValueIterable : public opentelemetry::common::KeyValueIterable {
  public:
   explicit KeyValueIterable(
       LabelsIterable* injected_labels_iterable,
+      const std::vector<std::unique_ptr<LabelsIterable>>&
+          injected_labels_from_plugin_options,
       absl::Span<const std::pair<absl::string_view, absl::string_view>>
           additional_labels)
       : injected_labels_iterable_(injected_labels_iterable),
+        injected_labels_from_plugin_options_(
+            injected_labels_from_plugin_options),
         additional_labels_(additional_labels) {}
 
   bool ForEachKeyValue(opentelemetry::nostd::function_ref<
@@ -68,6 +72,18 @@ class KeyValueIterable : public opentelemetry::common::KeyValueIterable {
         }
       }
     }
+    for (const auto& plugin_option_injected_iterable :
+         injected_labels_from_plugin_options_) {
+      if (plugin_option_injected_iterable != nullptr) {
+        plugin_option_injected_iterable->ResetIteratorPosition();
+        while (const auto& pair = plugin_option_injected_iterable->Next()) {
+          if (!callback(AbslStrViewToOpenTelemetryStrView(pair->first),
+                        AbslStrViewToOpenTelemetryStrView(pair->second))) {
+            return false;
+          }
+        }
+      }
+    }
     for (const auto& pair : additional_labels_) {
       if (!callback(AbslStrViewToOpenTelemetryStrView(pair.first),
                     AbslStrViewToOpenTelemetryStrView(pair.second))) {
@@ -78,14 +94,23 @@ class KeyValueIterable : public opentelemetry::common::KeyValueIterable {
   }
 
   size_t size() const noexcept override {
-    return (injected_labels_iterable_ != nullptr
-                ? injected_labels_iterable_->Size()
-                : 0) +
-           additional_labels_.size();
+    size_t size = injected_labels_iterable_ != nullptr
+                      ? injected_labels_iterable_->Size()
+                      : 0;
+    for (const auto& plugin_option_injected_iterable :
+         injected_labels_from_plugin_options_) {
+      if (plugin_option_injected_iterable != nullptr) {
+        size += plugin_option_injected_iterable->Size();
+      }
+    }
+    size += additional_labels_.size();
+    return size;
   }
 
  private:
   LabelsIterable* injected_labels_iterable_;
+  const std::vector<std::unique_ptr<LabelsIterable>>&
+      injected_labels_from_plugin_options_;
   absl::Span<const std::pair<absl::string_view, absl::string_view>>
       additional_labels_;
 };
diff --git a/src/cpp/ext/otel/otel_call_tracer.h b/src/cpp/ext/otel/otel_call_tracer.h
index 7544bc602a4..8b90c92835f 100644
--- a/src/cpp/ext/otel/otel_call_tracer.h
+++ b/src/cpp/ext/otel/otel_call_tracer.h
@@ -98,6 +98,8 @@ class OpenTelemetryCallTracer : public grpc_core::ClientCallTracer {
     // Start time (for measuring latency).
     absl::Time start_time_;
     std::unique_ptr<LabelsIterable> injected_labels_;
+    std::vector<std::unique_ptr<LabelsIterable>>
+        injected_labels_from_plugin_options_;
   };
 
   explicit OpenTelemetryCallTracer(OpenTelemetryClientFilter* parent,
diff --git a/src/cpp/ext/otel/otel_client_filter.cc b/src/cpp/ext/otel/otel_client_filter.cc
index 640699d589b..4587b3836d5 100644
--- a/src/cpp/ext/otel/otel_client_filter.cc
+++ b/src/cpp/ext/otel/otel_client_filter.cc
@@ -73,14 +73,8 @@ const grpc_channel_filter OpenTelemetryClientFilter::kFilter =
 
 absl::StatusOr<OpenTelemetryClientFilter> OpenTelemetryClientFilter::Create(
     const grpc_core::ChannelArgs& args, ChannelFilter::Args /*filter_args*/) {
-  std::string target = args.GetOwnedString(GRPC_ARG_SERVER_URI).value_or("");
-  // Use the original target string only if a filter on the attribute is not
-  // registered or if the filter returns true, otherwise use "other".
-  if (OpenTelemetryPluginState().target_attribute_filter == nullptr ||
-      OpenTelemetryPluginState().target_attribute_filter(target)) {
-    return OpenTelemetryClientFilter(std::move(target));
-  }
-  return OpenTelemetryClientFilter("other");
+  return OpenTelemetryClientFilter(
+      args.GetOwnedString(GRPC_ARG_SERVER_URI).value_or(""));
 }
 
 grpc_core::ArenaPromise<grpc_core::ServerMetadataHandle>
@@ -106,6 +100,19 @@ OpenTelemetryClientFilter::MakeCallPromise(
   return next_promise_factory(std::move(call_args));
 }
 
+OpenTelemetryClientFilter::OpenTelemetryClientFilter(std::string target)
+    : active_plugin_options_view_(
+          ActivePluginOptionsView::MakeForClient(target)) {
+  // Use the original target string only if a filter on the attribute is not
+  // registered or if the filter returns true, otherwise use "other".
+  if (OpenTelemetryPluginState().target_attribute_filter == nullptr ||
+      OpenTelemetryPluginState().target_attribute_filter(target)) {
+    filtered_target_ = std::move(target);
+  } else {
+    filtered_target_ = "other";
+  }
+}
+
 //
 // OpenTelemetryCallTracer::OpenTelemetryCallAttemptTracer
 //
@@ -120,11 +127,11 @@ OpenTelemetryCallTracer::OpenTelemetryCallAttemptTracer::
     std::array<std::pair<absl::string_view, absl::string_view>, 2>
         additional_labels = {
             {{OpenTelemetryMethodKey(), parent_->MethodForStats()},
-             {OpenTelemetryTargetKey(), parent_->parent_->target()}}};
+             {OpenTelemetryTargetKey(), parent_->parent_->filtered_target()}}};
     // We might not have all the injected labels that we want at this point, so
     // avoid recording a subset of injected labels here.
     OpenTelemetryPluginState().client.attempt.started->Add(
-        1, KeyValueIterable(/*injected_labels_iterable=*/nullptr,
+        1, KeyValueIterable(/*injected_labels_iterable=*/nullptr, {},
                             additional_labels));
   }
 }
@@ -135,6 +142,15 @@ void OpenTelemetryCallTracer::OpenTelemetryCallAttemptTracer::
     injected_labels_ = OpenTelemetryPluginState().labels_injector->GetLabels(
         recv_initial_metadata);
   }
+  parent_->parent_->active_plugin_options_view().ForEach(
+      [&](const InternalOpenTelemetryPluginOption& plugin_option,
+          size_t /*index*/) {
+        auto* labels_injector = plugin_option.labels_injector();
+        if (labels_injector != nullptr) {
+          injected_labels_from_plugin_options_.push_back(
+              labels_injector->GetLabels(recv_initial_metadata));
+        }
+      });
 }
 
 void OpenTelemetryCallTracer::OpenTelemetryCallAttemptTracer::
@@ -143,6 +159,14 @@ void OpenTelemetryCallTracer::OpenTelemetryCallAttemptTracer::
     OpenTelemetryPluginState().labels_injector->AddLabels(send_initial_metadata,
                                                           nullptr);
   }
+  parent_->parent_->active_plugin_options_view().ForEach(
+      [&](const InternalOpenTelemetryPluginOption& plugin_option,
+          size_t /*index*/) {
+        auto* labels_injector = plugin_option.labels_injector();
+        if (labels_injector != nullptr) {
+          labels_injector->AddLabels(send_initial_metadata, nullptr);
+        }
+      });
 }
 
 void OpenTelemetryCallTracer::OpenTelemetryCallAttemptTracer::RecordSendMessage(
@@ -178,11 +202,13 @@ void OpenTelemetryCallTracer::OpenTelemetryCallAttemptTracer::
   std::array<std::pair<absl::string_view, absl::string_view>, 3>
       additional_labels = {
           {{OpenTelemetryMethodKey(), parent_->MethodForStats()},
-           {OpenTelemetryTargetKey(), parent_->parent_->target()},
+           {OpenTelemetryTargetKey(), parent_->parent_->filtered_target()},
            {OpenTelemetryStatusKey(),
             grpc_status_code_to_string(
                 static_cast<grpc_status_code>(status.code()))}}};
-  KeyValueIterable labels(injected_labels_.get(), additional_labels);
+  KeyValueIterable labels(injected_labels_.get(),
+                          injected_labels_from_plugin_options_,
+                          additional_labels);
   if (OpenTelemetryPluginState().client.attempt.duration != nullptr) {
     OpenTelemetryPluginState().client.attempt.duration->Record(
         absl::ToDoubleSeconds(absl::Now() - start_time_), labels,
diff --git a/src/cpp/ext/otel/otel_client_filter.h b/src/cpp/ext/otel/otel_client_filter.h
index 9205da43511..7c0ddcc6f98 100644
--- a/src/cpp/ext/otel/otel_client_filter.h
+++ b/src/cpp/ext/otel/otel_client_filter.h
@@ -32,6 +32,7 @@
 #include "src/core/lib/channel/promise_based_filter.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/cpp/ext/otel/otel_plugin.h"
 
 namespace grpc {
 namespace internal {
@@ -48,13 +49,17 @@ class OpenTelemetryClientFilter : public grpc_core::ChannelFilter {
       grpc_core::CallArgs call_args,
       grpc_core::NextPromiseFactory next_promise_factory) override;
 
-  absl::string_view target() const { return target_; }
+  absl::string_view filtered_target() const { return filtered_target_; }
+
+  const ActivePluginOptionsView& active_plugin_options_view() const {
+    return active_plugin_options_view_;
+  }
 
  private:
-  explicit OpenTelemetryClientFilter(std::string target)
-      : target_(std::move(target)) {}
+  explicit OpenTelemetryClientFilter(std::string target);
 
-  std::string target_;
+  std::string filtered_target_;
+  ActivePluginOptionsView active_plugin_options_view_;
 };
 
 }  // namespace internal
diff --git a/src/cpp/ext/otel/otel_plugin.cc b/src/cpp/ext/otel/otel_plugin.cc
index 3a7c8bd0dd5..51b50615b31 100644
--- a/src/cpp/ext/otel/otel_plugin.cc
+++ b/src/cpp/ext/otel/otel_plugin.cc
@@ -89,6 +89,8 @@ absl::flat_hash_set<std::string> BaseMetrics() {
 OpenTelemetryPluginBuilderImpl::OpenTelemetryPluginBuilderImpl()
     : metrics_(BaseMetrics()) {}
 
+OpenTelemetryPluginBuilderImpl::~OpenTelemetryPluginBuilderImpl() = default;
+
 OpenTelemetryPluginBuilderImpl&
 OpenTelemetryPluginBuilderImpl::SetMeterProvider(
     std::shared_ptr<opentelemetry::metrics::MeterProvider> meter_provider) {
@@ -153,6 +155,14 @@ OpenTelemetryPluginBuilderImpl::SetServerSelector(
   return *this;
 }
 
+OpenTelemetryPluginBuilderImpl& OpenTelemetryPluginBuilderImpl::AddPluginOption(
+    std::unique_ptr<InternalOpenTelemetryPluginOption> option) {
+  // We allow a limit of 64 plugin options to be registered at this time.
+  GPR_ASSERT(plugin_options_.size() < 64);
+  plugin_options_.push_back(std::move(option));
+  return *this;
+}
+
 void OpenTelemetryPluginBuilderImpl::BuildAndRegisterGlobal() {
   opentelemetry::nostd::shared_ptr<opentelemetry::metrics::MeterProvider>
       meter_provider = meter_provider_;
@@ -239,6 +249,7 @@ void OpenTelemetryPluginBuilderImpl::BuildAndRegisterGlobal() {
   g_otel_plugin_state_->generic_method_attribute_filter =
       std::move(generic_method_attribute_filter_);
   g_otel_plugin_state_->meter_provider = std::move(meter_provider);
+  g_otel_plugin_state_->plugin_options = std::move(plugin_options_);
   grpc_core::ServerCallTracerFactory::RegisterGlobal(
       new grpc::internal::OpenTelemetryServerCallTracerFactory());
   grpc_core::CoreConfiguration::RegisterBuilder(
@@ -287,6 +298,8 @@ constexpr absl::string_view OpenTelemetryPluginBuilder::
 OpenTelemetryPluginBuilder::OpenTelemetryPluginBuilder()
     : impl_(std::make_unique<internal::OpenTelemetryPluginBuilderImpl>()) {}
 
+OpenTelemetryPluginBuilder::~OpenTelemetryPluginBuilder() = default;
+
 OpenTelemetryPluginBuilder& OpenTelemetryPluginBuilder::SetMeterProvider(
     std::shared_ptr<opentelemetry::metrics::MeterProvider> meter_provider) {
   impl_->SetMeterProvider(std::move(meter_provider));
@@ -310,6 +323,15 @@ OpenTelemetryPluginBuilder::SetGenericMethodAttributeFilter(
   return *this;
 }
 
+OpenTelemetryPluginBuilder& OpenTelemetryPluginBuilder::AddPluginOption(
+    std::unique_ptr<OpenTelemetryPluginOption> option) {
+  impl_->AddPluginOption(
+      std::unique_ptr<grpc::internal::InternalOpenTelemetryPluginOption>(
+          static_cast<grpc::internal::InternalOpenTelemetryPluginOption*>(
+              option.release())));
+  return *this;
+}
+
 void OpenTelemetryPluginBuilder::BuildAndRegisterGlobal() {
   impl_->BuildAndRegisterGlobal();
 }
diff --git a/src/cpp/ext/otel/otel_plugin.h b/src/cpp/ext/otel/otel_plugin.h
index 3476850a57b..0aa31779c13 100644
--- a/src/cpp/ext/otel/otel_plugin.h
+++ b/src/cpp/ext/otel/otel_plugin.h
@@ -24,6 +24,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <bitset>
 #include <memory>
 #include <string>
 #include <utility>
@@ -36,6 +37,8 @@
 #include "opentelemetry/metrics/sync_instruments.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 
+#include <grpcpp/ext/otel_plugin.h>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/transport/metadata_batch.h"
 
@@ -67,14 +70,27 @@ class LabelsInjector {
   // Read the incoming initial metadata to get the set of labels to be added to
   // metrics.
   virtual std::unique_ptr<LabelsIterable> GetLabels(
-      grpc_metadata_batch* incoming_initial_metadata) = 0;
+      grpc_metadata_batch* incoming_initial_metadata) const = 0;
 
   // Modify the outgoing initial metadata with metadata information to be sent
   // to the peer. On the server side, \a labels_from_incoming_metadata returned
   // from `GetLabels` should be provided as input here. On the client side, this
   // should be nullptr.
-  virtual void AddLabels(grpc_metadata_batch* outgoing_initial_metadata,
-                         LabelsIterable* labels_from_incoming_metadata) = 0;
+  virtual void AddLabels(
+      grpc_metadata_batch* outgoing_initial_metadata,
+      LabelsIterable* labels_from_incoming_metadata) const = 0;
+};
+
+class InternalOpenTelemetryPluginOption
+    : public grpc::experimental::OpenTelemetryPluginOption {
+ public:
+  ~InternalOpenTelemetryPluginOption() override = default;
+  // Determines whether a plugin option is active on a given channel target
+  virtual bool IsActiveOnClientChannel(absl::string_view target) const = 0;
+  // Determines whether a plugin option is active on a given server
+  virtual bool IsActiveOnServer(const grpc_core::ChannelArgs& args) const = 0;
+  // Returns the LabelsInjector used by this plugin option, nullptr if none.
+  virtual const grpc::internal::LabelsInjector* labels_injector() const = 0;
 };
 
 struct OpenTelemetryPluginState {
@@ -107,6 +123,8 @@ struct OpenTelemetryPluginState {
       generic_method_attribute_filter;
   absl::AnyInvocable<bool(const grpc_core::ChannelArgs& /*args*/) const>
       server_selector;
+  std::vector<std::unique_ptr<InternalOpenTelemetryPluginOption>>
+      plugin_options;
 };
 
 const struct OpenTelemetryPluginState& OpenTelemetryPluginState();
@@ -119,6 +137,7 @@ absl::string_view OpenTelemetryTargetKey();
 class OpenTelemetryPluginBuilderImpl {
  public:
   OpenTelemetryPluginBuilderImpl();
+  ~OpenTelemetryPluginBuilderImpl();
   // If `SetMeterProvider()` is not called, no metrics are collected.
   OpenTelemetryPluginBuilderImpl& SetMeterProvider(
       std::shared_ptr<opentelemetry::metrics::MeterProvider> meter_provider);
@@ -166,6 +185,8 @@ class OpenTelemetryPluginBuilderImpl {
   OpenTelemetryPluginBuilderImpl& SetGenericMethodAttributeFilter(
       absl::AnyInvocable<bool(absl::string_view /*generic_method*/) const>
           generic_method_attribute_filter);
+  OpenTelemetryPluginBuilderImpl& AddPluginOption(
+      std::unique_ptr<InternalOpenTelemetryPluginOption> option);
   void BuildAndRegisterGlobal();
 
  private:
@@ -179,6 +200,52 @@ class OpenTelemetryPluginBuilderImpl {
       generic_method_attribute_filter_;
   absl::AnyInvocable<bool(const grpc_core::ChannelArgs& /*args*/) const>
       server_selector_;
+  std::vector<std::unique_ptr<InternalOpenTelemetryPluginOption>>
+      plugin_options_;
+};
+
+// Creates a convenience wrapper to help iterate over only those plugin options
+// that are active over a given channel/server.
+class ActivePluginOptionsView {
+ public:
+  static ActivePluginOptionsView MakeForClient(absl::string_view target) {
+    return ActivePluginOptionsView(
+        [target](const InternalOpenTelemetryPluginOption& plugin_option) {
+          return plugin_option.IsActiveOnClientChannel(target);
+        });
+  }
+
+  static ActivePluginOptionsView MakeForServer(
+      const grpc_core::ChannelArgs& args) {
+    return ActivePluginOptionsView(
+        [&args](const InternalOpenTelemetryPluginOption& plugin_option) {
+          return plugin_option.IsActiveOnServer(args);
+        });
+  }
+
+  void ForEach(
+      absl::FunctionRef<void(const InternalOpenTelemetryPluginOption&, size_t)>
+          func) const {
+    for (size_t i = 0; i < OpenTelemetryPluginState().plugin_options.size();
+         ++i) {
+      const auto& plugin_option = OpenTelemetryPluginState().plugin_options[i];
+      if (active_mask_[i]) func(*plugin_option, i);
+    }
+  }
+
+ private:
+  explicit ActivePluginOptionsView(
+      absl::FunctionRef<bool(const InternalOpenTelemetryPluginOption&)> func) {
+    for (size_t i = 0; i < OpenTelemetryPluginState().plugin_options.size();
+         ++i) {
+      const auto& plugin_option = OpenTelemetryPluginState().plugin_options[i];
+      if (plugin_option != nullptr && func(*plugin_option)) {
+        active_mask_.set(i);
+      }
+    }
+  }
+
+  std::bitset<64> active_mask_;
 };
 
 }  // namespace internal
diff --git a/src/cpp/ext/otel/otel_server_call_tracer.cc b/src/cpp/ext/otel/otel_server_call_tracer.cc
index ab7f3a993c3..7fa40c6ccc9 100644
--- a/src/cpp/ext/otel/otel_server_call_tracer.cc
+++ b/src/cpp/ext/otel/otel_server_call_tracer.cc
@@ -56,7 +56,12 @@ namespace {
 
 class OpenTelemetryServerCallTracer : public grpc_core::ServerCallTracer {
  public:
-  OpenTelemetryServerCallTracer() : start_time_(absl::Now()) {}
+  explicit OpenTelemetryServerCallTracer(const grpc_core::ChannelArgs& args)
+      : start_time_(absl::Now()),
+        active_plugin_options_view_(
+            ActivePluginOptionsView::MakeForServer(args)),
+        injected_labels_from_plugin_options_(
+            OpenTelemetryPluginState().plugin_options.size()) {}
 
   std::string TraceId() override {
     // Not implemented
@@ -81,6 +86,16 @@ class OpenTelemetryServerCallTracer : public grpc_core::ServerCallTracer {
       OpenTelemetryPluginState().labels_injector->AddLabels(
           send_initial_metadata, injected_labels_.get());
     }
+    active_plugin_options_view_.ForEach(
+        [&](const InternalOpenTelemetryPluginOption& plugin_option,
+            size_t index) {
+          auto* labels_injector = plugin_option.labels_injector();
+          if (labels_injector != nullptr) {
+            labels_injector->AddLabels(
+                send_initial_metadata,
+                injected_labels_from_plugin_options_[index].get());
+          }
+        });
   }
 
   void RecordSendTrailingMetadata(
@@ -148,6 +163,11 @@ class OpenTelemetryServerCallTracer : public grpc_core::ServerCallTracer {
   grpc_core::Slice path_;
   std::unique_ptr<LabelsIterable> injected_labels_;
   bool registered_method_;
+  ActivePluginOptionsView active_plugin_options_view_;
+  // TODO(yashykt): It's wasteful to do this per call. When we re-haul the stats
+  // infrastructure, this should move to be done per server.
+  std::vector<std::unique_ptr<LabelsIterable>>
+      injected_labels_from_plugin_options_;
 };
 
 void OpenTelemetryServerCallTracer::RecordReceivedInitialMetadata(
@@ -158,6 +178,15 @@ void OpenTelemetryServerCallTracer::RecordReceivedInitialMetadata(
     injected_labels_ = OpenTelemetryPluginState().labels_injector->GetLabels(
         recv_initial_metadata);
   }
+  active_plugin_options_view_.ForEach(
+      [&](const InternalOpenTelemetryPluginOption& plugin_option,
+          size_t index) {
+        auto* labels_injector = plugin_option.labels_injector();
+        if (labels_injector != nullptr) {
+          injected_labels_from_plugin_options_[index] =
+              labels_injector->GetLabels(recv_initial_metadata);
+        }
+      });
   registered_method_ =
       recv_initial_metadata->get(grpc_core::GrpcRegisteredMethod())
           .value_or(nullptr) != nullptr;
@@ -167,7 +196,7 @@ void OpenTelemetryServerCallTracer::RecordReceivedInitialMetadata(
     // We might not have all the injected labels that we want at this point, so
     // avoid recording a subset of injected labels here.
     OpenTelemetryPluginState().server.call.started->Add(
-        1, KeyValueIterable(/*injected_labels_iterable=*/nullptr,
+        1, KeyValueIterable(/*injected_labels_iterable=*/nullptr, {},
                             additional_labels));
   }
 }
@@ -186,7 +215,9 @@ void OpenTelemetryServerCallTracer::RecordEnd(
           {{OpenTelemetryMethodKey(), MethodForStats()},
            {OpenTelemetryStatusKey(),
             grpc_status_code_to_string(final_info->final_status)}}};
-  KeyValueIterable labels(injected_labels_.get(), additional_labels);
+  KeyValueIterable labels(injected_labels_.get(),
+                          injected_labels_from_plugin_options_,
+                          additional_labels);
   if (OpenTelemetryPluginState().server.call.duration != nullptr) {
     OpenTelemetryPluginState().server.call.duration->Record(
         absl::ToDoubleSeconds(elapsed_time_), labels,
@@ -216,8 +247,8 @@ void OpenTelemetryServerCallTracer::RecordEnd(
 
 grpc_core::ServerCallTracer*
 OpenTelemetryServerCallTracerFactory::CreateNewServerCallTracer(
-    grpc_core::Arena* arena) {
-  return arena->ManagedNew<OpenTelemetryServerCallTracer>();
+    grpc_core::Arena* arena, const grpc_core::ChannelArgs& args) {
+  return arena->ManagedNew<OpenTelemetryServerCallTracer>(args);
 }
 
 bool OpenTelemetryServerCallTracerFactory::IsServerTraced(
diff --git a/src/cpp/ext/otel/otel_server_call_tracer.h b/src/cpp/ext/otel/otel_server_call_tracer.h
index 2ce422e9d5a..c8cea43d4d0 100644
--- a/src/cpp/ext/otel/otel_server_call_tracer.h
+++ b/src/cpp/ext/otel/otel_server_call_tracer.h
@@ -32,7 +32,8 @@ class OpenTelemetryServerCallTracerFactory
     : public grpc_core::ServerCallTracerFactory {
  public:
   grpc_core::ServerCallTracer* CreateNewServerCallTracer(
-      grpc_core::Arena* arena) override;
+      grpc_core::Arena* arena,
+      const grpc_core::ChannelArgs& channel_args) override;
 
   bool IsServerTraced(const grpc_core::ChannelArgs& args) override;
 };
diff --git a/src/php/tests/MemoryLeakTest/ignore_leaks.supp b/src/php/tests/MemoryLeakTest/ignore_leaks.supp
deleted file mode 100644
index dccd088d905..00000000000
--- a/src/php/tests/MemoryLeakTest/ignore_leaks.supp
+++ /dev/null
@@ -1,13 +0,0 @@
-{                                   
-   static Posix NativeDNSResolver
-   Memcheck:Leak                                                                                                                                                                                                                                                                                                                                                                            
-   match-leak-kinds: possible                               
-   ...
-   fun:pthread_create@@GLIBC_2.2.5
-   ...
-   fun:_ZN17grpc_event_engine12experimental21GetDefaultEventEngineEv                                                                                                                          
-   fun:_ZN9grpc_core17NativeDNSResolverC1Ev
-   fun:_ZN9grpc_core17NativeDNSResolver11GetOrCreateEv
-   ...
-}
-
diff --git a/src/python/.gitignore b/src/python/.gitignore
index 095ab8bbae1..61363e8cb8d 100644
--- a/src/python/.gitignore
+++ b/src/python/.gitignore
@@ -1,4 +1,6 @@
-gens/
+build/
+grpc_root/
+third_party/
 *_pb2.py
 *_pb2.pyi
 *_pb2_grpc.py
diff --git a/src/python/grpcio/grpc/__init__.py b/src/python/grpcio/grpc/__init__.py
index 9f07579ab86..e0ec581f9d4 100644
--- a/src/python/grpcio/grpc/__init__.py
+++ b/src/python/grpcio/grpc/__init__.py
@@ -1000,7 +1000,11 @@ class Channel(abc.ABC):
 
     @abc.abstractmethod
     def unary_unary(
-        self, method, request_serializer=None, response_deserializer=None
+        self,
+        method,
+        request_serializer=None,
+        response_deserializer=None,
+        _registered_method=False,
     ):
         """Creates a UnaryUnaryMultiCallable for a unary-unary method.
 
@@ -1011,6 +1015,8 @@ class Channel(abc.ABC):
           response_deserializer: Optional :term:`deserializer` for deserializing the
             response message. Response goes undeserialized in case None
             is passed.
+          _registered_method: Implementation Private. A bool representing whether the method
+            is registered.
 
         Returns:
           A UnaryUnaryMultiCallable value for the named unary-unary method.
@@ -1019,7 +1025,11 @@ class Channel(abc.ABC):
 
     @abc.abstractmethod
     def unary_stream(
-        self, method, request_serializer=None, response_deserializer=None
+        self,
+        method,
+        request_serializer=None,
+        response_deserializer=None,
+        _registered_method=False,
     ):
         """Creates a UnaryStreamMultiCallable for a unary-stream method.
 
@@ -1030,6 +1040,8 @@ class Channel(abc.ABC):
           response_deserializer: Optional :term:`deserializer` for deserializing the
             response message. Response goes undeserialized in case None is
             passed.
+          _registered_method: Implementation Private. A bool representing whether the method
+            is registered.
 
         Returns:
           A UnaryStreamMultiCallable value for the name unary-stream method.
@@ -1038,7 +1050,11 @@ class Channel(abc.ABC):
 
     @abc.abstractmethod
     def stream_unary(
-        self, method, request_serializer=None, response_deserializer=None
+        self,
+        method,
+        request_serializer=None,
+        response_deserializer=None,
+        _registered_method=False,
     ):
         """Creates a StreamUnaryMultiCallable for a stream-unary method.
 
@@ -1049,6 +1065,8 @@ class Channel(abc.ABC):
           response_deserializer: Optional :term:`deserializer` for deserializing the
             response message. Response goes undeserialized in case None is
             passed.
+          _registered_method: Implementation Private. A bool representing whether the method
+            is registered.
 
         Returns:
           A StreamUnaryMultiCallable value for the named stream-unary method.
@@ -1057,7 +1075,11 @@ class Channel(abc.ABC):
 
     @abc.abstractmethod
     def stream_stream(
-        self, method, request_serializer=None, response_deserializer=None
+        self,
+        method,
+        request_serializer=None,
+        response_deserializer=None,
+        _registered_method=False,
     ):
         """Creates a StreamStreamMultiCallable for a stream-stream method.
 
@@ -1068,6 +1090,8 @@ class Channel(abc.ABC):
           response_deserializer: Optional :term:`deserializer` for deserializing the
             response message. Response goes undeserialized in case None
             is passed.
+          _registered_method: Implementation Private. A bool representing whether the method
+            is registered.
 
         Returns:
           A StreamStreamMultiCallable value for the named stream-stream method.
diff --git a/src/python/grpcio/grpc/_channel.py b/src/python/grpcio/grpc/_channel.py
index fef906e51d5..bf29982ca65 100644
--- a/src/python/grpcio/grpc/_channel.py
+++ b/src/python/grpcio/grpc/_channel.py
@@ -24,6 +24,7 @@ import types
 from typing import (
     Any,
     Callable,
+    Dict,
     Iterator,
     List,
     Optional,
@@ -132,6 +133,7 @@ class _RPCState(object):
     rpc_start_time: Optional[float]  # In relative seconds
     rpc_end_time: Optional[float]  # In relative seconds
     method: Optional[str]
+    target: Optional[str]
 
     def __init__(
         self,
@@ -163,6 +165,7 @@ class _RPCState(object):
         self.rpc_start_time = None
         self.rpc_end_time = None
         self.method = None
+        self.target = None
 
         # The semantics of grpc.Future.cancel and grpc.Future.cancelled are
         # slightly wonky, so they have to be tracked separately from the rest of the
@@ -1048,9 +1051,21 @@ class _UnaryUnaryMultiCallable(grpc.UnaryUnaryMultiCallable):
     _channel: cygrpc.Channel
     _managed_call: IntegratedCallFactory
     _method: bytes
+    _target: bytes
     _request_serializer: Optional[SerializingFunction]
     _response_deserializer: Optional[DeserializingFunction]
     _context: Any
+    _registered_call_handle: Optional[int]
+
+    __slots__ = [
+        "_channel",
+        "_managed_call",
+        "_method",
+        "_target",
+        "_request_serializer",
+        "_response_deserializer",
+        "_context",
+    ]
 
     # pylint: disable=too-many-arguments
     def __init__(
@@ -1058,15 +1073,19 @@ class _UnaryUnaryMultiCallable(grpc.UnaryUnaryMultiCallable):
         channel: cygrpc.Channel,
         managed_call: IntegratedCallFactory,
         method: bytes,
+        target: bytes,
         request_serializer: Optional[SerializingFunction],
         response_deserializer: Optional[DeserializingFunction],
+        _registered_call_handle: Optional[int],
     ):
         self._channel = channel
         self._managed_call = managed_call
         self._method = method
+        self._target = target
         self._request_serializer = request_serializer
         self._response_deserializer = response_deserializer
         self._context = cygrpc.build_census_context()
+        self._registered_call_handle = _registered_call_handle
 
     def _prepare(
         self,
@@ -1123,6 +1142,7 @@ class _UnaryUnaryMultiCallable(grpc.UnaryUnaryMultiCallable):
         else:
             state.rpc_start_time = time.perf_counter()
             state.method = _common.decode(self._method)
+            state.target = _common.decode(self._target)
             call = self._channel.segregated_call(
                 cygrpc.PropagationConstants.GRPC_PROPAGATE_DEFAULTS,
                 self._method,
@@ -1137,6 +1157,7 @@ class _UnaryUnaryMultiCallable(grpc.UnaryUnaryMultiCallable):
                     ),
                 ),
                 self._context,
+                self._registered_call_handle,
             )
             event = call.next_event()
             _handle_event(event, state, self._response_deserializer)
@@ -1194,6 +1215,7 @@ class _UnaryUnaryMultiCallable(grpc.UnaryUnaryMultiCallable):
             event_handler = _event_handler(state, self._response_deserializer)
             state.rpc_start_time = time.perf_counter()
             state.method = _common.decode(self._method)
+            state.target = _common.decode(self._target)
             call = self._managed_call(
                 cygrpc.PropagationConstants.GRPC_PROPAGATE_DEFAULTS,
                 self._method,
@@ -1204,6 +1226,7 @@ class _UnaryUnaryMultiCallable(grpc.UnaryUnaryMultiCallable):
                 (operations,),
                 event_handler,
                 self._context,
+                self._registered_call_handle,
             )
             return _MultiThreadedRendezvous(
                 state, call, self._response_deserializer, deadline
@@ -1213,23 +1236,38 @@ class _UnaryUnaryMultiCallable(grpc.UnaryUnaryMultiCallable):
 class _SingleThreadedUnaryStreamMultiCallable(grpc.UnaryStreamMultiCallable):
     _channel: cygrpc.Channel
     _method: bytes
+    _target: bytes
     _request_serializer: Optional[SerializingFunction]
     _response_deserializer: Optional[DeserializingFunction]
     _context: Any
+    _registered_call_handle: Optional[int]
+
+    __slots__ = [
+        "_channel",
+        "_method",
+        "_target",
+        "_request_serializer",
+        "_response_deserializer",
+        "_context",
+    ]
 
     # pylint: disable=too-many-arguments
     def __init__(
         self,
         channel: cygrpc.Channel,
         method: bytes,
+        target: bytes,
         request_serializer: SerializingFunction,
         response_deserializer: DeserializingFunction,
+        _registered_call_handle: Optional[int],
     ):
         self._channel = channel
         self._method = method
+        self._target = target
         self._request_serializer = request_serializer
         self._response_deserializer = response_deserializer
         self._context = cygrpc.build_census_context()
+        self._registered_call_handle = _registered_call_handle
 
     def __call__(  # pylint: disable=too-many-locals
         self,
@@ -1278,6 +1316,7 @@ class _SingleThreadedUnaryStreamMultiCallable(grpc.UnaryStreamMultiCallable):
         operations_and_tags = tuple((ops, None) for ops in operations)
         state.rpc_start_time = time.perf_counter()
         state.method = _common.decode(self._method)
+        state.target = _common.decode(self._target)
         call = self._channel.segregated_call(
             cygrpc.PropagationConstants.GRPC_PROPAGATE_DEFAULTS,
             self._method,
@@ -1287,6 +1326,7 @@ class _SingleThreadedUnaryStreamMultiCallable(grpc.UnaryStreamMultiCallable):
             call_credentials,
             operations_and_tags,
             self._context,
+            self._registered_call_handle,
         )
         return _SingleThreadedRendezvous(
             state, call, self._response_deserializer, deadline
@@ -1297,9 +1337,21 @@ class _UnaryStreamMultiCallable(grpc.UnaryStreamMultiCallable):
     _channel: cygrpc.Channel
     _managed_call: IntegratedCallFactory
     _method: bytes
+    _target: bytes
     _request_serializer: Optional[SerializingFunction]
     _response_deserializer: Optional[DeserializingFunction]
     _context: Any
+    _registered_call_handle: Optional[int]
+
+    __slots__ = [
+        "_channel",
+        "_managed_call",
+        "_method",
+        "_target",
+        "_request_serializer",
+        "_response_deserializer",
+        "_context",
+    ]
 
     # pylint: disable=too-many-arguments
     def __init__(
@@ -1307,15 +1359,19 @@ class _UnaryStreamMultiCallable(grpc.UnaryStreamMultiCallable):
         channel: cygrpc.Channel,
         managed_call: IntegratedCallFactory,
         method: bytes,
+        target: bytes,
         request_serializer: SerializingFunction,
         response_deserializer: DeserializingFunction,
+        _registered_call_handle: Optional[int],
     ):
         self._channel = channel
         self._managed_call = managed_call
         self._method = method
+        self._target = target
         self._request_serializer = request_serializer
         self._response_deserializer = response_deserializer
         self._context = cygrpc.build_census_context()
+        self._registered_call_handle = _registered_call_handle
 
     def __call__(  # pylint: disable=too-many-locals
         self,
@@ -1354,6 +1410,7 @@ class _UnaryStreamMultiCallable(grpc.UnaryStreamMultiCallable):
             )
             state.rpc_start_time = time.perf_counter()
             state.method = _common.decode(self._method)
+            state.target = _common.decode(self._target)
             call = self._managed_call(
                 cygrpc.PropagationConstants.GRPC_PROPAGATE_DEFAULTS,
                 self._method,
@@ -1364,6 +1421,7 @@ class _UnaryStreamMultiCallable(grpc.UnaryStreamMultiCallable):
                 operations,
                 _event_handler(state, self._response_deserializer),
                 self._context,
+                self._registered_call_handle,
             )
             return _MultiThreadedRendezvous(
                 state, call, self._response_deserializer, deadline
@@ -1374,9 +1432,21 @@ class _StreamUnaryMultiCallable(grpc.StreamUnaryMultiCallable):
     _channel: cygrpc.Channel
     _managed_call: IntegratedCallFactory
     _method: bytes
+    _target: bytes
     _request_serializer: Optional[SerializingFunction]
     _response_deserializer: Optional[DeserializingFunction]
     _context: Any
+    _registered_call_handle: Optional[int]
+
+    __slots__ = [
+        "_channel",
+        "_managed_call",
+        "_method",
+        "_target",
+        "_request_serializer",
+        "_response_deserializer",
+        "_context",
+    ]
 
     # pylint: disable=too-many-arguments
     def __init__(
@@ -1384,15 +1454,19 @@ class _StreamUnaryMultiCallable(grpc.StreamUnaryMultiCallable):
         channel: cygrpc.Channel,
         managed_call: IntegratedCallFactory,
         method: bytes,
+        target: bytes,
         request_serializer: Optional[SerializingFunction],
         response_deserializer: Optional[DeserializingFunction],
+        _registered_call_handle: Optional[int],
     ):
         self._channel = channel
         self._managed_call = managed_call
         self._method = method
+        self._target = target
         self._request_serializer = request_serializer
         self._response_deserializer = response_deserializer
         self._context = cygrpc.build_census_context()
+        self._registered_call_handle = _registered_call_handle
 
     def _blocking(
         self,
@@ -1413,6 +1487,7 @@ class _StreamUnaryMultiCallable(grpc.StreamUnaryMultiCallable):
         )
         state.rpc_start_time = time.perf_counter()
         state.method = _common.decode(self._method)
+        state.target = _common.decode(self._target)
         call = self._channel.segregated_call(
             cygrpc.PropagationConstants.GRPC_PROPAGATE_DEFAULTS,
             self._method,
@@ -1424,6 +1499,7 @@ class _StreamUnaryMultiCallable(grpc.StreamUnaryMultiCallable):
                 augmented_metadata, initial_metadata_flags
             ),
             self._context,
+            self._registered_call_handle,
         )
         _consume_request_iterator(
             request_iterator, state, call, self._request_serializer, None
@@ -1501,6 +1577,7 @@ class _StreamUnaryMultiCallable(grpc.StreamUnaryMultiCallable):
         )
         state.rpc_start_time = time.perf_counter()
         state.method = _common.decode(self._method)
+        state.target = _common.decode(self._target)
         call = self._managed_call(
             cygrpc.PropagationConstants.GRPC_PROPAGATE_DEFAULTS,
             self._method,
@@ -1513,6 +1590,7 @@ class _StreamUnaryMultiCallable(grpc.StreamUnaryMultiCallable):
             ),
             event_handler,
             self._context,
+            self._registered_call_handle,
         )
         _consume_request_iterator(
             request_iterator,
@@ -1530,9 +1608,21 @@ class _StreamStreamMultiCallable(grpc.StreamStreamMultiCallable):
     _channel: cygrpc.Channel
     _managed_call: IntegratedCallFactory
     _method: bytes
+    _target: bytes
     _request_serializer: Optional[SerializingFunction]
     _response_deserializer: Optional[DeserializingFunction]
     _context: Any
+    _registered_call_handle: Optional[int]
+
+    __slots__ = [
+        "_channel",
+        "_managed_call",
+        "_method",
+        "_target",
+        "_request_serializer",
+        "_response_deserializer",
+        "_context",
+    ]
 
     # pylint: disable=too-many-arguments
     def __init__(
@@ -1540,15 +1630,19 @@ class _StreamStreamMultiCallable(grpc.StreamStreamMultiCallable):
         channel: cygrpc.Channel,
         managed_call: IntegratedCallFactory,
         method: bytes,
-        request_serializer: Optional[SerializingFunction] = None,
-        response_deserializer: Optional[DeserializingFunction] = None,
+        target: bytes,
+        request_serializer: Optional[SerializingFunction],
+        response_deserializer: Optional[DeserializingFunction],
+        _registered_call_handle: Optional[int],
     ):
         self._channel = channel
         self._managed_call = managed_call
         self._method = method
+        self._target = target
         self._request_serializer = request_serializer
         self._response_deserializer = response_deserializer
         self._context = cygrpc.build_census_context()
+        self._registered_call_handle = _registered_call_handle
 
     def __call__(
         self,
@@ -1579,6 +1673,7 @@ class _StreamStreamMultiCallable(grpc.StreamStreamMultiCallable):
         event_handler = _event_handler(state, self._response_deserializer)
         state.rpc_start_time = time.perf_counter()
         state.method = _common.decode(self._method)
+        state.target = _common.decode(self._target)
         call = self._managed_call(
             cygrpc.PropagationConstants.GRPC_PROPAGATE_DEFAULTS,
             self._method,
@@ -1589,6 +1684,7 @@ class _StreamStreamMultiCallable(grpc.StreamStreamMultiCallable):
             operations,
             event_handler,
             self._context,
+            self._registered_call_handle,
         )
         _consume_request_iterator(
             request_iterator,
@@ -1678,7 +1774,8 @@ def _channel_managed_call_management(state: _ChannelCallState):
         credentials: Optional[cygrpc.CallCredentials],
         operations: Sequence[Sequence[cygrpc.Operation]],
         event_handler: UserTag,
-        context,
+        context: Any,
+        _registered_call_handle: Optional[int],
     ) -> cygrpc.IntegratedCall:
         """Creates a cygrpc.IntegratedCall.
 
@@ -1695,6 +1792,8 @@ def _channel_managed_call_management(state: _ChannelCallState):
           event_handler: A behavior to call to handle the events resultant from
             the operations on the call.
           context: Context object for distributed tracing.
+          _registered_call_handle: An int representing the call handle of the
+            method, or None if the method is not registered.
         Returns:
           A cygrpc.IntegratedCall with which to conduct an RPC.
         """
@@ -1715,6 +1814,7 @@ def _channel_managed_call_management(state: _ChannelCallState):
                 credentials,
                 operations_and_tags,
                 context,
+                _registered_call_handle,
             )
             if state.managed_calls == 0:
                 state.managed_calls = 1
@@ -1947,6 +2047,8 @@ class Channel(grpc.Channel):
     _channel: cygrpc.Channel
     _call_state: _ChannelCallState
     _connectivity_state: _ChannelConnectivityState
+    _target: str
+    _registered_call_handles: Dict[str, int]
 
     def __init__(
         self,
@@ -1974,12 +2076,29 @@ class Channel(grpc.Channel):
             _augment_options(core_options, compression),
             credentials,
         )
+        self._target = target
         self._call_state = _ChannelCallState(self._channel)
         self._connectivity_state = _ChannelConnectivityState(self._channel)
         cygrpc.fork_register_channel(self)
         if cygrpc.g_gevent_activated:
             cygrpc.gevent_increment_channel_count()
 
+    def _get_registered_call_handle(self, method: str) -> int:
+        """
+        Get the registered call handle for a method.
+
+        This is a semi-private method. It is intended for use only by gRPC generated code.
+
+        This method is not thread-safe.
+
+        Args:
+          method: Required, the method name for the RPC.
+
+        Returns:
+          The registered call handle pointer in the form of a Python Long.
+        """
+        return self._channel.get_registered_call_handle(_common.encode(method))
+
     def _process_python_options(
         self, python_options: Sequence[ChannelArgumentType]
     ) -> None:
@@ -2003,26 +2122,38 @@ class Channel(grpc.Channel):
     ) -> None:
         _unsubscribe(self._connectivity_state, callback)
 
+    # pylint: disable=arguments-differ
     def unary_unary(
         self,
         method: str,
         request_serializer: Optional[SerializingFunction] = None,
         response_deserializer: Optional[DeserializingFunction] = None,
+        _registered_method: Optional[bool] = False,
     ) -> grpc.UnaryUnaryMultiCallable:
+        _registered_call_handle = None
+        if _registered_method:
+            _registered_call_handle = self._get_registered_call_handle(method)
         return _UnaryUnaryMultiCallable(
             self._channel,
             _channel_managed_call_management(self._call_state),
             _common.encode(method),
+            _common.encode(self._target),
             request_serializer,
             response_deserializer,
+            _registered_call_handle,
         )
 
+    # pylint: disable=arguments-differ
     def unary_stream(
         self,
         method: str,
         request_serializer: Optional[SerializingFunction] = None,
         response_deserializer: Optional[DeserializingFunction] = None,
+        _registered_method: Optional[bool] = False,
     ) -> grpc.UnaryStreamMultiCallable:
+        _registered_call_handle = None
+        if _registered_method:
+            _registered_call_handle = self._get_registered_call_handle(method)
         # NOTE(rbellevi): Benchmarks have shown that running a unary-stream RPC
         # on a single Python thread results in an appreciable speed-up. However,
         # due to slight differences in capability, the multi-threaded variant
@@ -2031,44 +2162,62 @@ class Channel(grpc.Channel):
             return _SingleThreadedUnaryStreamMultiCallable(
                 self._channel,
                 _common.encode(method),
+                _common.encode(self._target),
                 request_serializer,
                 response_deserializer,
+                _registered_call_handle,
             )
         else:
             return _UnaryStreamMultiCallable(
                 self._channel,
                 _channel_managed_call_management(self._call_state),
                 _common.encode(method),
+                _common.encode(self._target),
                 request_serializer,
                 response_deserializer,
+                _registered_call_handle,
             )
 
+    # pylint: disable=arguments-differ
     def stream_unary(
         self,
         method: str,
         request_serializer: Optional[SerializingFunction] = None,
         response_deserializer: Optional[DeserializingFunction] = None,
+        _registered_method: Optional[bool] = False,
     ) -> grpc.StreamUnaryMultiCallable:
+        _registered_call_handle = None
+        if _registered_method:
+            _registered_call_handle = self._get_registered_call_handle(method)
         return _StreamUnaryMultiCallable(
             self._channel,
             _channel_managed_call_management(self._call_state),
             _common.encode(method),
+            _common.encode(self._target),
             request_serializer,
             response_deserializer,
+            _registered_call_handle,
         )
 
+    # pylint: disable=arguments-differ
     def stream_stream(
         self,
         method: str,
         request_serializer: Optional[SerializingFunction] = None,
         response_deserializer: Optional[DeserializingFunction] = None,
+        _registered_method: Optional[bool] = False,
     ) -> grpc.StreamStreamMultiCallable:
+        _registered_call_handle = None
+        if _registered_method:
+            _registered_call_handle = self._get_registered_call_handle(method)
         return _StreamStreamMultiCallable(
             self._channel,
             _channel_managed_call_management(self._call_state),
             _common.encode(method),
+            _common.encode(self._target),
             request_serializer,
             response_deserializer,
+            _registered_call_handle,
         )
 
     def _unsubscribe_all(self) -> None:
diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/channel.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/channel.pxd.pxi
index c46cdb95e1a..96d03e181b9 100644
--- a/src/python/grpcio/grpc/_cython/_cygrpc/channel.pxd.pxi
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/channel.pxd.pxi
@@ -28,12 +28,13 @@ cdef class _CallState:
   cdef set due
   # call_tracer_capsule should have type of grpc._observability.ClientCallTracerCapsule
   cdef object call_tracer_capsule
-  cdef void maybe_set_client_call_tracer_on_call(self, bytes method_name) except *
+  cdef void maybe_set_client_call_tracer_on_call(self, bytes method_name, bytes target) except *
   cdef void maybe_delete_call_tracer(self) except *
 
 
 cdef class _ChannelState:
 
+  cdef bytes target
   cdef object condition
   cdef grpc_channel *c_channel
   # A boolean field indicating that the channel is open (if True) or is being
@@ -73,6 +74,13 @@ cdef class SegregatedCall:
 cdef class Channel:
 
   cdef _ChannelState _state
+  cdef dict _registered_call_handles
 
   # TODO(https://github.com/grpc/grpc/issues/15662): Eliminate this.
   cdef tuple _arguments
+
+
+cdef class CallHandle:
+
+  cdef void *c_call_handle
+  cdef object method
diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/channel.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/channel.pyx.pxi
index 54119fcae69..dde3b166789 100644
--- a/src/python/grpcio/grpc/_cython/_cygrpc/channel.pyx.pxi
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/channel.pyx.pxi
@@ -77,7 +77,7 @@ cdef class _CallState:
       return
     _observability.delete_call_tracer(self.call_tracer_capsule)
 
-  cdef void maybe_set_client_call_tracer_on_call(self, bytes method_name) except *:
+  cdef void maybe_set_client_call_tracer_on_call(self, bytes method_name, bytes target) except *:
     # TODO(xuanwn): use channel args to exclude those metrics.
     for exclude_prefix in _observability._SERVICES_TO_EXCLUDE:
       if exclude_prefix in method_name:
@@ -85,14 +85,15 @@ cdef class _CallState:
     with _observability.get_plugin() as plugin:
       if not (plugin and plugin.observability_enabled):
         return
-      capsule = plugin.create_client_call_tracer(method_name)
+      capsule = plugin.create_client_call_tracer(method_name, target)
       capsule_ptr = cpython.PyCapsule_GetPointer(capsule, CLIENT_CALL_TRACER)
       _set_call_tracer(self.c_call, capsule_ptr)
       self.call_tracer_capsule = capsule
 
 cdef class _ChannelState:
 
-  def __cinit__(self):
+  def __cinit__(self, target):
+    self.target = target
     self.condition = threading.Condition()
     self.open = True
     self.integrated_call_states = {}
@@ -100,6 +101,25 @@ cdef class _ChannelState:
     self.connectivity_due = set()
     self.closed_reason = None
 
+cdef class CallHandle:
+
+  def __cinit__(self, _ChannelState channel_state, object method):
+    self.method = method
+    cpython.Py_INCREF(method)
+    # Note that since we always pass None for host, we set the
+    # second-to-last parameter of grpc_channel_register_call to a fixed
+    # NULL value.
+    self.c_call_handle = grpc_channel_register_call(
+      channel_state.c_channel, <const char *>method, NULL, NULL)
+
+  def __dealloc__(self):
+    cpython.Py_DECREF(self.method)
+
+  @property
+  def call_handle(self):
+    return cpython.PyLong_FromVoidPtr(self.c_call_handle)
+
+
 
 cdef tuple _operate(grpc_call *c_call, object operations, object user_tag):
   cdef grpc_call_error c_call_error
@@ -198,7 +218,7 @@ cdef void _call(
     grpc_completion_queue *c_completion_queue, on_success, int flags, method,
     host, object deadline, CallCredentials credentials,
     object operationses_and_user_tags, object metadata,
-    object context) except *:
+    object context, object registered_call_handle) except *:
   """Invokes an RPC.
 
   Args:
@@ -225,6 +245,8 @@ cdef void _call(
       must be present in the first element of this value.
     metadata: The metadata for this call.
     context: Context object for distributed tracing.
+    registered_call_handle: An int representing the call handle of the method, or
+      None if the method is not registered.
   """
   cdef grpc_slice method_slice
   cdef grpc_slice host_slice
@@ -241,14 +263,20 @@ cdef void _call(
       else:
         host_slice = _slice_from_bytes(host)
         host_slice_ptr = &host_slice
-      call_state.c_call = grpc_channel_create_call(
-          channel_state.c_channel, NULL, flags,
-          c_completion_queue, method_slice, host_slice_ptr,
-          _timespec_from_time(deadline), NULL)
+      if registered_call_handle:
+        call_state.c_call = grpc_channel_create_registered_call(
+            channel_state.c_channel, NULL, flags,
+            c_completion_queue, cpython.PyLong_AsVoidPtr(registered_call_handle),
+            _timespec_from_time(deadline), NULL)
+      else:
+        call_state.c_call = grpc_channel_create_call(
+            channel_state.c_channel, NULL, flags,
+            c_completion_queue, method_slice, host_slice_ptr,
+            _timespec_from_time(deadline), NULL)
       grpc_slice_unref(method_slice)
       if host_slice_ptr:
         grpc_slice_unref(host_slice)
-      call_state.maybe_set_client_call_tracer_on_call(method)
+      call_state.maybe_set_client_call_tracer_on_call(method, channel_state.target)
       if context is not None:
         set_census_context_on_call(call_state, context)
       if credentials is not None:
@@ -308,7 +336,7 @@ cdef class IntegratedCall:
 cdef IntegratedCall _integrated_call(
     _ChannelState state, int flags, method, host, object deadline,
     object metadata, CallCredentials credentials, operationses_and_user_tags,
-    object context):
+    object context, object registered_call_handle):
   call_state = _CallState()
 
   def on_success(started_tags):
@@ -317,7 +345,8 @@ cdef IntegratedCall _integrated_call(
 
   _call(
       state, call_state, state.c_call_completion_queue, on_success, flags,
-      method, host, deadline, credentials, operationses_and_user_tags, metadata, context)
+      method, host, deadline, credentials, operationses_and_user_tags,
+      metadata, context, registered_call_handle)
 
   return IntegratedCall(state, call_state)
 
@@ -370,7 +399,7 @@ cdef class SegregatedCall:
 cdef SegregatedCall _segregated_call(
     _ChannelState state, int flags, method, host, object deadline,
     object metadata, CallCredentials credentials, operationses_and_user_tags,
-    object context):
+    object context, object registered_call_handle):
   cdef _CallState call_state = _CallState()
   cdef SegregatedCall segregated_call
   cdef grpc_completion_queue *c_completion_queue
@@ -388,7 +417,7 @@ cdef SegregatedCall _segregated_call(
     _call(
         state, call_state, c_completion_queue, on_success, flags, method, host,
         deadline, credentials, operationses_and_user_tags, metadata,
-        context)
+        context, registered_call_handle)
   except:
     _destroy_c_completion_queue(c_completion_queue)
     raise
@@ -473,7 +502,7 @@ cdef class Channel:
       ChannelCredentials channel_credentials):
     arguments = () if arguments is None else tuple(arguments)
     fork_handlers_and_grpc_init()
-    self._state = _ChannelState()
+    self._state = _ChannelState(target)
     self._state.c_call_completion_queue = (
         grpc_completion_queue_create_for_next(NULL))
     self._state.c_connectivity_completion_queue = (
@@ -485,6 +514,7 @@ cdef class Channel:
         else grpc_insecure_credentials_create())
     self._state.c_channel = grpc_channel_create(
         <char *>target, c_channel_credentials, channel_args.c_args())
+    self._registered_call_handles = {}
     grpc_channel_credentials_release(c_channel_credentials)
 
   def target(self):
@@ -498,10 +528,10 @@ cdef class Channel:
   def integrated_call(
       self, int flags, method, host, object deadline, object metadata,
       CallCredentials credentials, operationses_and_tags,
-      object context = None):
+      object context = None, object registered_call_handle = None):
     return _integrated_call(
         self._state, flags, method, host, deadline, metadata, credentials,
-        operationses_and_tags, context)
+        operationses_and_tags, context, registered_call_handle)
 
   def next_call_event(self):
     def on_success(tag):
@@ -520,10 +550,10 @@ cdef class Channel:
   def segregated_call(
       self, int flags, method, host, object deadline, object metadata,
       CallCredentials credentials, operationses_and_tags,
-      object context = None):
+      object context = None, object registered_call_handle = None):
     return _segregated_call(
         self._state, flags, method, host, deadline, metadata, credentials,
-        operationses_and_tags, context)
+        operationses_and_tags, context, registered_call_handle)
 
   def check_connectivity_state(self, bint try_to_connect):
     with self._state.condition:
@@ -542,3 +572,19 @@ cdef class Channel:
 
   def close_on_fork(self, code, details):
     _close(self, code, details, True)
+
+  def get_registered_call_handle(self, method):
+    """
+    Get or registers a call handler for a method.
+
+    This method is not thread-safe.
+
+    Args:
+      method: Required, the method name for the RPC.
+
+    Returns:
+      The registered call handle pointer in the form of a Python Long. 
+    """
+    if method not in self._registered_call_handles.keys():
+      self._registered_call_handles[method] = CallHandle(self._state, method)
+    return self._registered_call_handles[method].call_handle
diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi
index e1bc87d4abd..29149e9893a 100644
--- a/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/grpc.pxi
@@ -433,6 +433,12 @@ cdef extern from "grpc/grpc.h":
     grpc_channel *channel, grpc_call *parent_call, uint32_t propagation_mask,
     grpc_completion_queue *completion_queue, grpc_slice method,
     const grpc_slice *host, gpr_timespec deadline, void *reserved) nogil
+  void *grpc_channel_register_call(
+    grpc_channel *channel, const char *method, const char *host, void *reserved) nogil
+  grpc_call *grpc_channel_create_registered_call(
+    grpc_channel *channel, grpc_call *parent_call, uint32_t propagation_mask,
+    grpc_completion_queue *completion_queue, void* registered_call_handle,
+    gpr_timespec deadline, void *reserved) nogil
   grpc_connectivity_state grpc_channel_check_connectivity_state(
       grpc_channel *channel, int try_to_connect) nogil
   void grpc_channel_watch_connectivity_state(
diff --git a/src/python/grpcio/grpc/_interceptor.py b/src/python/grpcio/grpc/_interceptor.py
index 36bce4e3ba5..94abafebaa6 100644
--- a/src/python/grpcio/grpc/_interceptor.py
+++ b/src/python/grpcio/grpc/_interceptor.py
@@ -684,57 +684,85 @@ class _Channel(grpc.Channel):
     def unsubscribe(self, callback: Callable):
         self._channel.unsubscribe(callback)
 
+    # pylint: disable=arguments-differ
     def unary_unary(
         self,
         method: str,
         request_serializer: Optional[SerializingFunction] = None,
         response_deserializer: Optional[DeserializingFunction] = None,
+        _registered_method: Optional[bool] = False,
     ) -> grpc.UnaryUnaryMultiCallable:
+        # pytype: disable=wrong-arg-count
         thunk = lambda m: self._channel.unary_unary(
-            m, request_serializer, response_deserializer
+            m,
+            request_serializer,
+            response_deserializer,
+            _registered_method,
         )
+        # pytype: enable=wrong-arg-count
         if isinstance(self._interceptor, grpc.UnaryUnaryClientInterceptor):
             return _UnaryUnaryMultiCallable(thunk, method, self._interceptor)
         else:
             return thunk(method)
 
+    # pylint: disable=arguments-differ
     def unary_stream(
         self,
         method: str,
         request_serializer: Optional[SerializingFunction] = None,
         response_deserializer: Optional[DeserializingFunction] = None,
+        _registered_method: Optional[bool] = False,
     ) -> grpc.UnaryStreamMultiCallable:
+        # pytype: disable=wrong-arg-count
         thunk = lambda m: self._channel.unary_stream(
-            m, request_serializer, response_deserializer
+            m,
+            request_serializer,
+            response_deserializer,
+            _registered_method,
         )
+        # pytype: enable=wrong-arg-count
         if isinstance(self._interceptor, grpc.UnaryStreamClientInterceptor):
             return _UnaryStreamMultiCallable(thunk, method, self._interceptor)
         else:
             return thunk(method)
 
+    # pylint: disable=arguments-differ
     def stream_unary(
         self,
         method: str,
         request_serializer: Optional[SerializingFunction] = None,
         response_deserializer: Optional[DeserializingFunction] = None,
+        _registered_method: Optional[bool] = False,
     ) -> grpc.StreamUnaryMultiCallable:
+        # pytype: disable=wrong-arg-count
         thunk = lambda m: self._channel.stream_unary(
-            m, request_serializer, response_deserializer
+            m,
+            request_serializer,
+            response_deserializer,
+            _registered_method,
         )
+        # pytype: enable=wrong-arg-count
         if isinstance(self._interceptor, grpc.StreamUnaryClientInterceptor):
             return _StreamUnaryMultiCallable(thunk, method, self._interceptor)
         else:
             return thunk(method)
 
+    # pylint: disable=arguments-differ
     def stream_stream(
         self,
         method: str,
         request_serializer: Optional[SerializingFunction] = None,
         response_deserializer: Optional[DeserializingFunction] = None,
+        _registered_method: Optional[bool] = False,
     ) -> grpc.StreamStreamMultiCallable:
+        # pytype: disable=wrong-arg-count
         thunk = lambda m: self._channel.stream_stream(
-            m, request_serializer, response_deserializer
+            m,
+            request_serializer,
+            response_deserializer,
+            _registered_method,
         )
+        # pytype: enable=wrong-arg-count
         if isinstance(self._interceptor, grpc.StreamStreamClientInterceptor):
             return _StreamStreamMultiCallable(thunk, method, self._interceptor)
         else:
diff --git a/src/python/grpcio/grpc/_observability.py b/src/python/grpcio/grpc/_observability.py
index d4e8ce6ab7b..8bbbcd2bcea 100644
--- a/src/python/grpcio/grpc/_observability.py
+++ b/src/python/grpcio/grpc/_observability.py
@@ -62,7 +62,7 @@ class ObservabilityPlugin(
 
     @abc.abstractmethod
     def create_client_call_tracer(
-        self, method_name: bytes
+        self, method_name: bytes, target: bytes
     ) -> ClientCallTracerCapsule:
         """Creates a ClientCallTracerCapsule.
 
@@ -75,6 +75,7 @@ class ObservabilityPlugin(
 
         Args:
         method_name: The method name of the call in byte format.
+        target: The channel target of the call in byte format.
 
         Returns:
         A PyCapsule which stores a ClientCallTracer object.
@@ -140,7 +141,7 @@ class ObservabilityPlugin(
 
     @abc.abstractmethod
     def record_rpc_latency(
-        self, method: str, rpc_latency: float, status_code: Any
+        self, method: str, target: str, rpc_latency: float, status_code: Any
     ) -> None:
         """Record the latency of the RPC.
 
@@ -149,7 +150,8 @@ class ObservabilityPlugin(
 
         Args:
         method: The fully-qualified name of the RPC method being invoked.
-        rpc_latency: The latency for the RPC, equals to the time between
+        target: The target name of the RPC method being invoked.
+        rpc_latency: The latency for the RPC in seconds, equals to the time between
          when the client invokes the RPC and when the client receives the status.
         status_code: An element of grpc.StatusCode in string format representing the
          final status for the RPC.
@@ -280,4 +282,6 @@ def maybe_record_rpc_latency(state: "_channel._RPCState") -> None:
             return
         rpc_latency_s = state.rpc_end_time - state.rpc_start_time
         rpc_latency_ms = rpc_latency_s * 1000
-        plugin.record_rpc_latency(state.method, rpc_latency_ms, state.code)
+        plugin.record_rpc_latency(
+            state.method, state.target, rpc_latency_ms, state.code
+        )
diff --git a/src/python/grpcio/grpc/_simple_stubs.py b/src/python/grpcio/grpc/_simple_stubs.py
index 7772860957b..3e88670aa08 100644
--- a/src/python/grpcio/grpc/_simple_stubs.py
+++ b/src/python/grpcio/grpc/_simple_stubs.py
@@ -159,7 +159,19 @@ class ChannelCache:
         channel_credentials: Optional[grpc.ChannelCredentials],
         insecure: bool,
         compression: Optional[grpc.Compression],
-    ) -> grpc.Channel:
+        method: str,
+        _registered_method: bool,
+    ) -> Tuple[grpc.Channel, Optional[int]]:
+        """Get a channel from cache or creates a new channel.
+
+        This method also takes care of register method for channel,
+          which means we'll register a new call handle if we're calling a
+          non-registered method for an existing channel.
+
+        Returns:
+            A tuple with two items. The first item is the channel, second item is
+              the call handle if the method is registered, None if it's not registered.
+        """
         if insecure and channel_credentials:
             raise ValueError(
                 "The insecure option is mutually exclusive with "
@@ -176,18 +188,25 @@ class ChannelCache:
         key = (target, options, channel_credentials, compression)
         with self._lock:
             channel_data = self._mapping.get(key, None)
+            call_handle = None
             if channel_data is not None:
                 channel = channel_data[0]
+                # Register a new call handle if we're calling a registered method for an
+                # existing channel and this method is not registered.
+                if _registered_method:
+                    call_handle = channel._get_registered_call_handle(method)
                 self._mapping.pop(key)
                 self._mapping[key] = (
                     channel,
                     datetime.datetime.now() + _EVICTION_PERIOD,
                 )
-                return channel
+                return channel, call_handle
             else:
                 channel = _create_channel(
                     target, options, channel_credentials, compression
                 )
+                if _registered_method:
+                    call_handle = channel._get_registered_call_handle(method)
                 self._mapping[key] = (
                     channel,
                     datetime.datetime.now() + _EVICTION_PERIOD,
@@ -197,7 +216,7 @@ class ChannelCache:
                     or len(self._mapping) >= _MAXIMUM_CHANNELS
                 ):
                     self._condition.notify()
-                return channel
+                return channel, call_handle
 
     def _test_only_channel_count(self) -> int:
         with self._lock:
@@ -205,6 +224,7 @@ class ChannelCache:
 
 
 @experimental_api
+# pylint: disable=too-many-locals
 def unary_unary(
     request: RequestType,
     target: str,
@@ -219,6 +239,7 @@ def unary_unary(
     wait_for_ready: Optional[bool] = None,
     timeout: Optional[float] = _DEFAULT_TIMEOUT,
     metadata: Optional[Sequence[Tuple[str, Union[str, bytes]]]] = None,
+    _registered_method: Optional[bool] = False,
 ) -> ResponseType:
     """Invokes a unary-unary RPC without an explicitly specified channel.
 
@@ -272,11 +293,17 @@ def unary_unary(
     Returns:
       The response to the RPC.
     """
-    channel = ChannelCache.get().get_channel(
-        target, options, channel_credentials, insecure, compression
+    channel, method_handle = ChannelCache.get().get_channel(
+        target,
+        options,
+        channel_credentials,
+        insecure,
+        compression,
+        method,
+        _registered_method,
     )
     multicallable = channel.unary_unary(
-        method, request_serializer, response_deserializer
+        method, request_serializer, response_deserializer, method_handle
     )
     wait_for_ready = wait_for_ready if wait_for_ready is not None else True
     return multicallable(
@@ -289,6 +316,7 @@ def unary_unary(
 
 
 @experimental_api
+# pylint: disable=too-many-locals
 def unary_stream(
     request: RequestType,
     target: str,
@@ -303,6 +331,7 @@ def unary_stream(
     wait_for_ready: Optional[bool] = None,
     timeout: Optional[float] = _DEFAULT_TIMEOUT,
     metadata: Optional[Sequence[Tuple[str, Union[str, bytes]]]] = None,
+    _registered_method: Optional[bool] = False,
 ) -> Iterator[ResponseType]:
     """Invokes a unary-stream RPC without an explicitly specified channel.
 
@@ -355,11 +384,17 @@ def unary_stream(
     Returns:
       An iterator of responses.
     """
-    channel = ChannelCache.get().get_channel(
-        target, options, channel_credentials, insecure, compression
+    channel, method_handle = ChannelCache.get().get_channel(
+        target,
+        options,
+        channel_credentials,
+        insecure,
+        compression,
+        method,
+        _registered_method,
     )
     multicallable = channel.unary_stream(
-        method, request_serializer, response_deserializer
+        method, request_serializer, response_deserializer, method_handle
     )
     wait_for_ready = wait_for_ready if wait_for_ready is not None else True
     return multicallable(
@@ -372,6 +407,7 @@ def unary_stream(
 
 
 @experimental_api
+# pylint: disable=too-many-locals
 def stream_unary(
     request_iterator: Iterator[RequestType],
     target: str,
@@ -386,6 +422,7 @@ def stream_unary(
     wait_for_ready: Optional[bool] = None,
     timeout: Optional[float] = _DEFAULT_TIMEOUT,
     metadata: Optional[Sequence[Tuple[str, Union[str, bytes]]]] = None,
+    _registered_method: Optional[bool] = False,
 ) -> ResponseType:
     """Invokes a stream-unary RPC without an explicitly specified channel.
 
@@ -438,11 +475,17 @@ def stream_unary(
     Returns:
       The response to the RPC.
     """
-    channel = ChannelCache.get().get_channel(
-        target, options, channel_credentials, insecure, compression
+    channel, method_handle = ChannelCache.get().get_channel(
+        target,
+        options,
+        channel_credentials,
+        insecure,
+        compression,
+        method,
+        _registered_method,
     )
     multicallable = channel.stream_unary(
-        method, request_serializer, response_deserializer
+        method, request_serializer, response_deserializer, method_handle
     )
     wait_for_ready = wait_for_ready if wait_for_ready is not None else True
     return multicallable(
@@ -455,6 +498,7 @@ def stream_unary(
 
 
 @experimental_api
+# pylint: disable=too-many-locals
 def stream_stream(
     request_iterator: Iterator[RequestType],
     target: str,
@@ -469,6 +513,7 @@ def stream_stream(
     wait_for_ready: Optional[bool] = None,
     timeout: Optional[float] = _DEFAULT_TIMEOUT,
     metadata: Optional[Sequence[Tuple[str, Union[str, bytes]]]] = None,
+    _registered_method: Optional[bool] = False,
 ) -> Iterator[ResponseType]:
     """Invokes a stream-stream RPC without an explicitly specified channel.
 
@@ -521,11 +566,17 @@ def stream_stream(
     Returns:
       An iterator of responses.
     """
-    channel = ChannelCache.get().get_channel(
-        target, options, channel_credentials, insecure, compression
+    channel, method_handle = ChannelCache.get().get_channel(
+        target,
+        options,
+        channel_credentials,
+        insecure,
+        compression,
+        method,
+        _registered_method,
     )
     multicallable = channel.stream_stream(
-        method, request_serializer, response_deserializer
+        method, request_serializer, response_deserializer, method_handle
     )
     wait_for_ready = wait_for_ready if wait_for_ready is not None else True
     return multicallable(
diff --git a/src/python/grpcio/grpc/aio/_channel.py b/src/python/grpcio/grpc/aio/_channel.py
index bea64c27fa3..ea4de20965a 100644
--- a/src/python/grpcio/grpc/aio/_channel.py
+++ b/src/python/grpcio/grpc/aio/_channel.py
@@ -478,11 +478,20 @@ class Channel(_base_channel.Channel):
             await self.wait_for_state_change(state)
             state = self.get_state(try_to_connect=True)
 
+    # TODO(xuanwn): Implement this method after we have
+    # observability for Asyncio.
+    def _get_registered_call_handle(self, method: str) -> int:
+        pass
+
+    # TODO(xuanwn): Implement _registered_method after we have
+    # observability for Asyncio.
+    # pylint: disable=arguments-differ,unused-argument
     def unary_unary(
         self,
         method: str,
         request_serializer: Optional[SerializingFunction] = None,
         response_deserializer: Optional[DeserializingFunction] = None,
+        _registered_method: Optional[bool] = False,
     ) -> UnaryUnaryMultiCallable:
         return UnaryUnaryMultiCallable(
             self._channel,
@@ -494,11 +503,15 @@ class Channel(_base_channel.Channel):
             self._loop,
         )
 
+    # TODO(xuanwn): Implement _registered_method after we have
+    # observability for Asyncio.
+    # pylint: disable=arguments-differ,unused-argument
     def unary_stream(
         self,
         method: str,
         request_serializer: Optional[SerializingFunction] = None,
         response_deserializer: Optional[DeserializingFunction] = None,
+        _registered_method: Optional[bool] = False,
     ) -> UnaryStreamMultiCallable:
         return UnaryStreamMultiCallable(
             self._channel,
@@ -510,11 +523,15 @@ class Channel(_base_channel.Channel):
             self._loop,
         )
 
+    # TODO(xuanwn): Implement _registered_method after we have
+    # observability for Asyncio.
+    # pylint: disable=arguments-differ,unused-argument
     def stream_unary(
         self,
         method: str,
         request_serializer: Optional[SerializingFunction] = None,
         response_deserializer: Optional[DeserializingFunction] = None,
+        _registered_method: Optional[bool] = False,
     ) -> StreamUnaryMultiCallable:
         return StreamUnaryMultiCallable(
             self._channel,
@@ -526,11 +543,15 @@ class Channel(_base_channel.Channel):
             self._loop,
         )
 
+    # TODO(xuanwn): Implement _registered_method after we have
+    # observability for Asyncio.
+    # pylint: disable=arguments-differ,unused-argument
     def stream_stream(
         self,
         method: str,
         request_serializer: Optional[SerializingFunction] = None,
         response_deserializer: Optional[DeserializingFunction] = None,
+        _registered_method: Optional[bool] = False,
     ) -> StreamStreamMultiCallable:
         return StreamStreamMultiCallable(
             self._channel,
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 20375c48ad8..b6f72dccf97 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -518,7 +518,7 @@ CORE_SOURCE_FILES = [
     'src/core/lib/event_engine/posix_engine/event_poller_posix_default.cc',
     'src/core/lib/event_engine/posix_engine/internal_errqueue.cc',
     'src/core/lib/event_engine/posix_engine/lockfree_event.cc',
-    'src/core/lib/event_engine/posix_engine/native_dns_resolver.cc',
+    'src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc',
     'src/core/lib/event_engine/posix_engine/posix_endpoint.cc',
     'src/core/lib/event_engine/posix_engine/posix_engine.cc',
     'src/core/lib/event_engine/posix_engine/posix_engine_listener.cc',
@@ -546,6 +546,7 @@ CORE_SOURCE_FILES = [
     'src/core/lib/event_engine/utils.cc',
     'src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc',
     'src/core/lib/event_engine/windows/iocp.cc',
+    'src/core/lib/event_engine/windows/native_windows_dns_resolver.cc',
     'src/core/lib/event_engine/windows/win_socket.cc',
     'src/core/lib/event_engine/windows/windows_endpoint.cc',
     'src/core/lib/event_engine/windows/windows_engine.cc',
@@ -813,7 +814,6 @@ CORE_SOURCE_FILES = [
     'src/core/lib/transport/http_connect_handshaker.cc',
     'src/core/lib/transport/metadata_batch.cc',
     'src/core/lib/transport/parsed_metadata.cc',
-    'src/core/lib/transport/pid_controller.cc',
     'src/core/lib/transport/status_conversion.cc',
     'src/core/lib/transport/tcp_connect_handshaker.cc',
     'src/core/lib/transport/timeout_encoding.cc',
diff --git a/src/python/grpcio_observability/_parallel_compile_patch.py b/src/python/grpcio_observability/_parallel_compile_patch.py
index 34ba5379216..9c98aa92436 100644
--- a/src/python/grpcio_observability/_parallel_compile_patch.py
+++ b/src/python/grpcio_observability/_parallel_compile_patch.py
@@ -11,6 +11,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#
+# This file has been automatically generated from a template file.
+# Please make modifications to
+# `$REPO_ROOT/templates/src/python/grpcio/_parallel_compile_patch.py.template`
+# instead. This file can be regenerated from the template by running
+# `tools/buildgen/generate_projects.sh`.
+
 """Patches the compile() to allow enable parallel compilation of C/C++.
 
 build_ext has lots of C/C++ files and normally them one by one.
@@ -27,10 +34,11 @@ except KeyError:
     import multiprocessing
 
     BUILD_EXT_COMPILER_JOBS = multiprocessing.cpu_count()
+except ValueError:
+    BUILD_EXT_COMPILER_JOBS = 1
 
 
 # monkey-patch for parallel compilation
-# TODO(xuanwn): Use a template for this file.
 def _parallel_compile(
     self,
     sources,
@@ -45,7 +53,7 @@ def _parallel_compile(
     # setup the same way as distutils.ccompiler.CCompiler
     # https://github.com/python/cpython/blob/31368a4f0e531c19affe2a1becd25fc316bc7501/Lib/distutils/ccompiler.py#L564
     macros, objects, extra_postargs, pp_opts, build = self._setup_compile(
-        output_dir, macros, include_dirs, sources, depends, extra_postargs
+        str(output_dir), macros, include_dirs, sources, depends, extra_postargs
     )
     cc_args = self._get_cc_args(pp_opts, debug, extra_preargs)
 
diff --git a/src/python/grpcio_observability/grpc_observability/BUILD.bazel b/src/python/grpcio_observability/grpc_observability/BUILD.bazel
index 2fbfb01aa09..afb35e43c3f 100644
--- a/src/python/grpcio_observability/grpc_observability/BUILD.bazel
+++ b/src/python/grpcio_observability/grpc_observability/BUILD.bazel
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@grpc_python_dependencies//:requirements.bzl", "requirement")
 load("//bazel:cython_library.bzl", "pyx_library")
 
 package(default_visibility = ["//visibility:private"])
@@ -52,17 +53,27 @@ pyx_library(
     ],
 )
 
-# Since `opencensus` and `opencensus-ext-stackdriver` are non-hermetic,
+# Since `opentelemetry-sdk` and `opentelemetry-api` are non-hermetic,
 # pyobservability is for internal use only.
+py_library(
+    name = "_opentelemetry_observability",
+    srcs = [
+        "_open_telemetry_exporter.py",
+        "_open_telemetry_measures.py",
+        "_open_telemetry_observability.py",
+        "_open_telemetry_plugin.py",
+    ],
+    deps = [
+        requirement("opentelemetry-sdk"),
+        requirement("opentelemetry-api"),
+    ],
+)
+
 py_library(
     name = "pyobservability",
     srcs = [
         "__init__.py",
-        "_gcp_observability.py",
-        "_measures.py",
         "_observability.py",
-        "_observability_config.py",
-        "_views.py",
     ],
     imports = [
         ".",
@@ -73,6 +84,7 @@ py_library(
         "//:__subpackages__",
     ],
     deps = [
+        ":_opentelemetry_observability",
         ":cyobservability",
     ],
 )
diff --git a/src/python/grpcio_observability/grpc_observability/__init__.py b/src/python/grpcio_observability/grpc_observability/__init__.py
index 6a10a17fb0b..7dad3d83efe 100644
--- a/src/python/grpcio_observability/grpc_observability/__init__.py
+++ b/src/python/grpcio_observability/grpc_observability/__init__.py
@@ -12,6 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from grpc_observability._gcp_observability import GCPOpenCensusObservability
+from grpc_observability._open_telemetry_observability import (
+    OpenTelemetryObservability,
+)
+from grpc_observability._open_telemetry_plugin import OpenTelemetryPlugin
 
-__all__ = ("GCPOpenCensusObservability",)
+__all__ = ("OpenTelemetryObservability", "OpenTelemetryPlugin")
diff --git a/src/python/grpcio_observability/grpc_observability/_cyobservability.pxd b/src/python/grpcio_observability/grpc_observability/_cyobservability.pxd
index 9017099e30f..93a077b8679 100644
--- a/src/python/grpcio_observability/grpc_observability/_cyobservability.pxd
+++ b/src/python/grpcio_observability/grpc_observability/_cyobservability.pxd
@@ -76,6 +76,7 @@ cdef extern from "observability_util.h" namespace "grpc_observability":
   cdef cGcpObservabilityConfig ReadAndActivateObservabilityConfig() nogil
   cdef void NativeObservabilityInit() except +
   cdef void* CreateClientCallTracer(const char* method,
+                                    const char* target,
                                     const char* trace_id,
                                     const char* parent_span_id) except +
   cdef void* CreateServerCallTracerFactory() except +
@@ -144,6 +145,7 @@ cdef extern from "constants.h" namespace "grpc_observability":
     kRpcServerStartedRpcsMeasureName
 
   string kClientMethod
+  string kClientTarget
   string kClientStatus
 
 cdef extern from "sampler.h" namespace "grpc_observability":
diff --git a/src/python/grpcio_observability/grpc_observability/_cyobservability.pyx b/src/python/grpcio_observability/grpc_observability/_cyobservability.pyx
index f48674e01e2..236601770ee 100644
--- a/src/python/grpcio_observability/grpc_observability/_cyobservability.pyx
+++ b/src/python/grpcio_observability/grpc_observability/_cyobservability.pyx
@@ -111,18 +111,22 @@ def activate_config(object py_config) -> None:
   if (py_config.stats_enabled):
     EnablePythonCensusStats(True);
 
+def activate_stats() -> None:
+  EnablePythonCensusStats(True);
 
-def create_client_call_tracer(bytes method_name, bytes trace_id,
+
+def create_client_call_tracer(bytes method_name, bytes target, bytes trace_id,
                               bytes parent_span_id=b'') -> cpython.PyObject:
   """Create a ClientCallTracer and save to PyCapsule.
 
   Returns: A grpc_observability._observability.ClientCallTracerCapsule object.
   """
   cdef char* c_method = cpython.PyBytes_AsString(method_name)
+  cdef char* c_target = cpython.PyBytes_AsString(target)
   cdef char* c_trace_id = cpython.PyBytes_AsString(trace_id)
   cdef char* c_parent_span_id = cpython.PyBytes_AsString(parent_span_id)
 
-  cdef void* call_tracer = CreateClientCallTracer(c_method, c_trace_id, c_parent_span_id)
+  cdef void* call_tracer = CreateClientCallTracer(c_method, c_target, c_trace_id, c_parent_span_id)
   capsule = cpython.PyCapsule_New(call_tracer, CLIENT_CALL_TRACER, NULL)
   return capsule
 
@@ -244,7 +248,7 @@ def _get_tracing_data(SpanCensusData span_data, vector[Label] span_labels,
                                     span_annotations = py_span_annotations)
 
 
-def _record_rpc_latency(object exporter, str method, float rpc_latency, str status_code) -> None:
+def _record_rpc_latency(object exporter, str method, str target, float rpc_latency, str status_code) -> None:
   exporter: _observability.Exporter
 
   measurement = {}
@@ -254,6 +258,7 @@ def _record_rpc_latency(object exporter, str method, float rpc_latency, str stat
 
   labels = {}
   labels[_decode(kClientMethod)] = method.strip("/")
+  labels[_decode(kClientTarget)] = target
   labels[_decode(kClientStatus)] = status_code
   metric = _get_stats_data(measurement, labels)
   exporter.export_stats_data([metric])
diff --git a/src/python/grpcio_observability/grpc_observability/_gcp_observability.py b/src/python/grpcio_observability/grpc_observability/_gcp_observability.py
index 58e9a9d47a8..797c4797d01 100644
--- a/src/python/grpcio_observability/grpc_observability/_gcp_observability.py
+++ b/src/python/grpcio_observability/grpc_observability/_gcp_observability.py
@@ -118,11 +118,11 @@ class GCPOpenCensusObservability(grpc._observability.ObservabilityPlugin):
         grpc._observability.observability_deinit()
 
     def create_client_call_tracer(
-        self, method_name: bytes
+        self, method_name: bytes, target: bytes
     ) -> ClientCallTracerCapsule:
         trace_id = b"TRACE_ID"
         capsule = _cyobservability.create_client_call_tracer(
-            method_name, trace_id
+            method_name, target, trace_id
         )
         return capsule
 
@@ -143,9 +143,13 @@ class GCPOpenCensusObservability(grpc._observability.ObservabilityPlugin):
         pass
 
     def record_rpc_latency(
-        self, method: str, rpc_latency: float, status_code: grpc.StatusCode
+        self,
+        method: str,
+        target: str,
+        rpc_latency: float,
+        status_code: grpc.StatusCode,
     ) -> None:
         status_code = GRPC_STATUS_CODE_TO_STRING.get(status_code, "UNKNOWN")
         _cyobservability._record_rpc_latency(
-            self.exporter, method, rpc_latency, status_code
+            self.exporter, method, target, rpc_latency, status_code
         )
diff --git a/src/python/grpcio_observability/grpc_observability/_open_telemetry_exporter.py b/src/python/grpcio_observability/grpc_observability/_open_telemetry_exporter.py
new file mode 100644
index 00000000000..be2738a8595
--- /dev/null
+++ b/src/python/grpcio_observability/grpc_observability/_open_telemetry_exporter.py
@@ -0,0 +1,38 @@
+# Copyright 2023 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from typing import Iterable, List
+
+from grpc_observability import _observability  # pytype: disable=pyi-error
+from grpc_observability._open_telemetry_plugin import _OpenTelemetryPlugin
+
+
+class _OpenTelemetryExporterDelegator(_observability.Exporter):
+    _plugins: Iterable[_OpenTelemetryPlugin]
+
+    def __init__(self, plugins: Iterable[_OpenTelemetryPlugin]):
+        self._plugins = plugins
+
+    def export_stats_data(
+        self, stats_data: List[_observability.StatsData]
+    ) -> None:
+        # Records stats data to MeterProvider.
+        for data in stats_data:
+            for plugin in self._plugins:
+                plugin.maybe_record_stats_data(data)
+
+    def export_tracing_data(
+        self, tracing_data: List[_observability.TracingData]
+    ) -> None:
+        pass
diff --git a/src/python/grpcio_observability/grpc_observability/_open_telemetry_measures.py b/src/python/grpcio_observability/grpc_observability/_open_telemetry_measures.py
new file mode 100644
index 00000000000..209ecd22c91
--- /dev/null
+++ b/src/python/grpcio_observability/grpc_observability/_open_telemetry_measures.py
@@ -0,0 +1,97 @@
+# Copyright 2023 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import collections
+from typing import List
+
+from grpc_observability._cyobservability import MetricsName
+
+
+class Metric(
+    collections.namedtuple(
+        "Metric",
+        ["name", "cyname", "unit", "description"],
+    )
+):
+    pass
+
+
+CLIENT_ATTEMPT_STARTED = Metric(
+    "grpc.client.attempt.started",
+    MetricsName.CLIENT_STARTED_RPCS,
+    "{attempt}",
+    "Number of client call attempts started",
+)
+CLIENT_ATTEMPT_DURATION = Metric(
+    "grpc.client.attempt.duration",
+    MetricsName.CLIENT_ROUNDTRIP_LATENCY,
+    "s",
+    "End-to-end time taken to complete a client call attempt",
+)
+CLIENT_RPC_DURATION = Metric(
+    "grpc.client.call.duration",
+    MetricsName.CLIENT_API_LATENCY,
+    "s",
+    "End-to-end time taken to complete a call from client's perspective",
+)
+CLIENT_ATTEMPT_SEND_BYTES = Metric(
+    "grpc.client.attempt.sent_total_compressed_message_size",
+    MetricsName.CLIENT_SEND_BYTES_PER_RPC,
+    "By",
+    "Compressed message bytes sent per client call attempt",
+)
+CLIENT_ATTEMPT_RECEIVED_BYTES = Metric(
+    "grpc.client.attempt.rcvd_total_compressed_message_size",
+    MetricsName.CLIENT_RECEIVED_BYTES_PER_RPC,
+    "By",
+    "Compressed message bytes received per call attempt",
+)
+SERVER_STARTED_RPCS = Metric(
+    "grpc.server.call.started",
+    MetricsName.SERVER_STARTED_RPCS,
+    "{call}",
+    "Number of server calls started",
+)
+SERVER_RPC_DURATION = Metric(
+    "grpc.server.call.duration",
+    MetricsName.SERVER_SERVER_LATENCY,
+    "s",
+    "End-to-end time taken to complete a call from server transport's perspective",
+)
+SERVER_RPC_SEND_BYTES = Metric(
+    "grpc.server.call.sent_total_compressed_message_size",
+    MetricsName.SERVER_SENT_BYTES_PER_RPC,
+    "By",
+    "Compressed message bytes sent per server call",
+)
+SERVER_RPC_RECEIVED_BYTES = Metric(
+    "grpc.server.call.rcvd_total_compressed_message_size",
+    MetricsName.SERVER_RECEIVED_BYTES_PER_RPC,
+    "By",
+    "Compressed message bytes received per server call",
+)
+
+
+def base_metrics() -> List[Metric]:
+    return [
+        CLIENT_ATTEMPT_STARTED,
+        CLIENT_ATTEMPT_DURATION,
+        CLIENT_RPC_DURATION,
+        CLIENT_ATTEMPT_SEND_BYTES,
+        CLIENT_ATTEMPT_RECEIVED_BYTES,
+        SERVER_STARTED_RPCS,
+        SERVER_RPC_DURATION,
+        SERVER_RPC_SEND_BYTES,
+        SERVER_RPC_RECEIVED_BYTES,
+    ]
diff --git a/src/python/grpcio_observability/grpc_observability/_open_telemetry_observability.py b/src/python/grpcio_observability/grpc_observability/_open_telemetry_observability.py
new file mode 100644
index 00000000000..8f3a96475df
--- /dev/null
+++ b/src/python/grpcio_observability/grpc_observability/_open_telemetry_observability.py
@@ -0,0 +1,155 @@
+# Copyright 2023 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import logging
+import time
+from typing import Any, Iterable, Optional
+
+import grpc
+
+# pytype: disable=pyi-error
+from grpc_observability import _cyobservability
+from grpc_observability._open_telemetry_exporter import (
+    _OpenTelemetryExporterDelegator,
+)
+from grpc_observability._open_telemetry_plugin import OpenTelemetryPlugin
+from grpc_observability._open_telemetry_plugin import _OpenTelemetryPlugin
+
+_LOGGER = logging.getLogger(__name__)
+
+ClientCallTracerCapsule = Any  # it appears only once in the function signature
+ServerCallTracerFactoryCapsule = (
+    Any  # it appears only once in the function signature
+)
+grpc_observability = Any  # grpc_observability.py imports this module.
+
+GRPC_STATUS_CODE_TO_STRING = {
+    grpc.StatusCode.OK: "OK",
+    grpc.StatusCode.CANCELLED: "CANCELLED",
+    grpc.StatusCode.UNKNOWN: "UNKNOWN",
+    grpc.StatusCode.INVALID_ARGUMENT: "INVALID_ARGUMENT",
+    grpc.StatusCode.DEADLINE_EXCEEDED: "DEADLINE_EXCEEDED",
+    grpc.StatusCode.NOT_FOUND: "NOT_FOUND",
+    grpc.StatusCode.ALREADY_EXISTS: "ALREADY_EXISTS",
+    grpc.StatusCode.PERMISSION_DENIED: "PERMISSION_DENIED",
+    grpc.StatusCode.UNAUTHENTICATED: "UNAUTHENTICATED",
+    grpc.StatusCode.RESOURCE_EXHAUSTED: "RESOURCE_EXHAUSTED",
+    grpc.StatusCode.FAILED_PRECONDITION: "FAILED_PRECONDITION",
+    grpc.StatusCode.ABORTED: "ABORTED",
+    grpc.StatusCode.OUT_OF_RANGE: "OUT_OF_RANGE",
+    grpc.StatusCode.UNIMPLEMENTED: "UNIMPLEMENTED",
+    grpc.StatusCode.INTERNAL: "INTERNAL",
+    grpc.StatusCode.UNAVAILABLE: "UNAVAILABLE",
+    grpc.StatusCode.DATA_LOSS: "DATA_LOSS",
+}
+
+
+# pylint: disable=no-self-use
+class OpenTelemetryObservability(grpc._observability.ObservabilityPlugin):
+    """OpenTelemetry based plugin implementation.
+
+    Args:
+      exporter: Exporter used to export data.
+      plugin: OpenTelemetryPlugin to enable.
+    """
+
+    exporter: "grpc_observability.Exporter"
+    plugins: Iterable[OpenTelemetryPlugin]
+
+    def __init__(
+        self,
+        *,
+        plugins: Optional[Iterable[OpenTelemetryPlugin]] = None,
+        exporter: "grpc_observability.Exporter" = None,
+    ):
+        _plugins = []
+        if plugins:
+            for plugin in plugins:
+                _plugins.append(_OpenTelemetryPlugin(plugin))
+
+        if exporter:
+            self.exporter = exporter
+        else:
+            self.exporter = _OpenTelemetryExporterDelegator(_plugins)
+
+        try:
+            _cyobservability.activate_stats()
+            self.set_stats(True)
+        except Exception as e:  # pylint: disable=broad-except
+            raise ValueError(f"Activate observability metrics failed with: {e}")
+
+    def __enter__(self):
+        try:
+            _cyobservability.cyobservability_init(self.exporter)
+        # TODO(xuanwn): Use specific exceptons
+        except Exception as e:  # pylint: disable=broad-except
+            _LOGGER.exception("Initiate observability failed with: %s", e)
+
+        grpc._observability.observability_init(self)
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb) -> None:
+        self.exit()
+
+    def exit(self) -> None:
+        # Sleep so we don't loss any data. If we shutdown export thread
+        # immediately after exit, it's possible that core didn't call RecordEnd
+        # in callTracer, and all data recorded by calling RecordEnd will be
+        # lost.
+        # CENSUS_EXPORT_BATCH_INTERVAL_SECS: The time equals to the time in
+        # AwaitNextBatchLocked.
+        # TODO(xuanwn): explicit synchronization
+        # https://github.com/grpc/grpc/issues/33262
+        time.sleep(_cyobservability.CENSUS_EXPORT_BATCH_INTERVAL_SECS)
+        self.set_tracing(False)
+        self.set_stats(False)
+        _cyobservability.observability_deinit()
+        grpc._observability.observability_deinit()
+
+    def create_client_call_tracer(
+        self, method_name: bytes, target: bytes
+    ) -> ClientCallTracerCapsule:
+        trace_id = b"TRACE_ID"
+        capsule = _cyobservability.create_client_call_tracer(
+            method_name, target, trace_id
+        )
+        return capsule
+
+    def create_server_call_tracer_factory(
+        self,
+    ) -> ServerCallTracerFactoryCapsule:
+        capsule = _cyobservability.create_server_call_tracer_factory_capsule()
+        return capsule
+
+    def delete_client_call_tracer(
+        self, client_call_tracer: ClientCallTracerCapsule
+    ) -> None:
+        _cyobservability.delete_client_call_tracer(client_call_tracer)
+
+    def save_trace_context(
+        self, trace_id: str, span_id: str, is_sampled: bool
+    ) -> None:
+        pass
+
+    def record_rpc_latency(
+        self,
+        method: str,
+        target: str,
+        rpc_latency: float,
+        status_code: grpc.StatusCode,
+    ) -> None:
+        status_code = GRPC_STATUS_CODE_TO_STRING.get(status_code, "UNKNOWN")
+        _cyobservability._record_rpc_latency(
+            self.exporter, method, target, rpc_latency, status_code
+        )
diff --git a/src/python/grpcio_observability/grpc_observability/_open_telemetry_plugin.py b/src/python/grpcio_observability/grpc_observability/_open_telemetry_plugin.py
new file mode 100644
index 00000000000..823d30fa6b4
--- /dev/null
+++ b/src/python/grpcio_observability/grpc_observability/_open_telemetry_plugin.py
@@ -0,0 +1,254 @@
+# Copyright 2023 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import abc
+from typing import Dict, Iterable, List, Optional, Union
+
+# pytype: disable=pyi-error
+import grpc
+from grpc_observability import _open_telemetry_measures
+from grpc_observability._cyobservability import MetricsName
+from grpc_observability._observability import StatsData
+from opentelemetry.sdk.metrics import Counter
+from opentelemetry.sdk.metrics import Histogram
+from opentelemetry.sdk.metrics import Meter
+from opentelemetry.sdk.metrics import MeterProvider
+
+GRPC_METHOD_LABEL = "grpc.method"
+GRPC_TARGET_LABEL = "grpc.target"
+GRPC_OTHER_LABEL_VALUE = "other"
+
+
+class OpenTelemetryLabelInjector(abc.ABC):
+    """
+    An interface that allows you to add additional labels on the calls traced.
+
+    Please note that this class is still work in progress and NOT READY to be used.
+    """
+
+    _labels: List[Dict[str, str]]
+
+    def __init__(self):
+        # Calls Python OTel API to detect resource and get labels, save
+        # those lables to OpenTelemetryLabelInjector.labels.
+        pass
+
+    @abc.abstractmethod
+    def get_labels(self):
+        # Get additional labels for this OpenTelemetryLabelInjector.
+        raise NotImplementedError()
+
+
+class OpenTelemetryPluginOption(abc.ABC):
+    """
+    An interface that allows you to add additional function to OpenTelemetryPlugin.
+
+    Please note that this class is still work in progress and NOT READY to be used.
+    """
+
+    @abc.abstractmethod
+    def is_active_on_method(self, method: str) -> bool:
+        """Determines whether this plugin option is active on a given method.
+
+        Args:
+          method: Required. The RPC method, for example: `/helloworld.Greeter/SayHello`.
+
+        Returns:
+          True if this this plugin option is active on the giving method, false otherwise.
+        """
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def is_active_on_server(self, channel_args: List[str]) -> bool:
+        """Determines whether this plugin option is active on a given server.
+
+        Args:
+          channel_args: Required. The channel args used for server.
+          TODO(xuanwn): detail on what channel_args will contain.
+
+        Returns:
+          True if this this plugin option is active on the server, false otherwise.
+        """
+        raise NotImplementedError()
+
+    @abc.abstractmethod
+    def get_label_injector(self) -> Optional[OpenTelemetryLabelInjector]:
+        # Returns the LabelsInjector used by this plugin option, or None.
+        raise NotImplementedError()
+
+
+# pylint: disable=no-self-use
+class OpenTelemetryPlugin:
+    """Describes a Plugin for OpenTelemetry observability."""
+
+    def get_plugin_options(
+        self,
+    ) -> Iterable[OpenTelemetryPluginOption]:
+        return []
+
+    def get_meter_provider(self) -> Optional[MeterProvider]:
+        return None
+
+    def target_attribute_filter(
+        self, target: str  # pylint: disable=unused-argument
+    ) -> bool:
+        """
+        If set, this will be called per channel to decide whether to record the
+        target attribute on client or to replace it with "other".
+        This helps reduce the cardinality on metrics in cases where many channels
+        are created with different targets in the same binary (which might happen
+        for example, if the channel target string uses IP addresses directly).
+
+        Args:
+            target: The target for the RPC.
+
+        Returns:
+            bool: True means the original target string will be used, False means target string
+            will be replaced with "other".
+        """
+        return True
+
+    def generic_method_attribute_filter(
+        self, method: str  # pylint: disable=unused-argument
+    ) -> bool:
+        """
+        If set, this will be called with a generic method type to decide whether to
+        record the method name or to replace it with "other".
+
+        Note that pre-registered methods will always be recorded no matter what this
+        function returns.
+
+        Args:
+            method: The method name for the RPC.
+
+        Returns:
+            bool: True means the original method name will be used, False means method name
+            will be replaced with "other".
+        """
+        return False
+
+
+class _OpenTelemetryPlugin:
+    _plugin: OpenTelemetryPlugin
+    _metric_to_recorder: Dict[MetricsName, Union[Counter, Histogram]]
+
+    def __init__(self, plugin: OpenTelemetryPlugin):
+        self._plugin = plugin
+        self._metric_to_recorder = dict()
+
+        meter_provider = self._plugin.get_meter_provider()
+        if meter_provider:
+            meter = meter_provider.get_meter("grpc-python", grpc.__version__)
+            enabled_metrics = _open_telemetry_measures.base_metrics()
+            self._metric_to_recorder = self._register_metrics(
+                meter, enabled_metrics
+            )
+
+    def _should_record(self, stats_data: StatsData) -> bool:
+        # Decide if this plugin should record the stats_data.
+        return stats_data.name in self._metric_to_recorder.keys()
+
+    def _record_stats_data(self, stats_data: StatsData) -> None:
+        recorder = self._metric_to_recorder[stats_data.name]
+
+        target = stats_data.labels.get(GRPC_TARGET_LABEL, "")
+        if not self._plugin.target_attribute_filter(target):
+            # Filter target name.
+            stats_data.labels[GRPC_TARGET_LABEL] = GRPC_OTHER_LABEL_VALUE
+
+        method = stats_data.labels.get(GRPC_METHOD_LABEL, "")
+        if not self._plugin.generic_method_attribute_filter(method):
+            # Filter method name.
+            stats_data.labels[GRPC_METHOD_LABEL] = GRPC_OTHER_LABEL_VALUE
+
+        value = 0
+        if stats_data.measure_double:
+            value = stats_data.value_float
+        else:
+            value = stats_data.value_int
+        if isinstance(recorder, Counter):
+            recorder.add(value, attributes=stats_data.labels)
+        elif isinstance(recorder, Histogram):
+            recorder.record(value, attributes=stats_data.labels)
+
+    # pylint: disable=no-self-use
+    def maybe_record_stats_data(self, stats_data: List[StatsData]) -> None:
+        # Records stats data to MeterProvider.
+        if self._should_record(stats_data):
+            self._record_stats_data(stats_data)
+
+    def _register_metrics(
+        self, meter: Meter, metrics: List[_open_telemetry_measures.Metric]
+    ) -> Dict[MetricsName, Union[Counter, Histogram]]:
+        metric_to_recorder_map = {}
+        recorder = None
+        for metric in metrics:
+            if metric == _open_telemetry_measures.CLIENT_ATTEMPT_STARTED:
+                recorder = meter.create_counter(
+                    name=metric.name,
+                    unit=metric.unit,
+                    description=metric.description,
+                )
+            elif metric == _open_telemetry_measures.CLIENT_ATTEMPT_DURATION:
+                recorder = meter.create_histogram(
+                    name=metric.name,
+                    unit=metric.unit,
+                    description=metric.description,
+                )
+            elif metric == _open_telemetry_measures.CLIENT_RPC_DURATION:
+                recorder = meter.create_histogram(
+                    name=metric.name,
+                    unit=metric.unit,
+                    description=metric.description,
+                )
+            elif metric == _open_telemetry_measures.CLIENT_ATTEMPT_SEND_BYTES:
+                recorder = meter.create_histogram(
+                    name=metric.name,
+                    unit=metric.unit,
+                    description=metric.description,
+                )
+            elif (
+                metric == _open_telemetry_measures.CLIENT_ATTEMPT_RECEIVED_BYTES
+            ):
+                recorder = meter.create_histogram(
+                    name=metric.name,
+                    unit=metric.unit,
+                    description=metric.description,
+                )
+            elif metric == _open_telemetry_measures.SERVER_STARTED_RPCS:
+                recorder = meter.create_counter(
+                    name=metric.name,
+                    unit=metric.unit,
+                    description=metric.description,
+                )
+            elif metric == _open_telemetry_measures.SERVER_RPC_DURATION:
+                recorder = meter.create_histogram(
+                    name=metric.name,
+                    unit=metric.unit,
+                    description=metric.description,
+                )
+            elif metric == _open_telemetry_measures.SERVER_RPC_SEND_BYTES:
+                recorder = meter.create_histogram(
+                    name=metric.name,
+                    unit=metric.unit,
+                    description=metric.description,
+                )
+            elif metric == _open_telemetry_measures.SERVER_RPC_RECEIVED_BYTES:
+                recorder = meter.create_histogram(
+                    name=metric.name,
+                    unit=metric.unit,
+                    description=metric.description,
+                )
+            metric_to_recorder_map[metric.cyname] = recorder
+        return metric_to_recorder_map
diff --git a/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc b/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc
index 46a091a8fa2..d29aae548a4 100644
--- a/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc
+++ b/src/python/grpcio_observability/grpc_observability/client_call_tracer.cc
@@ -41,9 +41,11 @@ constexpr uint32_t
 //
 
 PythonOpenCensusCallTracer::PythonOpenCensusCallTracer(
-    const char* method, const char* trace_id, const char* parent_span_id,
-    bool tracing_enabled)
-    : method_(GetMethod(method)), tracing_enabled_(tracing_enabled) {
+    const char* method, const char* target, const char* trace_id,
+    const char* parent_span_id, bool tracing_enabled)
+    : method_(GetMethod(method)),
+      target_(GetTarget(target)),
+      tracing_enabled_(tracing_enabled) {
   GenerateClientContext(absl::StrCat("Sent.", method_),
                         absl::string_view(trace_id),
                         absl::string_view(parent_span_id), &context_);
@@ -84,7 +86,7 @@ PythonOpenCensusCallTracer::~PythonOpenCensusCallTracer() {
     RecordIntMetric(kRpcClientTransparentRetriesPerCallMeasureName,
                     transparent_retries_, context_.Labels());
     RecordDoubleMetric(kRpcClientRetryDelayPerCallMeasureName,
-                       ToDoubleMilliseconds(retry_delay_), context_.Labels());
+                       ToDoubleSeconds(retry_delay_), context_.Labels());
   }
 
   if (tracing_enabled_) {
@@ -146,6 +148,7 @@ PythonOpenCensusCallTracer::PythonOpenCensusCallAttemptTracer::
     return;
   }
   context_.Labels().emplace_back(kClientMethod, std::string(parent_->method_));
+  context_.Labels().emplace_back(kClientTarget, std::string(parent_->target_));
   RecordIntMetric(kRpcClientStartedRpcsMeasureName, 1, context_.Labels());
 }
 
@@ -225,6 +228,7 @@ void PythonOpenCensusCallTracer::PythonOpenCensusCallAttemptTracer::
 
   std::string final_status = absl::StatusCodeToString(status_code_);
   context_.Labels().emplace_back(kClientMethod, std::string(parent_->method_));
+  context_.Labels().emplace_back(kClientTarget, std::string(parent_->target_));
   context_.Labels().emplace_back(kClientStatus, final_status);
   RecordDoubleMetric(
       kRpcClientSentBytesPerRpcMeasureName,
@@ -238,12 +242,11 @@ void PythonOpenCensusCallTracer::PythonOpenCensusCallAttemptTracer::
                               ? transport_stream_stats->incoming.data_bytes
                               : 0),
       context_.Labels());
-  RecordDoubleMetric(
-      kRpcClientServerLatencyMeasureName,
-      absl::ToDoubleMilliseconds(absl::Nanoseconds(elapsed_time)),
-      context_.Labels());
+  RecordDoubleMetric(kRpcClientServerLatencyMeasureName,
+                     absl::ToDoubleSeconds(absl::Nanoseconds(elapsed_time)),
+                     context_.Labels());
   RecordDoubleMetric(kRpcClientRoundtripLatencyMeasureName,
-                     absl::ToDoubleMilliseconds(absl::Now() - start_time_),
+                     absl::ToDoubleSeconds(absl::Now() - start_time_),
                      context_.Labels());
   RecordIntMetric(kRpcClientCompletedRpcMeasureName, 1, context_.Labels());
 }
diff --git a/src/python/grpcio_observability/grpc_observability/client_call_tracer.h b/src/python/grpcio_observability/grpc_observability/client_call_tracer.h
index 47a279865af..f51edc50620 100644
--- a/src/python/grpcio_observability/grpc_observability/client_call_tracer.h
+++ b/src/python/grpcio_observability/grpc_observability/client_call_tracer.h
@@ -90,7 +90,8 @@ class PythonOpenCensusCallTracer : public grpc_core::ClientCallTracer {
     absl::StatusCode status_code_;
   };
 
-  explicit PythonOpenCensusCallTracer(const char* method, const char* trace_id,
+  explicit PythonOpenCensusCallTracer(const char* method, const char* target,
+                                      const char* trace_id,
                                       const char* parent_span_id,
                                       bool tracing_enabled);
   ~PythonOpenCensusCallTracer() override;
@@ -119,6 +120,8 @@ class PythonOpenCensusCallTracer : public grpc_core::ClientCallTracer {
 
   // Client method.
   absl::string_view method_;
+  // Client target.
+  absl::string_view target_;
   PythonCensusContext context_;
   bool tracing_enabled_;
   mutable grpc_core::Mutex mu_;
diff --git a/src/python/grpcio_observability/grpc_observability/constants.h b/src/python/grpcio_observability/grpc_observability/constants.h
index 87dba68670a..79212599487 100644
--- a/src/python/grpcio_observability/grpc_observability/constants.h
+++ b/src/python/grpcio_observability/grpc_observability/constants.h
@@ -19,10 +19,11 @@
 
 namespace grpc_observability {
 
-const std::string kClientMethod = "grpc_client_method";
-const std::string kClientStatus = "grpc_client_status";
-const std::string kServerMethod = "grpc_server_method";
-const std::string kServerStatus = "grpc_server_status";
+const std::string kClientMethod = "grpc.method";
+const std::string kClientTarget = "grpc.target";
+const std::string kClientStatus = "grpc.status";
+const std::string kServerMethod = "grpc.method";
+const std::string kServerStatus = "grpc.status";
 
 typedef enum { kMeasurementDouble = 0, kMeasurementInt } MeasurementType;
 
diff --git a/src/python/grpcio_observability/grpc_observability/observability_util.cc b/src/python/grpcio_observability/grpc_observability/observability_util.cc
index cbbab6a8c93..6af56d45601 100644
--- a/src/python/grpcio_observability/grpc_observability/observability_util.cc
+++ b/src/python/grpcio_observability/grpc_observability/observability_util.cc
@@ -91,10 +91,10 @@ void NativeObservabilityInit() {
   g_census_data_buffer = new std::queue<CensusData>;
 }
 
-void* CreateClientCallTracer(const char* method, const char* trace_id,
-                             const char* parent_span_id) {
+void* CreateClientCallTracer(const char* method, const char* target,
+                             const char* trace_id, const char* parent_span_id) {
   void* client_call_tracer = new PythonOpenCensusCallTracer(
-      method, trace_id, parent_span_id, PythonCensusTracingEnabled());
+      method, target, trace_id, parent_span_id, PythonCensusTracingEnabled());
   return client_call_tracer;
 }
 
diff --git a/src/python/grpcio_observability/grpc_observability/observability_util.h b/src/python/grpcio_observability/grpc_observability/observability_util.h
index 6b4c1f41a3f..593abc4062f 100644
--- a/src/python/grpcio_observability/grpc_observability/observability_util.h
+++ b/src/python/grpcio_observability/grpc_observability/observability_util.h
@@ -50,8 +50,8 @@ extern std::queue<CensusData>* g_census_data_buffer;
 extern std::mutex g_census_data_buffer_mutex;
 extern std::condition_variable g_census_data_buffer_cv;
 
-void* CreateClientCallTracer(const char* method, const char* trace_id,
-                             const char* parent_span_id);
+void* CreateClientCallTracer(const char* method, const char* target,
+                             const char* trace_id, const char* parent_span_id);
 
 void* CreateServerCallTracerFactory();
 
diff --git a/src/python/grpcio_observability/grpc_observability/python_census_context.h b/src/python/grpcio_observability/grpc_observability/python_census_context.h
index 6d41a7988de..bca0ae65da1 100644
--- a/src/python/grpcio_observability/grpc_observability/python_census_context.h
+++ b/src/python/grpcio_observability/grpc_observability/python_census_context.h
@@ -278,6 +278,10 @@ inline absl::string_view GetMethod(const char* method) {
   return absl::StripPrefix(absl::string_view(method), "/");
 }
 
+inline absl::string_view GetTarget(const char* target) {
+  return absl::string_view(target);
+}
+
 // Fills a pre-allocated buffer with the value for the grpc-trace-bin header.
 // The buffer must be at least kGrpcTraceBinHeaderLen bytes long.
 void ToGrpcTraceBinHeader(const PythonCensusContext& ctx, uint8_t* out);
diff --git a/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc b/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc
index dd7a4826eaf..6c1e68bfc37 100644
--- a/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc
+++ b/src/python/grpcio_observability/grpc_observability/server_call_tracer.cc
@@ -226,7 +226,7 @@ void PythonOpenCensusServerCallTracer::RecordEnd(
   if (PythonCensusStatsEnabled()) {
     const uint64_t request_size = GetOutgoingDataSize(final_info);
     const uint64_t response_size = GetIncomingDataSize(final_info);
-    double elapsed_time_ms = absl::ToDoubleMilliseconds(elapsed_time_);
+    double elapsed_time_s = absl::ToDoubleSeconds(elapsed_time_);
     context_.Labels().emplace_back(kServerMethod, std::string(method_));
     context_.Labels().emplace_back(
         kServerStatus,
@@ -235,7 +235,7 @@ void PythonOpenCensusServerCallTracer::RecordEnd(
                        static_cast<double>(response_size), context_.Labels());
     RecordDoubleMetric(kRpcServerReceivedBytesPerRpcMeasureName,
                        static_cast<double>(request_size), context_.Labels());
-    RecordDoubleMetric(kRpcServerServerLatencyMeasureName, elapsed_time_ms,
+    RecordDoubleMetric(kRpcServerServerLatencyMeasureName, elapsed_time_s,
                        context_.Labels());
     RecordIntMetric(kRpcServerCompletedRpcMeasureName, 1, context_.Labels());
     RecordIntMetric(kRpcServerSentMessagesPerRpcMeasureName,
@@ -261,10 +261,11 @@ void PythonOpenCensusServerCallTracer::RecordEnd(
 
 grpc_core::ServerCallTracer*
 PythonOpenCensusServerCallTracerFactory::CreateNewServerCallTracer(
-    grpc_core::Arena* arena) {
+    grpc_core::Arena* arena, const grpc_core::ChannelArgs& channel_args) {
   // We don't use arena here to to ensure that memory is allocated and freed in
   // the same DLL in Windows.
   (void)arena;
+  (void)channel_args;
   return new PythonOpenCensusServerCallTracer();
 }
 
diff --git a/src/python/grpcio_observability/grpc_observability/server_call_tracer.h b/src/python/grpcio_observability/grpc_observability/server_call_tracer.h
index a4354b69b8c..3792ae00f8b 100644
--- a/src/python/grpcio_observability/grpc_observability/server_call_tracer.h
+++ b/src/python/grpcio_observability/grpc_observability/server_call_tracer.h
@@ -30,7 +30,8 @@ class PythonOpenCensusServerCallTracerFactory
     : public grpc_core::ServerCallTracerFactory {
  public:
   grpc_core::ServerCallTracer* CreateNewServerCallTracer(
-      grpc_core::Arena* arena) override;
+      grpc_core::Arena* arena,
+      const grpc_core::ChannelArgs& channel_args) override;
 };
 
 inline absl::string_view GetMethod(const grpc_core::Slice& path) {
diff --git a/src/python/grpcio_observability/setup.py b/src/python/grpcio_observability/setup.py
index 4bab978abe6..cac2417d919 100644
--- a/src/python/grpcio_observability/setup.py
+++ b/src/python/grpcio_observability/setup.py
@@ -288,8 +288,10 @@ setuptools.setup(
     packages=list(PACKAGES),
     python_requires=">=3.7",
     install_requires=[
-        "grpcio>={version}".format(version=grpc_version.VERSION),
+        "grpcio=={version}".format(version=grpc_version.VERSION),
         "setuptools>=59.6.0",
+        "opentelemetry-sdk==1.21.0",
+        "opentelemetry-api==1.21.0",
     ],
     cmdclass={
         "build_ext": BuildExt,
diff --git a/src/python/grpcio_testing/grpc_testing/_channel/_channel.py b/src/python/grpcio_testing/grpc_testing/_channel/_channel.py
index 170533f63ea..3f12e1f4df8 100644
--- a/src/python/grpcio_testing/grpc_testing/_channel/_channel.py
+++ b/src/python/grpcio_testing/grpc_testing/_channel/_channel.py
@@ -31,23 +31,42 @@ class TestingChannel(grpc_testing.Channel):
     def unsubscribe(self, callback):
         raise NotImplementedError()
 
+    def _get_registered_call_handle(self, method: str) -> int:
+        pass
+
     def unary_unary(
-        self, method, request_serializer=None, response_deserializer=None
+        self,
+        method,
+        request_serializer=None,
+        response_deserializer=None,
+        _registered_method=False,
     ):
         return _multi_callable.UnaryUnary(method, self._state)
 
     def unary_stream(
-        self, method, request_serializer=None, response_deserializer=None
+        self,
+        method,
+        request_serializer=None,
+        response_deserializer=None,
+        _registered_method=False,
     ):
         return _multi_callable.UnaryStream(method, self._state)
 
     def stream_unary(
-        self, method, request_serializer=None, response_deserializer=None
+        self,
+        method,
+        request_serializer=None,
+        response_deserializer=None,
+        _registered_method=False,
     ):
         return _multi_callable.StreamUnary(method, self._state)
 
     def stream_stream(
-        self, method, request_serializer=None, response_deserializer=None
+        self,
+        method,
+        request_serializer=None,
+        response_deserializer=None,
+        _registered_method=False,
     ):
         return _multi_callable.StreamStream(method, self._state)
 
diff --git a/src/python/grpcio_tests/setup.py b/src/python/grpcio_tests/setup.py
index 19b34ecccb8..83f3bcb55b0 100644
--- a/src/python/grpcio_tests/setup.py
+++ b/src/python/grpcio_tests/setup.py
@@ -43,6 +43,7 @@ INSTALL_REQUIRES = (
     "grpcio-status>={version}".format(version=grpc_version.VERSION),
     "grpcio-tools>={version}".format(version=grpc_version.VERSION),
     "grpcio-health-checking>={version}".format(version=grpc_version.VERSION),
+    "grpcio-observability>={version}".format(version=grpc_version.VERSION),
     "xds-protos>={version}".format(version=grpc_version.VERSION),
     "oauth2client>=1.4.7",
     "protobuf>=4.21.6rc1,!=4.22.0.*",
diff --git a/src/python/grpcio_tests/tests/_sanity/_sanity_test.py b/src/python/grpcio_tests/tests/_sanity/_sanity_test.py
index 51e23f54e3b..66d920bda56 100644
--- a/src/python/grpcio_tests/tests/_sanity/_sanity_test.py
+++ b/src/python/grpcio_tests/tests/_sanity/_sanity_test.py
@@ -42,6 +42,7 @@ class SanityTest(unittest.TestCase):
 
         tests_json_string = pkgutil.get_data(self.TEST_PKG_PATH, "tests.json")
         tests_json = json.loads(tests_json_string.decode())
+        final_tests = []
 
         # Observability is not supported in Windows and MacOS and Asyncio.
         if (
@@ -50,10 +51,12 @@ class SanityTest(unittest.TestCase):
             or self.TEST_PKG_PATH == "tests_aio"
         ):
             for test_case in tests_json:
-                if "_observability_test" in test_case:
-                    tests_json.remove(test_case)
+                if "observability" not in test_case:
+                    final_tests.append(test_case)
+        else:
+            final_tests = tests_json
 
-        self.assertSequenceEqual(tests_json, test_suite_names)
+        self.assertSequenceEqual(final_tests, test_suite_names)
         self.assertGreater(len(test_suite_names), 0)
 
 
diff --git a/src/python/grpcio_tests/tests/channelz/_channelz_servicer_test.py b/src/python/grpcio_tests/tests/channelz/_channelz_servicer_test.py
index 78333fc62c7..2379ab59a3c 100644
--- a/src/python/grpcio_tests/tests/channelz/_channelz_servicer_test.py
+++ b/src/python/grpcio_tests/tests/channelz/_channelz_servicer_test.py
@@ -99,16 +99,20 @@ class ChannelzServicerTest(unittest.TestCase):
     def _send_successful_unary_unary(self, idx):
         _, r = (
             self._pairs[idx]
-            .channel.unary_unary(_SUCCESSFUL_UNARY_UNARY)
+            .channel.unary_unary(
+                _SUCCESSFUL_UNARY_UNARY,
+                _registered_method=True,
+            )
             .with_call(_REQUEST)
         )
         self.assertEqual(r.code(), grpc.StatusCode.OK)
 
     def _send_failed_unary_unary(self, idx):
         try:
-            self._pairs[idx].channel.unary_unary(_FAILED_UNARY_UNARY).with_call(
-                _REQUEST
-            )
+            self._pairs[idx].channel.unary_unary(
+                _FAILED_UNARY_UNARY,
+                _registered_method=True,
+            ).with_call(_REQUEST)
         except grpc.RpcError:
             return
         else:
@@ -117,7 +121,10 @@ class ChannelzServicerTest(unittest.TestCase):
     def _send_successful_stream_stream(self, idx):
         response_iterator = (
             self._pairs[idx]
-            .channel.stream_stream(_SUCCESSFUL_STREAM_STREAM)
+            .channel.stream_stream(
+                _SUCCESSFUL_STREAM_STREAM,
+                _registered_method=True,
+            )
             .__call__(iter([_REQUEST] * test_constants.STREAM_LENGTH))
         )
         cnt = 0
diff --git a/src/python/grpcio_tests/tests/csds/csds_test.py b/src/python/grpcio_tests/tests/csds/csds_test.py
index c58cb5943d2..15bf4e8a49b 100644
--- a/src/python/grpcio_tests/tests/csds/csds_test.py
+++ b/src/python/grpcio_tests/tests/csds/csds_test.py
@@ -92,7 +92,10 @@ class TestCsds(unittest.TestCase):
 
         # Force the XdsClient to initialize and request a resource
         with self.assertRaises(grpc.RpcError) as rpc_error:
-            dummy_channel.unary_unary("")(b"", wait_for_ready=False, timeout=1)
+            dummy_channel.unary_unary(
+                "",
+                _registered_method=True,
+            )(b"", wait_for_ready=False, timeout=1)
         self.assertEqual(
             grpc.StatusCode.DEADLINE_EXCEEDED, rpc_error.exception.code()
         )
diff --git a/src/python/grpcio_tests/tests/observability/BUILD.bazel b/src/python/grpcio_tests/tests/observability/BUILD.bazel
index a66724dd0d4..29bd6a90e60 100644
--- a/src/python/grpcio_tests/tests/observability/BUILD.bazel
+++ b/src/python/grpcio_tests/tests/observability/BUILD.bazel
@@ -13,13 +13,33 @@
 # limitations under the License.
 package(default_visibility = ["//visibility:public"])
 
+py_library(
+    name = "test_server",
+    srcs = ["_test_server.py"],
+)
+
 py_test(
     name = "_observability_test",
     size = "small",
-    srcs = glob(["*.py"]),
+    srcs = ["_observability_test.py"],
     imports = ["../../"],
     main = "_observability_test.py",
     deps = [
+        ":test_server",
+        "//src/python/grpcio/grpc:grpcio",
+        "//src/python/grpcio_observability/grpc_observability:pyobservability",
+        "//src/python/grpcio_tests/tests/testing",
+    ],
+)
+
+py_test(
+    name = "_open_telemetry_observability_test",
+    size = "small",
+    srcs = ["_open_telemetry_observability_test.py"],
+    imports = ["../../"],
+    main = "_open_telemetry_observability_test.py",
+    deps = [
+        ":test_server",
         "//src/python/grpcio/grpc:grpcio",
         "//src/python/grpcio_observability/grpc_observability:pyobservability",
         "//src/python/grpcio_tests/tests/testing",
diff --git a/src/python/grpcio_tests/tests/observability/_observability_test.py b/src/python/grpcio_tests/tests/observability/_observability_test.py
index 854844f341a..55450b035d9 100644
--- a/src/python/grpcio_tests/tests/observability/_observability_test.py
+++ b/src/python/grpcio_tests/tests/observability/_observability_test.py
@@ -12,13 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from concurrent import futures
-import json
 import logging
 import os
-import random
 import sys
-from typing import Any, Dict, List
+from typing import List
 import unittest
 
 import grpc
@@ -26,41 +23,11 @@ import grpc_observability
 from grpc_observability import _cyobservability
 from grpc_observability import _observability
 
-logger = logging.getLogger(__name__)
+from tests.observability import _test_server
 
-_REQUEST = b"\x00\x00\x00"
-_RESPONSE = b"\x00\x00\x00"
+logger = logging.getLogger(__name__)
 
-_UNARY_UNARY = "/test/UnaryUnary"
-_UNARY_STREAM = "/test/UnaryStream"
-_STREAM_UNARY = "/test/StreamUnary"
-_STREAM_STREAM = "/test/StreamStream"
 STREAM_LENGTH = 5
-TRIGGER_RPC_METADATA = ("control", "trigger_rpc")
-TRIGGER_RPC_TO_NEW_SERVER_METADATA = ("to_new_server", "")
-
-CONFIG_ENV_VAR_NAME = "GRPC_GCP_OBSERVABILITY_CONFIG"
-CONFIG_FILE_ENV_VAR_NAME = "GRPC_GCP_OBSERVABILITY_CONFIG_FILE"
-
-_VALID_CONFIG_TRACING_STATS = {
-    "project_id": "test-project",
-    "cloud_trace": {"sampling_rate": 1.00},
-    "cloud_monitoring": {},
-}
-_VALID_CONFIG_TRACING_ONLY = {
-    "project_id": "test-project",
-    "cloud_trace": {"sampling_rate": 1.00},
-}
-_VALID_CONFIG_STATS_ONLY = {
-    "project_id": "test-project",
-    "cloud_monitoring": {},
-}
-_VALID_CONFIG_STATS_ONLY_STR = """
-{
-    'project_id': 'test-project',
-    'cloud_monitoring': {}
-}
-"""
 
 
 class TestExporter(_observability.Exporter):
@@ -84,69 +51,17 @@ class TestExporter(_observability.Exporter):
         self.span_collecter.extend(tracing_data)
 
 
-def handle_unary_unary(request, servicer_context):
-    if TRIGGER_RPC_METADATA in servicer_context.invocation_metadata():
-        for k, v in servicer_context.invocation_metadata():
-            if "port" in k:
-                unary_unary_call(port=int(v))
-            if "to_new_server" in k:
-                second_server = grpc.server(
-                    futures.ThreadPoolExecutor(max_workers=10)
-                )
-                second_server.add_generic_rpc_handlers((_GenericHandler(),))
-                second_server_port = second_server.add_insecure_port("[::]:0")
-                second_server.start()
-                unary_unary_call(port=second_server_port)
-                second_server.stop(0)
-    return _RESPONSE
-
-
-def handle_unary_stream(request, servicer_context):
-    for _ in range(STREAM_LENGTH):
-        yield _RESPONSE
-
-
-def handle_stream_unary(request_iterator, servicer_context):
-    return _RESPONSE
-
-
-def handle_stream_stream(request_iterator, servicer_context):
-    for request in request_iterator:
-        yield _RESPONSE
-
-
-class _MethodHandler(grpc.RpcMethodHandler):
-    def __init__(self, request_streaming, response_streaming):
-        self.request_streaming = request_streaming
-        self.response_streaming = response_streaming
-        self.request_deserializer = None
-        self.response_serializer = None
-        self.unary_unary = None
-        self.unary_stream = None
-        self.stream_unary = None
-        self.stream_stream = None
-        if self.request_streaming and self.response_streaming:
-            self.stream_stream = handle_stream_stream
-        elif self.request_streaming:
-            self.stream_unary = handle_stream_unary
-        elif self.response_streaming:
-            self.unary_stream = handle_unary_stream
-        else:
-            self.unary_unary = handle_unary_unary
-
-
-class _GenericHandler(grpc.GenericRpcHandler):
-    def service(self, handler_call_details):
-        if handler_call_details.method == _UNARY_UNARY:
-            return _MethodHandler(False, False)
-        elif handler_call_details.method == _UNARY_STREAM:
-            return _MethodHandler(False, True)
-        elif handler_call_details.method == _STREAM_UNARY:
-            return _MethodHandler(True, False)
-        elif handler_call_details.method == _STREAM_STREAM:
-            return _MethodHandler(True, True)
-        else:
-            return None
+class _ClientUnaryUnaryInterceptor(grpc.UnaryUnaryClientInterceptor):
+    def intercept_unary_unary(
+        self, continuation, client_call_details, request_or_iterator
+    ):
+        response = continuation(client_call_details, request_or_iterator)
+        return response
+
+
+class _ServerInterceptor(grpc.ServerInterceptor):
+    def intercept_service(self, continuation, handler_call_details):
+        return continuation(handler_call_details)
 
 
 @unittest.skipIf(
@@ -162,173 +77,118 @@ class ObservabilityTest(unittest.TestCase):
         self._port = None
 
     def tearDown(self):
-        os.environ[CONFIG_ENV_VAR_NAME] = ""
-        os.environ[CONFIG_FILE_ENV_VAR_NAME] = ""
         if self._server:
             self._server.stop(0)
 
     def testRecordUnaryUnary(self):
-        self._set_config_file(_VALID_CONFIG_TRACING_STATS)
-        with grpc_observability.GCPOpenCensusObservability(
+        with grpc_observability.OpenTelemetryObservability(
             exporter=self.test_exporter
         ):
-            self._start_server()
-            unary_unary_call(port=self._port)
+            server, port = _test_server.start_server()
+            self._server = server
+            _test_server.unary_unary_call(port=port)
 
         self.assertGreater(len(self.all_metric), 0)
         self._validate_metrics(self.all_metric)
 
-    def testThrowErrorWithoutConfig(self):
-        with self.assertRaises(ValueError):
-            with grpc_observability.GCPOpenCensusObservability(
-                exporter=self.test_exporter
-            ):
-                pass
-
-    def testThrowErrorWithInvalidConfig(self):
-        _INVALID_CONFIG = "INVALID"
-        self._set_config_file(_INVALID_CONFIG)
-        with self.assertRaises(ValueError):
-            with grpc_observability.GCPOpenCensusObservability(
-                exporter=self.test_exporter
-            ):
-                pass
-
-    def testNoErrorAndDataWithEmptyConfig(self):
-        _EMPTY_CONFIG = {}
-        self._set_config_file(_EMPTY_CONFIG)
-        # Empty config still require project_id
-        os.environ["GCP_PROJECT"] = "test-project"
-        with grpc_observability.GCPOpenCensusObservability(
+    def testRecordUnaryUnaryWithClientInterceptor(self):
+        interceptor = _ClientUnaryUnaryInterceptor()
+        with grpc_observability.OpenTelemetryObservability(
             exporter=self.test_exporter
         ):
-            self._start_server()
-            unary_unary_call(port=self._port)
-
-        self.assertEqual(len(self.all_metric), 0)
+            server, port = _test_server.start_server()
+            self._server = server
+            _test_server.intercepted_unary_unary_call(
+                port=port, interceptors=interceptor
+            )
 
-    def testThrowErrorWhenCallingMultipleInit(self):
-        self._set_config_file(_VALID_CONFIG_TRACING_STATS)
-        with self.assertRaises(ValueError):
-            with grpc_observability.GCPOpenCensusObservability(
-                exporter=self.test_exporter
-            ) as o11y:
-                grpc._observability.observability_init(o11y)
+        self.assertGreater(len(self.all_metric), 0)
+        self._validate_metrics(self.all_metric)
 
-    def testRecordUnaryUnaryStatsOnly(self):
-        self._set_config_file(_VALID_CONFIG_STATS_ONLY)
-        with grpc_observability.GCPOpenCensusObservability(
+    def testRecordUnaryUnaryWithServerInterceptor(self):
+        interceptor = _ServerInterceptor()
+        with grpc_observability.OpenTelemetryObservability(
             exporter=self.test_exporter
         ):
-            self._start_server()
-            unary_unary_call(port=self._port)
+            server, port = _test_server.start_server(interceptors=[interceptor])
+            self._server = server
+            _test_server.unary_unary_call(port=port)
 
         self.assertGreater(len(self.all_metric), 0)
         self._validate_metrics(self.all_metric)
 
-    def testRecordUnaryUnaryTracingOnly(self):
-        self._set_config_file(_VALID_CONFIG_TRACING_ONLY)
-        with grpc_observability.GCPOpenCensusObservability(
-            exporter=self.test_exporter
-        ):
-            self._start_server()
-            unary_unary_call(port=self._port)
-
-        self.assertEqual(len(self.all_metric), 0)
+    def testThrowErrorWhenCallingMultipleInit(self):
+        with self.assertRaises(ValueError):
+            with grpc_observability.OpenTelemetryObservability(
+                exporter=self.test_exporter
+            ) as o11y:
+                grpc._observability.observability_init(o11y)
 
     def testRecordUnaryStream(self):
-        self._set_config_file(_VALID_CONFIG_TRACING_STATS)
-        with grpc_observability.GCPOpenCensusObservability(
+        with grpc_observability.OpenTelemetryObservability(
             exporter=self.test_exporter
         ):
-            self._start_server()
-            unary_stream_call(port=self._port)
+            server, port = _test_server.start_server()
+            self._server = server
+            _test_server.unary_stream_call(port=port)
 
         self.assertGreater(len(self.all_metric), 0)
         self._validate_metrics(self.all_metric)
 
     def testRecordStreamUnary(self):
-        self._set_config_file(_VALID_CONFIG_TRACING_STATS)
-        with grpc_observability.GCPOpenCensusObservability(
+        with grpc_observability.OpenTelemetryObservability(
             exporter=self.test_exporter
         ):
-            self._start_server()
-            stream_unary_call(port=self._port)
+            server, port = _test_server.start_server()
+            self._server = server
+            _test_server.stream_unary_call(port=port)
 
         self.assertTrue(len(self.all_metric) > 0)
-        self.assertTrue(len(self.all_span) > 0)
         self._validate_metrics(self.all_metric)
 
     def testRecordStreamStream(self):
-        self._set_config_file(_VALID_CONFIG_TRACING_STATS)
-        with grpc_observability.GCPOpenCensusObservability(
+        with grpc_observability.OpenTelemetryObservability(
             exporter=self.test_exporter
         ):
-            self._start_server()
-            stream_stream_call(port=self._port)
+            server, port = _test_server.start_server()
+            self._server = server
+            _test_server.stream_stream_call(port=port)
 
         self.assertGreater(len(self.all_metric), 0)
         self._validate_metrics(self.all_metric)
 
     def testNoRecordBeforeInit(self):
-        self._set_config_file(_VALID_CONFIG_TRACING_STATS)
-        self._start_server()
-        unary_unary_call(port=self._port)
+        server, port = _test_server.start_server()
+        _test_server.unary_unary_call(port=port)
         self.assertEqual(len(self.all_metric), 0)
-        self._server.stop(0)
+        server.stop(0)
 
-        with grpc_observability.GCPOpenCensusObservability(
+        with grpc_observability.OpenTelemetryObservability(
             exporter=self.test_exporter
         ):
-            self._start_server()
-            unary_unary_call(port=self._port)
+            server, port = _test_server.start_server()
+            self._server = server
+            _test_server.unary_unary_call(port=port)
 
         self.assertGreater(len(self.all_metric), 0)
         self._validate_metrics(self.all_metric)
 
     def testNoRecordAfterExit(self):
-        self._set_config_file(_VALID_CONFIG_TRACING_STATS)
-        with grpc_observability.GCPOpenCensusObservability(
+        with grpc_observability.OpenTelemetryObservability(
             exporter=self.test_exporter
         ):
-            self._start_server()
-            unary_unary_call(port=self._port)
+            server, port = _test_server.start_server()
+            self._server = server
+            self._port = port
+            _test_server.unary_unary_call(port=port)
 
         self.assertGreater(len(self.all_metric), 0)
         current_metric_len = len(self.all_metric)
         self._validate_metrics(self.all_metric)
 
-        unary_unary_call(port=self._port)
+        _test_server.unary_unary_call(port=self._port)
         self.assertEqual(len(self.all_metric), current_metric_len)
 
-    def testConfigFileOverEnvVar(self):
-        # env var have only stats enabled
-        os.environ[CONFIG_ENV_VAR_NAME] = _VALID_CONFIG_STATS_ONLY_STR
-        # config_file have only tracing enabled
-        self._set_config_file(_VALID_CONFIG_TRACING_ONLY)
-
-        with grpc_observability.GCPOpenCensusObservability(
-            exporter=self.test_exporter
-        ):
-            self._start_server()
-            unary_unary_call(port=self._port)
-
-        self.assertEqual(len(self.all_metric), 0)
-
-    def _set_config_file(self, config: Dict[str, Any]) -> None:
-        # Using random name here so multiple tests can run with different config files.
-        config_file_path = "/tmp/" + str(random.randint(0, 100000))
-        with open(config_file_path, "w", encoding="utf-8") as f:
-            f.write(json.dumps(config))
-        os.environ[CONFIG_FILE_ENV_VAR_NAME] = config_file_path
-
-    def _start_server(self) -> None:
-        self._server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))
-        self._server.add_generic_rpc_handlers((_GenericHandler(),))
-        self._port = self._server.add_insecure_port("[::]:0")
-        self._server.start()
-        return self._port
-
     def _validate_metrics(
         self, metrics: List[_observability.StatsData]
     ) -> None:
@@ -343,41 +203,6 @@ class ObservabilityTest(unittest.TestCase):
             self.assertTrue(name in metric_names)
 
 
-def unary_unary_call(port, metadata=None):
-    with grpc.insecure_channel(f"localhost:{port}") as channel:
-        multi_callable = channel.unary_unary(_UNARY_UNARY)
-        if metadata:
-            unused_response, call = multi_callable.with_call(
-                _REQUEST, metadata=metadata
-            )
-        else:
-            unused_response, call = multi_callable.with_call(_REQUEST)
-
-
-def unary_stream_call(port):
-    with grpc.insecure_channel(f"localhost:{port}") as channel:
-        multi_callable = channel.unary_stream(_UNARY_STREAM)
-        call = multi_callable(_REQUEST)
-        for _ in call:
-            pass
-
-
-def stream_unary_call(port):
-    with grpc.insecure_channel(f"localhost:{port}") as channel:
-        multi_callable = channel.stream_unary(_STREAM_UNARY)
-        unused_response, call = multi_callable.with_call(
-            iter([_REQUEST] * STREAM_LENGTH)
-        )
-
-
-def stream_stream_call(port):
-    with grpc.insecure_channel(f"localhost:{port}") as channel:
-        multi_callable = channel.stream_stream(_STREAM_STREAM)
-        call = multi_callable(iter([_REQUEST] * STREAM_LENGTH))
-        for _ in call:
-            pass
-
-
 if __name__ == "__main__":
     logging.basicConfig()
     unittest.main(verbosity=2)
diff --git a/src/python/grpcio_tests/tests/observability/_open_telemetry_observability_test.py b/src/python/grpcio_tests/tests/observability/_open_telemetry_observability_test.py
new file mode 100644
index 00000000000..a3115b0108a
--- /dev/null
+++ b/src/python/grpcio_tests/tests/observability/_open_telemetry_observability_test.py
@@ -0,0 +1,299 @@
+# Copyright 2023 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from collections import defaultdict
+import datetime
+import logging
+import os
+import sys
+import time
+from typing import Any, Callable, Dict, List, Optional, Set
+import unittest
+
+import grpc_observability
+from grpc_observability import _open_telemetry_measures
+from grpc_observability._open_telemetry_plugin import GRPC_METHOD_LABEL
+from grpc_observability._open_telemetry_plugin import GRPC_OTHER_LABEL_VALUE
+from grpc_observability._open_telemetry_plugin import GRPC_TARGET_LABEL
+from opentelemetry.sdk.metrics import MeterProvider
+from opentelemetry.sdk.metrics.export import AggregationTemporality
+from opentelemetry.sdk.metrics.export import MetricExportResult
+from opentelemetry.sdk.metrics.export import MetricExporter
+from opentelemetry.sdk.metrics.export import MetricsData
+from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader
+
+from tests.observability import _test_server
+
+logger = logging.getLogger(__name__)
+
+STREAM_LENGTH = 5
+OTEL_EXPORT_INTERVAL_S = 0.5
+
+
+class OTelMetricExporter(MetricExporter):
+    """Implementation of :class:`MetricExporter` that export metrics to the
+    provided metric_list.
+
+    all_metrics: A dict which key is grpc_observability._opentelemetry_measures.Metric.name,
+        value is a list of labels recorded for that metric.
+        An example item of this dict:
+            {"grpc.client.attempt.started":
+              [{'grpc.method': 'test/UnaryUnary', 'grpc.target': 'localhost:42517'},
+               {'grpc.method': 'other', 'grpc.target': 'localhost:42517'}]}
+    """
+
+    def __init__(
+        self,
+        all_metrics: Dict[str, List],
+        preferred_temporality: Dict[type, AggregationTemporality] = None,
+        preferred_aggregation: Dict[
+            type, "opentelemetry.sdk.metrics.view.Aggregation"
+        ] = None,
+    ):
+        super().__init__(
+            preferred_temporality=preferred_temporality,
+            preferred_aggregation=preferred_aggregation,
+        )
+        self.all_metrics = all_metrics
+
+    def export(
+        self,
+        metrics_data: MetricsData,
+        timeout_millis: float = 10_000,
+        **kwargs,
+    ) -> MetricExportResult:
+        self.record_metric(metrics_data)
+        return MetricExportResult.SUCCESS
+
+    def shutdown(self, timeout_millis: float = 30_000, **kwargs) -> None:
+        pass
+
+    def force_flush(self, timeout_millis: float = 10_000) -> bool:
+        return True
+
+    def record_metric(self, metrics_data: MetricsData) -> None:
+        for resource_metric in metrics_data.resource_metrics:
+            for scope_metric in resource_metric.scope_metrics:
+                for metric in scope_metric.metrics:
+                    for data_point in metric.data.data_points:
+                        self.all_metrics[metric.name].append(
+                            data_point.attributes
+                        )
+
+
+class BaseTestOpenTelemetryPlugin(grpc_observability.OpenTelemetryPlugin):
+    def __init__(self, provider: MeterProvider):
+        self.provider = provider
+
+    def get_meter_provider(self) -> Optional[MeterProvider]:
+        return self.provider
+
+
+@unittest.skipIf(
+    os.name == "nt" or "darwin" in sys.platform,
+    "Observability is not supported in Windows and MacOS",
+)
+class OpenTelemetryObservabilityTest(unittest.TestCase):
+    def setUp(self):
+        self.all_metrics = defaultdict(list)
+        otel_exporter = OTelMetricExporter(self.all_metrics)
+        reader = PeriodicExportingMetricReader(
+            exporter=otel_exporter,
+            export_interval_millis=OTEL_EXPORT_INTERVAL_S * 1000,
+        )
+        self._provider = MeterProvider(metric_readers=[reader])
+        self._server = None
+        self._port = None
+
+    def tearDown(self):
+        if self._server:
+            self._server.stop(0)
+
+    def testRecordUnaryUnary(self):
+        otel_plugin = BaseTestOpenTelemetryPlugin(self._provider)
+        with grpc_observability.OpenTelemetryObservability(
+            plugins=[otel_plugin]
+        ):
+            server, port = _test_server.start_server()
+            self._server = server
+            _test_server.unary_unary_call(port=port)
+
+        self._validate_metrics_exist(self.all_metrics)
+        self._validate_all_metrics_names(self.all_metrics)
+
+    def testRecordUnaryUnaryClientOnly(self):
+        server, port = _test_server.start_server()
+        self._server = server
+
+        otel_plugin = BaseTestOpenTelemetryPlugin(self._provider)
+        with grpc_observability.OpenTelemetryObservability(
+            plugins=[otel_plugin]
+        ):
+            _test_server.unary_unary_call(port=port)
+
+        self._validate_metrics_exist(self.all_metrics)
+        self._validate_client_metrics_names(self.all_metrics)
+
+    def testRecordUnaryStream(self):
+        otel_plugin = BaseTestOpenTelemetryPlugin(self._provider)
+
+        with grpc_observability.OpenTelemetryObservability(
+            plugins=[otel_plugin]
+        ):
+            server, port = _test_server.start_server()
+            self._server = server
+            _test_server.unary_stream_call(port=port)
+
+        self._validate_metrics_exist(self.all_metrics)
+        self._validate_all_metrics_names(self.all_metrics)
+
+    def testRecordStreamUnary(self):
+        otel_plugin = BaseTestOpenTelemetryPlugin(self._provider)
+
+        with grpc_observability.OpenTelemetryObservability(
+            plugins=[otel_plugin]
+        ):
+            server, port = _test_server.start_server()
+            self._server = server
+            _test_server.stream_unary_call(port=port)
+
+        self._validate_metrics_exist(self.all_metrics)
+        self._validate_all_metrics_names(self.all_metrics)
+
+    def testRecordStreamStream(self):
+        otel_plugin = BaseTestOpenTelemetryPlugin(self._provider)
+
+        with grpc_observability.OpenTelemetryObservability(
+            plugins=[otel_plugin]
+        ):
+            server, port = _test_server.start_server()
+            self._server = server
+            _test_server.stream_stream_call(port=port)
+
+        self._validate_metrics_exist(self.all_metrics)
+        self._validate_all_metrics_names(self.all_metrics)
+
+    def testTargetAttributeFilter(self):
+        main_server, main_port = _test_server.start_server()
+        backup_server, backup_port = _test_server.start_server()
+        main_target = f"localhost:{main_port}"
+        backup_target = f"localhost:{backup_port}"
+
+        # Replace target label with 'other' for main_server.
+        def target_filter(target: str) -> bool:
+            if main_target in target:
+                return False
+            return True
+
+        otel_plugin = BaseTestOpenTelemetryPlugin(self._provider)
+        otel_plugin.target_attribute_filter = target_filter
+
+        with grpc_observability.OpenTelemetryObservability(
+            plugins=[otel_plugin]
+        ):
+            _test_server.unary_unary_call(port=main_port)
+            _test_server.unary_unary_call(port=backup_port)
+
+        self._validate_metrics_exist(self.all_metrics)
+        self._validate_client_metrics_names(self.all_metrics)
+
+        target_values = set()
+        for label_list in self.all_metrics.values():
+            for labels in label_list:
+                if GRPC_TARGET_LABEL in labels:
+                    target_values.add(labels[GRPC_TARGET_LABEL])
+        self.assertTrue(GRPC_OTHER_LABEL_VALUE in target_values)
+        self.assertTrue(backup_target in target_values)
+
+        main_server.stop(0)
+        backup_server.stop(0)
+
+    def testMethodAttributeFilter(self):
+        # If method name is 'test/UnaryUnaryFiltered', is should be replaced with 'other'.
+        FILTERED_METHOD_NAME = "test/UnaryUnaryFiltered"
+
+        def method_filter(method: str) -> bool:
+            if FILTERED_METHOD_NAME in method:
+                return False
+            return True
+
+        otel_plugin = BaseTestOpenTelemetryPlugin(self._provider)
+        otel_plugin.generic_method_attribute_filter = method_filter
+
+        with grpc_observability.OpenTelemetryObservability(
+            plugins=[otel_plugin]
+        ):
+            server, port = _test_server.start_server()
+            self._server = server
+            _test_server.unary_unary_call(port=port)
+            _test_server.unary_unary_filtered_call(port=port)
+
+        self._validate_metrics_exist(self.all_metrics)
+        self._validate_all_metrics_names(self.all_metrics)
+        method_values = set()
+        for label_list in self.all_metrics.values():
+            for labels in label_list:
+                if GRPC_METHOD_LABEL in labels:
+                    method_values.add(labels[GRPC_METHOD_LABEL])
+        self.assertTrue(GRPC_OTHER_LABEL_VALUE in method_values)
+        self.assertTrue(FILTERED_METHOD_NAME not in method_values)
+
+    def assert_eventually(
+        self,
+        predicate: Callable[[], bool],
+        *,
+        timeout: Optional[datetime.timedelta] = None,
+        message: Optional[Callable[[], str]] = None,
+    ) -> None:
+        message = message or (lambda: "Proposition did not evaluate to true")
+        timeout = timeout or datetime.timedelta(seconds=10)
+        end = datetime.datetime.now() + timeout
+        while datetime.datetime.now() < end:
+            if predicate():
+                break
+            time.sleep(0.5)
+        else:
+            self.fail(message() + " after " + str(timeout))
+
+    def _validate_metrics_exist(self, all_metrics: Dict[str, Any]) -> None:
+        # Sleep here to make sure we have at least one export from OTel MetricExporter.
+        self.assert_eventually(
+            lambda: len(all_metrics.keys()) > 1,
+            message=lambda: f"No metrics was exported",
+        )
+
+    def _validate_all_metrics_names(self, metric_names: Set[str]) -> None:
+        self._validate_server_metrics_names(metric_names)
+        self._validate_client_metrics_names(metric_names)
+
+    def _validate_server_metrics_names(self, metric_names: Set[str]) -> None:
+        for base_metric in _open_telemetry_measures.base_metrics():
+            if "grpc.server" in base_metric.name:
+                self.assertTrue(
+                    base_metric.name in metric_names,
+                    msg=f"metric {base_metric.name} not found in exported metrics: {metric_names}!",
+                )
+
+    def _validate_client_metrics_names(self, metric_names: Set[str]) -> None:
+        for base_metric in _open_telemetry_measures.base_metrics():
+            if "grpc.client" in base_metric.name:
+                self.assertTrue(
+                    base_metric.name in metric_names,
+                    msg=f"metric {base_metric.name} not found in exported metrics: {metric_names}!",
+                )
+
+
+if __name__ == "__main__":
+    logging.basicConfig()
+    unittest.main(verbosity=2)
diff --git a/src/python/grpcio_tests/tests/observability/_test_server.py b/src/python/grpcio_tests/tests/observability/_test_server.py
new file mode 100644
index 00000000000..d8f516be612
--- /dev/null
+++ b/src/python/grpcio_tests/tests/observability/_test_server.py
@@ -0,0 +1,169 @@
+# Copyright 2023 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from concurrent import futures
+from typing import Tuple
+
+import grpc
+
+_REQUEST = b"\x00\x00\x00"
+_RESPONSE = b"\x00\x00\x00"
+
+_UNARY_UNARY = "/test/UnaryUnary"
+_UNARY_UNARY_FILTERED = "/test/UnaryUnaryFiltered"
+_UNARY_STREAM = "/test/UnaryStream"
+_STREAM_UNARY = "/test/StreamUnary"
+_STREAM_STREAM = "/test/StreamStream"
+STREAM_LENGTH = 5
+TRIGGER_RPC_METADATA = ("control", "trigger_rpc")
+TRIGGER_RPC_TO_NEW_SERVER_METADATA = ("to_new_server", "")
+
+
+def handle_unary_unary(request, servicer_context):
+    if TRIGGER_RPC_METADATA in servicer_context.invocation_metadata():
+        for k, v in servicer_context.invocation_metadata():
+            if "port" in k:
+                unary_unary_call(port=int(v))
+            if "to_new_server" in k:
+                second_server = grpc.server(
+                    futures.ThreadPoolExecutor(max_workers=10)
+                )
+                second_server.add_generic_rpc_handlers((_GenericHandler(),))
+                second_server_port = second_server.add_insecure_port("[::]:0")
+                second_server.start()
+                unary_unary_call(port=second_server_port)
+                second_server.stop(0)
+    return _RESPONSE
+
+
+def handle_unary_stream(request, servicer_context):
+    for _ in range(STREAM_LENGTH):
+        yield _RESPONSE
+
+
+def handle_stream_unary(request_iterator, servicer_context):
+    return _RESPONSE
+
+
+def handle_stream_stream(request_iterator, servicer_context):
+    for request in request_iterator:
+        yield _RESPONSE
+
+
+class _MethodHandler(grpc.RpcMethodHandler):
+    def __init__(self, request_streaming, response_streaming):
+        self.request_streaming = request_streaming
+        self.response_streaming = response_streaming
+        self.request_deserializer = None
+        self.response_serializer = None
+        self.unary_unary = None
+        self.unary_stream = None
+        self.stream_unary = None
+        self.stream_stream = None
+        if self.request_streaming and self.response_streaming:
+            self.stream_stream = handle_stream_stream
+        elif self.request_streaming:
+            self.stream_unary = handle_stream_unary
+        elif self.response_streaming:
+            self.unary_stream = handle_unary_stream
+        else:
+            self.unary_unary = handle_unary_unary
+
+
+class _GenericHandler(grpc.GenericRpcHandler):
+    def service(self, handler_call_details):
+        if handler_call_details.method == _UNARY_UNARY:
+            return _MethodHandler(False, False)
+        if handler_call_details.method == _UNARY_UNARY_FILTERED:
+            return _MethodHandler(False, False)
+        elif handler_call_details.method == _UNARY_STREAM:
+            return _MethodHandler(False, True)
+        elif handler_call_details.method == _STREAM_UNARY:
+            return _MethodHandler(True, False)
+        elif handler_call_details.method == _STREAM_STREAM:
+            return _MethodHandler(True, True)
+        else:
+            return None
+
+
+def start_server(interceptors=None) -> Tuple[grpc.Server, int]:
+    if interceptors:
+        server = grpc.server(
+            futures.ThreadPoolExecutor(max_workers=10),
+            interceptors=interceptors,
+        )
+    else:
+        server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))
+    server.add_generic_rpc_handlers((_GenericHandler(),))
+    port = server.add_insecure_port("[::]:0")
+    server.start()
+    return server, port
+
+
+def unary_unary_call(port, metadata=None):
+    with grpc.insecure_channel(f"localhost:{port}") as channel:
+        multi_callable = channel.unary_unary(_UNARY_UNARY)
+        if metadata:
+            unused_response, call = multi_callable.with_call(
+                _REQUEST, metadata=metadata
+            )
+        else:
+            unused_response, call = multi_callable.with_call(_REQUEST)
+
+
+def intercepted_unary_unary_call(port, interceptors, metadata=None):
+    with grpc.insecure_channel(f"localhost:{port}") as channel:
+        intercept_channel = grpc.intercept_channel(channel, interceptors)
+        multi_callable = intercept_channel.unary_unary(_UNARY_UNARY)
+        if metadata:
+            unused_response, call = multi_callable.with_call(
+                _REQUEST, metadata=metadata
+            )
+        else:
+            unused_response, call = multi_callable.with_call(_REQUEST)
+
+
+def unary_unary_filtered_call(port, metadata=None):
+    with grpc.insecure_channel(f"localhost:{port}") as channel:
+        multi_callable = channel.unary_unary(_UNARY_UNARY_FILTERED)
+        if metadata:
+            unused_response, call = multi_callable.with_call(
+                _REQUEST, metadata=metadata
+            )
+        else:
+            unused_response, call = multi_callable.with_call(_REQUEST)
+
+
+def unary_stream_call(port):
+    with grpc.insecure_channel(f"localhost:{port}") as channel:
+        multi_callable = channel.unary_stream(_UNARY_STREAM)
+        call = multi_callable(_REQUEST)
+        for _ in call:
+            pass
+
+
+def stream_unary_call(port):
+    with grpc.insecure_channel(f"localhost:{port}") as channel:
+        multi_callable = channel.stream_unary(_STREAM_UNARY)
+        unused_response, call = multi_callable.with_call(
+            iter([_REQUEST] * STREAM_LENGTH)
+        )
+
+
+def stream_stream_call(port):
+    with grpc.insecure_channel(f"localhost:{port}") as channel:
+        multi_callable = channel.stream_stream(_STREAM_STREAM)
+        call = multi_callable(iter([_REQUEST] * STREAM_LENGTH))
+        for _ in call:
+            pass
diff --git a/src/python/grpcio_tests/tests/protoc_plugin/_python_plugin_test.py b/src/python/grpcio_tests/tests/protoc_plugin/_python_plugin_test.py
index 9a6538cca35..c6e41b3ae8c 100644
--- a/src/python/grpcio_tests/tests/protoc_plugin/_python_plugin_test.py
+++ b/src/python/grpcio_tests/tests/protoc_plugin/_python_plugin_test.py
@@ -543,6 +543,17 @@ class PythonPluginTest(unittest.TestCase):
         )
         service.server.stop(None)
 
+    def testRegisteredMethod(self):
+        """Tests that we're setting _registered_call_handle when create call using generated stub."""
+        service = _CreateService()
+        self.assertTrue(service.stub.UnaryCall._registered_call_handle)
+        self.assertTrue(
+            service.stub.StreamingOutputCall._registered_call_handle
+        )
+        self.assertTrue(service.stub.StreamingInputCall._registered_call_handle)
+        self.assertTrue(service.stub.FullDuplexCall._registered_call_handle)
+        service.server.stop(None)
+
 
 @unittest.skipIf(
     sys.version_info[0] < 3 or sys.version_info[1] < 6,
diff --git a/src/python/grpcio_tests/tests/qps/benchmark_client.py b/src/python/grpcio_tests/tests/qps/benchmark_client.py
index e5aafc4142f..9310f8a8c61 100644
--- a/src/python/grpcio_tests/tests/qps/benchmark_client.py
+++ b/src/python/grpcio_tests/tests/qps/benchmark_client.py
@@ -32,13 +32,16 @@ _TIMEOUT = 60 * 60 * 24
 class GenericStub(object):
     def __init__(self, channel):
         self.UnaryCall = channel.unary_unary(
-            "/grpc.testing.BenchmarkService/UnaryCall"
+            "/grpc.testing.BenchmarkService/UnaryCall",
+            _registered_method=True,
         )
         self.StreamingFromServer = channel.unary_stream(
-            "/grpc.testing.BenchmarkService/StreamingFromServer"
+            "/grpc.testing.BenchmarkService/StreamingFromServer",
+            _registered_method=True,
         )
         self.StreamingCall = channel.stream_stream(
-            "/grpc.testing.BenchmarkService/StreamingCall"
+            "/grpc.testing.BenchmarkService/StreamingCall",
+            _registered_method=True,
         )
 
 
diff --git a/src/python/grpcio_tests/tests/status/_grpc_status_test.py b/src/python/grpcio_tests/tests/status/_grpc_status_test.py
index 2573e961f18..031bdbe4d53 100644
--- a/src/python/grpcio_tests/tests/status/_grpc_status_test.py
+++ b/src/python/grpcio_tests/tests/status/_grpc_status_test.py
@@ -138,7 +138,10 @@ class StatusTest(unittest.TestCase):
         self._channel.close()
 
     def test_status_ok(self):
-        _, call = self._channel.unary_unary(_STATUS_OK).with_call(_REQUEST)
+        _, call = self._channel.unary_unary(
+            _STATUS_OK,
+            _registered_method=True,
+        ).with_call(_REQUEST)
 
         # Succeed RPC doesn't have status
         status = rpc_status.from_call(call)
@@ -146,7 +149,10 @@ class StatusTest(unittest.TestCase):
 
     def test_status_not_ok(self):
         with self.assertRaises(grpc.RpcError) as exception_context:
-            self._channel.unary_unary(_STATUS_NOT_OK).with_call(_REQUEST)
+            self._channel.unary_unary(
+                _STATUS_NOT_OK,
+                _registered_method=True,
+            ).with_call(_REQUEST)
         rpc_error = exception_context.exception
 
         self.assertEqual(rpc_error.code(), grpc.StatusCode.INTERNAL)
@@ -156,7 +162,10 @@ class StatusTest(unittest.TestCase):
 
     def test_error_details(self):
         with self.assertRaises(grpc.RpcError) as exception_context:
-            self._channel.unary_unary(_ERROR_DETAILS).with_call(_REQUEST)
+            self._channel.unary_unary(
+                _ERROR_DETAILS,
+                _registered_method=True,
+            ).with_call(_REQUEST)
         rpc_error = exception_context.exception
 
         status = rpc_status.from_call(rpc_error)
@@ -173,7 +182,10 @@ class StatusTest(unittest.TestCase):
 
     def test_code_message_validation(self):
         with self.assertRaises(grpc.RpcError) as exception_context:
-            self._channel.unary_unary(_INCONSISTENT).with_call(_REQUEST)
+            self._channel.unary_unary(
+                _INCONSISTENT,
+                _registered_method=True,
+            ).with_call(_REQUEST)
         rpc_error = exception_context.exception
         self.assertEqual(rpc_error.code(), grpc.StatusCode.NOT_FOUND)
 
@@ -182,7 +194,10 @@ class StatusTest(unittest.TestCase):
 
     def test_invalid_code(self):
         with self.assertRaises(grpc.RpcError) as exception_context:
-            self._channel.unary_unary(_INVALID_CODE).with_call(_REQUEST)
+            self._channel.unary_unary(
+                _INVALID_CODE,
+                _registered_method=True,
+            ).with_call(_REQUEST)
         rpc_error = exception_context.exception
         self.assertEqual(rpc_error.code(), grpc.StatusCode.UNKNOWN)
         # Invalid status code exception raised during coversion
diff --git a/src/python/grpcio_tests/tests/tests.json b/src/python/grpcio_tests/tests/tests.json
index 93de9eed5a7..7ba494ac5b6 100644
--- a/src/python/grpcio_tests/tests/tests.json
+++ b/src/python/grpcio_tests/tests/tests.json
@@ -10,6 +10,7 @@
   "tests.interop._insecure_intraop_test.InsecureIntraopTest",
   "tests.interop._secure_intraop_test.SecureIntraopTest",
   "tests.observability._observability_test.ObservabilityTest",
+  "tests.observability._open_telemetry_observability_test.OpenTelemetryObservabilityTest",
   "tests.protoc_plugin._python_plugin_test.ModuleMainTest",
   "tests.protoc_plugin._python_plugin_test.PythonPluginTest",
   "tests.protoc_plugin._python_plugin_test.SimpleStubsPluginTest",
diff --git a/src/python/grpcio_tests/tests/unit/_abort_test.py b/src/python/grpcio_tests/tests/unit/_abort_test.py
index 731bb741bec..46f48bd1cae 100644
--- a/src/python/grpcio_tests/tests/unit/_abort_test.py
+++ b/src/python/grpcio_tests/tests/unit/_abort_test.py
@@ -107,7 +107,10 @@ class AbortTest(unittest.TestCase):
 
     def test_abort(self):
         with self.assertRaises(grpc.RpcError) as exception_context:
-            self._channel.unary_unary(_ABORT)(_REQUEST)
+            self._channel.unary_unary(
+                _ABORT,
+                _registered_method=True,
+            )(_REQUEST)
         rpc_error = exception_context.exception
 
         self.assertEqual(rpc_error.code(), grpc.StatusCode.INTERNAL)
@@ -124,7 +127,10 @@ class AbortTest(unittest.TestCase):
 
         # Servicer will abort() after creating a local ref to do_not_leak_me.
         with self.assertRaises(grpc.RpcError):
-            self._channel.unary_unary(_ABORT)(_REQUEST)
+            self._channel.unary_unary(
+                _ABORT,
+                _registered_method=True,
+            )(_REQUEST)
 
         # Server may still have a stack frame reference to the exception even
         # after client sees error, so ensure server has shutdown.
@@ -134,7 +140,10 @@ class AbortTest(unittest.TestCase):
 
     def test_abort_with_status(self):
         with self.assertRaises(grpc.RpcError) as exception_context:
-            self._channel.unary_unary(_ABORT_WITH_STATUS)(_REQUEST)
+            self._channel.unary_unary(
+                _ABORT_WITH_STATUS,
+                _registered_method=True,
+            )(_REQUEST)
         rpc_error = exception_context.exception
 
         self.assertEqual(rpc_error.code(), grpc.StatusCode.INTERNAL)
@@ -143,7 +152,10 @@ class AbortTest(unittest.TestCase):
 
     def test_invalid_code(self):
         with self.assertRaises(grpc.RpcError) as exception_context:
-            self._channel.unary_unary(_INVALID_CODE)(_REQUEST)
+            self._channel.unary_unary(
+                _INVALID_CODE,
+                _registered_method=True,
+            )(_REQUEST)
         rpc_error = exception_context.exception
 
         self.assertEqual(rpc_error.code(), grpc.StatusCode.UNKNOWN)
diff --git a/src/python/grpcio_tests/tests/unit/_auth_context_test.py b/src/python/grpcio_tests/tests/unit/_auth_context_test.py
index 039c908c3e5..0e5e2017fba 100644
--- a/src/python/grpcio_tests/tests/unit/_auth_context_test.py
+++ b/src/python/grpcio_tests/tests/unit/_auth_context_test.py
@@ -78,7 +78,10 @@ class AuthContextTest(unittest.TestCase):
         server.start()
 
         with grpc.insecure_channel("localhost:%d" % port) as channel:
-            response = channel.unary_unary(_UNARY_UNARY)(_REQUEST)
+            response = channel.unary_unary(
+                _UNARY_UNARY,
+                _registered_method=True,
+            )(_REQUEST)
         server.stop(None)
 
         auth_data = pickle.loads(response)
@@ -115,7 +118,10 @@ class AuthContextTest(unittest.TestCase):
             channel_creds,
             options=_PROPERTY_OPTIONS,
         )
-        response = channel.unary_unary(_UNARY_UNARY)(_REQUEST)
+        response = channel.unary_unary(
+            _UNARY_UNARY,
+            _registered_method=True,
+        )(_REQUEST)
         channel.close()
         server.stop(None)
 
@@ -161,7 +167,10 @@ class AuthContextTest(unittest.TestCase):
             options=_PROPERTY_OPTIONS,
         )
 
-        response = channel.unary_unary(_UNARY_UNARY)(_REQUEST)
+        response = channel.unary_unary(
+            _UNARY_UNARY,
+            _registered_method=True,
+        )(_REQUEST)
         channel.close()
         server.stop(None)
 
@@ -180,7 +189,10 @@ class AuthContextTest(unittest.TestCase):
         channel = grpc.secure_channel(
             "localhost:{}".format(port), channel_creds, options=channel_options
         )
-        response = channel.unary_unary(_UNARY_UNARY)(_REQUEST)
+        response = channel.unary_unary(
+            _UNARY_UNARY,
+            _registered_method=True,
+        )(_REQUEST)
         auth_data = pickle.loads(response)
         self.assertEqual(
             expect_ssl_session_reused,
diff --git a/src/python/grpcio_tests/tests/unit/_channel_close_test.py b/src/python/grpcio_tests/tests/unit/_channel_close_test.py
index 4e5f215af89..b2ba4e7c887 100644
--- a/src/python/grpcio_tests/tests/unit/_channel_close_test.py
+++ b/src/python/grpcio_tests/tests/unit/_channel_close_test.py
@@ -123,7 +123,10 @@ class ChannelCloseTest(unittest.TestCase):
 
     def test_close_immediately_after_call_invocation(self):
         channel = grpc.insecure_channel("localhost:{}".format(self._port))
-        multi_callable = channel.stream_stream(_STREAM_URI)
+        multi_callable = channel.stream_stream(
+            _STREAM_URI,
+            _registered_method=True,
+        )
         request_iterator = _Pipe(())
         response_iterator = multi_callable(request_iterator)
         channel.close()
@@ -133,7 +136,10 @@ class ChannelCloseTest(unittest.TestCase):
 
     def test_close_while_call_active(self):
         channel = grpc.insecure_channel("localhost:{}".format(self._port))
-        multi_callable = channel.stream_stream(_STREAM_URI)
+        multi_callable = channel.stream_stream(
+            _STREAM_URI,
+            _registered_method=True,
+        )
         request_iterator = _Pipe((b"abc",))
         response_iterator = multi_callable(request_iterator)
         next(response_iterator)
@@ -146,7 +152,10 @@ class ChannelCloseTest(unittest.TestCase):
         with grpc.insecure_channel(
             "localhost:{}".format(self._port)
         ) as channel:  # pylint: disable=bad-continuation
-            multi_callable = channel.stream_stream(_STREAM_URI)
+            multi_callable = channel.stream_stream(
+                _STREAM_URI,
+                _registered_method=True,
+            )
             request_iterator = _Pipe((b"abc",))
             response_iterator = multi_callable(request_iterator)
             next(response_iterator)
@@ -158,7 +167,10 @@ class ChannelCloseTest(unittest.TestCase):
         with grpc.insecure_channel(
             "localhost:{}".format(self._port)
         ) as channel:  # pylint: disable=bad-continuation
-            multi_callable = channel.stream_stream(_STREAM_URI)
+            multi_callable = channel.stream_stream(
+                _STREAM_URI,
+                _registered_method=True,
+            )
             request_iterators = tuple(
                 _Pipe((b"abc",))
                 for _ in range(test_constants.THREAD_CONCURRENCY)
@@ -176,7 +188,10 @@ class ChannelCloseTest(unittest.TestCase):
 
     def test_many_concurrent_closes(self):
         channel = grpc.insecure_channel("localhost:{}".format(self._port))
-        multi_callable = channel.stream_stream(_STREAM_URI)
+        multi_callable = channel.stream_stream(
+            _STREAM_URI,
+            _registered_method=True,
+        )
         request_iterator = _Pipe((b"abc",))
         response_iterator = multi_callable(request_iterator)
         next(response_iterator)
@@ -203,10 +218,16 @@ class ChannelCloseTest(unittest.TestCase):
         with grpc.insecure_channel(
             "localhost:{}".format(self._port)
         ) as channel:
-            stream_multi_callable = channel.stream_stream(_STREAM_URI)
+            stream_multi_callable = channel.stream_stream(
+                _STREAM_URI,
+                _registered_method=True,
+            )
             endless_iterator = itertools.repeat(b"abc")
             stream_response_iterator = stream_multi_callable(endless_iterator)
-            future = channel.unary_unary(_UNARY_URI).future(b"abc")
+            future = channel.unary_unary(
+                _UNARY_URI,
+                _registered_method=True,
+            ).future(b"abc")
 
             def on_done_callback(future):
                 raise Exception("This should not cause a deadlock.")
diff --git a/src/python/grpcio_tests/tests/unit/_compression_test.py b/src/python/grpcio_tests/tests/unit/_compression_test.py
index be2a528ea9b..9fdeca030d8 100644
--- a/src/python/grpcio_tests/tests/unit/_compression_test.py
+++ b/src/python/grpcio_tests/tests/unit/_compression_test.py
@@ -237,7 +237,10 @@ def _get_compression_ratios(
 
 
 def _unary_unary_client(channel, multicallable_kwargs, message):
-    multi_callable = channel.unary_unary(_UNARY_UNARY)
+    multi_callable = channel.unary_unary(
+        _UNARY_UNARY,
+        _registered_method=True,
+    )
     response = multi_callable(message, **multicallable_kwargs)
     if response != message:
         raise RuntimeError(
@@ -246,7 +249,10 @@ def _unary_unary_client(channel, multicallable_kwargs, message):
 
 
 def _unary_stream_client(channel, multicallable_kwargs, message):
-    multi_callable = channel.unary_stream(_UNARY_STREAM)
+    multi_callable = channel.unary_stream(
+        _UNARY_STREAM,
+        _registered_method=True,
+    )
     response_iterator = multi_callable(message, **multicallable_kwargs)
     for response in response_iterator:
         if response != message:
@@ -256,7 +262,10 @@ def _unary_stream_client(channel, multicallable_kwargs, message):
 
 
 def _stream_unary_client(channel, multicallable_kwargs, message):
-    multi_callable = channel.stream_unary(_STREAM_UNARY)
+    multi_callable = channel.stream_unary(
+        _STREAM_UNARY,
+        _registered_method=True,
+    )
     requests = (_REQUEST for _ in range(_STREAM_LENGTH))
     response = multi_callable(requests, **multicallable_kwargs)
     if response != message:
@@ -266,7 +275,10 @@ def _stream_unary_client(channel, multicallable_kwargs, message):
 
 
 def _stream_stream_client(channel, multicallable_kwargs, message):
-    multi_callable = channel.stream_stream(_STREAM_STREAM)
+    multi_callable = channel.stream_stream(
+        _STREAM_STREAM,
+        _registered_method=True,
+    )
     request_prefix = str(0).encode("ascii") * 100
     requests = (
         request_prefix + str(i).encode("ascii") for i in range(_STREAM_LENGTH)
diff --git a/src/python/grpcio_tests/tests/unit/_contextvars_propagation_test.py b/src/python/grpcio_tests/tests/unit/_contextvars_propagation_test.py
index 6f3b601ceb2..5a23d5dc69e 100644
--- a/src/python/grpcio_tests/tests/unit/_contextvars_propagation_test.py
+++ b/src/python/grpcio_tests/tests/unit/_contextvars_propagation_test.py
@@ -116,7 +116,10 @@ class ContextVarsPropagationTest(unittest.TestCase):
                 local_credentials, call_credentials
             )
             with grpc.secure_channel(target, composite_credentials) as channel:
-                stub = channel.unary_unary(_UNARY_UNARY)
+                stub = channel.unary_unary(
+                    _UNARY_UNARY,
+                    _registered_method=True,
+                )
                 response = stub(_REQUEST, wait_for_ready=True)
                 self.assertEqual(_REQUEST, response)
 
@@ -142,7 +145,10 @@ class ContextVarsPropagationTest(unittest.TestCase):
                     with grpc.secure_channel(
                         target, composite_credentials
                     ) as channel:
-                        stub = channel.unary_unary(_UNARY_UNARY)
+                        stub = channel.unary_unary(
+                            _UNARY_UNARY,
+                            _registered_method=True,
+                        )
                         wait_group.done()
                         wait_group.wait()
                         for i in range(_RPC_COUNT):
diff --git a/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py b/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py
index 62a95a02135..bcd7e6da849 100644
--- a/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py
+++ b/src/python/grpcio_tests/tests/unit/_dns_resolver_test.py
@@ -55,7 +55,10 @@ class DNSResolverTest(unittest.TestCase):
             "loopback46.unittest.grpc.io:%d" % self._port
         ) as channel:
             self.assertEqual(
-                channel.unary_unary(_METHOD)(
+                channel.unary_unary(
+                    _METHOD,
+                    _registered_method=True,
+                )(
                     _REQUEST,
                     timeout=10,
                 ),
diff --git a/src/python/grpcio_tests/tests/unit/_empty_message_test.py b/src/python/grpcio_tests/tests/unit/_empty_message_test.py
index e2dc1594202..a303aa8b3e9 100644
--- a/src/python/grpcio_tests/tests/unit/_empty_message_test.py
+++ b/src/python/grpcio_tests/tests/unit/_empty_message_test.py
@@ -96,25 +96,33 @@ class EmptyMessageTest(unittest.TestCase):
         self._channel.close()
 
     def testUnaryUnary(self):
-        response = self._channel.unary_unary(_UNARY_UNARY)(_REQUEST)
+        response = self._channel.unary_unary(
+            _UNARY_UNARY,
+            _registered_method=True,
+        )(_REQUEST)
         self.assertEqual(_RESPONSE, response)
 
     def testUnaryStream(self):
-        response_iterator = self._channel.unary_stream(_UNARY_STREAM)(_REQUEST)
+        response_iterator = self._channel.unary_stream(
+            _UNARY_STREAM,
+            _registered_method=True,
+        )(_REQUEST)
         self.assertSequenceEqual(
             [_RESPONSE] * test_constants.STREAM_LENGTH, list(response_iterator)
         )
 
     def testStreamUnary(self):
-        response = self._channel.stream_unary(_STREAM_UNARY)(
-            iter([_REQUEST] * test_constants.STREAM_LENGTH)
-        )
+        response = self._channel.stream_unary(
+            _STREAM_UNARY,
+            _registered_method=True,
+        )(iter([_REQUEST] * test_constants.STREAM_LENGTH))
         self.assertEqual(_RESPONSE, response)
 
     def testStreamStream(self):
-        response_iterator = self._channel.stream_stream(_STREAM_STREAM)(
-            iter([_REQUEST] * test_constants.STREAM_LENGTH)
-        )
+        response_iterator = self._channel.stream_stream(
+            _STREAM_STREAM,
+            _registered_method=True,
+        )(iter([_REQUEST] * test_constants.STREAM_LENGTH))
         self.assertSequenceEqual(
             [_RESPONSE] * test_constants.STREAM_LENGTH, list(response_iterator)
         )
diff --git a/src/python/grpcio_tests/tests/unit/_error_message_encoding_test.py b/src/python/grpcio_tests/tests/unit/_error_message_encoding_test.py
index 4f07477fac9..334b7ed5a3a 100644
--- a/src/python/grpcio_tests/tests/unit/_error_message_encoding_test.py
+++ b/src/python/grpcio_tests/tests/unit/_error_message_encoding_test.py
@@ -73,7 +73,10 @@ class ErrorMessageEncodingTest(unittest.TestCase):
 
     def testMessageEncoding(self):
         for message in _UNICODE_ERROR_MESSAGES:
-            multi_callable = self._channel.unary_unary(_UNARY_UNARY)
+            multi_callable = self._channel.unary_unary(
+                _UNARY_UNARY,
+                _registered_method=True,
+            )
             with self.assertRaises(grpc.RpcError) as cm:
                 multi_callable(message.encode("utf-8"))
 
diff --git a/src/python/grpcio_tests/tests/unit/_exit_scenarios.py b/src/python/grpcio_tests/tests/unit/_exit_scenarios.py
index c1f9816df08..1b7e2e5ac84 100644
--- a/src/python/grpcio_tests/tests/unit/_exit_scenarios.py
+++ b/src/python/grpcio_tests/tests/unit/_exit_scenarios.py
@@ -210,14 +210,20 @@ if __name__ == "__main__":
         method = TEST_TO_METHOD[args.scenario]
 
         if args.scenario == IN_FLIGHT_UNARY_UNARY_CALL:
-            multi_callable = channel.unary_unary(method)
+            multi_callable = channel.unary_unary(
+                method,
+                _registered_method=True,
+            )
             future = multi_callable.future(REQUEST)
             result, call = multi_callable.with_call(REQUEST)
         elif (
             args.scenario == IN_FLIGHT_UNARY_STREAM_CALL
             or args.scenario == IN_FLIGHT_PARTIAL_UNARY_STREAM_CALL
         ):
-            multi_callable = channel.unary_stream(method)
+            multi_callable = channel.unary_stream(
+                method,
+                _registered_method=True,
+            )
             response_iterator = multi_callable(REQUEST)
             for response in response_iterator:
                 pass
@@ -225,7 +231,10 @@ if __name__ == "__main__":
             args.scenario == IN_FLIGHT_STREAM_UNARY_CALL
             or args.scenario == IN_FLIGHT_PARTIAL_STREAM_UNARY_CALL
         ):
-            multi_callable = channel.stream_unary(method)
+            multi_callable = channel.stream_unary(
+                method,
+                _registered_method=True,
+            )
             future = multi_callable.future(infinite_request_iterator())
             result, call = multi_callable.with_call(
                 iter([REQUEST] * test_constants.STREAM_LENGTH)
@@ -234,7 +243,10 @@ if __name__ == "__main__":
             args.scenario == IN_FLIGHT_STREAM_STREAM_CALL
             or args.scenario == IN_FLIGHT_PARTIAL_STREAM_STREAM_CALL
         ):
-            multi_callable = channel.stream_stream(method)
+            multi_callable = channel.stream_stream(
+                method,
+                _registered_method=True,
+            )
             response_iterator = multi_callable(infinite_request_iterator())
             for response in response_iterator:
                 pass
diff --git a/src/python/grpcio_tests/tests/unit/_interceptor_test.py b/src/python/grpcio_tests/tests/unit/_interceptor_test.py
index 9bbff1f6bee..72e299b5887 100644
--- a/src/python/grpcio_tests/tests/unit/_interceptor_test.py
+++ b/src/python/grpcio_tests/tests/unit/_interceptor_test.py
@@ -231,7 +231,7 @@ class _GenericHandler(grpc.GenericRpcHandler):
 
 
 def _unary_unary_multi_callable(channel):
-    return channel.unary_unary(_UNARY_UNARY)
+    return channel.unary_unary(_UNARY_UNARY, _registered_method=True)
 
 
 def _unary_stream_multi_callable(channel):
@@ -239,6 +239,7 @@ def _unary_stream_multi_callable(channel):
         _UNARY_STREAM,
         request_serializer=_SERIALIZE_REQUEST,
         response_deserializer=_DESERIALIZE_RESPONSE,
+        _registered_method=True,
     )
 
 
@@ -247,11 +248,12 @@ def _stream_unary_multi_callable(channel):
         _STREAM_UNARY,
         request_serializer=_SERIALIZE_REQUEST,
         response_deserializer=_DESERIALIZE_RESPONSE,
+        _registered_method=True,
     )
 
 
 def _stream_stream_multi_callable(channel):
-    return channel.stream_stream(_STREAM_STREAM)
+    return channel.stream_stream(_STREAM_STREAM, _registered_method=True)
 
 
 class _ClientCallDetails(
@@ -562,7 +564,7 @@ class InterceptorTest(unittest.TestCase):
         self._record[:] = []
 
         multi_callable = _unary_unary_multi_callable(channel)
-        multi_callable.with_call(
+        response, call = multi_callable.with_call(
             request,
             metadata=(
                 (
diff --git a/src/python/grpcio_tests/tests/unit/_invalid_metadata_test.py b/src/python/grpcio_tests/tests/unit/_invalid_metadata_test.py
index a19966131c5..58d1e589fde 100644
--- a/src/python/grpcio_tests/tests/unit/_invalid_metadata_test.py
+++ b/src/python/grpcio_tests/tests/unit/_invalid_metadata_test.py
@@ -32,7 +32,7 @@ _STREAM_STREAM = "/test/StreamStream"
 
 
 def _unary_unary_multi_callable(channel):
-    return channel.unary_unary(_UNARY_UNARY)
+    return channel.unary_unary(_UNARY_UNARY, _registered_method=True)
 
 
 def _unary_stream_multi_callable(channel):
@@ -40,6 +40,7 @@ def _unary_stream_multi_callable(channel):
         _UNARY_STREAM,
         request_serializer=_SERIALIZE_REQUEST,
         response_deserializer=_DESERIALIZE_RESPONSE,
+        _registered_method=True,
     )
 
 
@@ -48,11 +49,15 @@ def _stream_unary_multi_callable(channel):
         _STREAM_UNARY,
         request_serializer=_SERIALIZE_REQUEST,
         response_deserializer=_DESERIALIZE_RESPONSE,
+        _registered_method=True,
     )
 
 
 def _stream_stream_multi_callable(channel):
-    return channel.stream_stream(_STREAM_STREAM)
+    return channel.stream_stream(
+        _STREAM_STREAM,
+        _registered_method=True,
+    )
 
 
 class InvalidMetadataTest(unittest.TestCase):
diff --git a/src/python/grpcio_tests/tests/unit/_invocation_defects_test.py b/src/python/grpcio_tests/tests/unit/_invocation_defects_test.py
index b22ab016593..cb903e7b812 100644
--- a/src/python/grpcio_tests/tests/unit/_invocation_defects_test.py
+++ b/src/python/grpcio_tests/tests/unit/_invocation_defects_test.py
@@ -219,7 +219,10 @@ class FailAfterFewIterationsCounter(object):
 
 
 def _unary_unary_multi_callable(channel):
-    return channel.unary_unary(_UNARY_UNARY)
+    return channel.unary_unary(
+        _UNARY_UNARY,
+        _registered_method=True,
+    )
 
 
 def _unary_stream_multi_callable(channel):
@@ -227,6 +230,7 @@ def _unary_stream_multi_callable(channel):
         _UNARY_STREAM,
         request_serializer=_SERIALIZE_REQUEST,
         response_deserializer=_DESERIALIZE_RESPONSE,
+        _registered_method=True,
     )
 
 
@@ -235,19 +239,29 @@ def _stream_unary_multi_callable(channel):
         _STREAM_UNARY,
         request_serializer=_SERIALIZE_REQUEST,
         response_deserializer=_DESERIALIZE_RESPONSE,
+        _registered_method=True,
     )
 
 
 def _stream_stream_multi_callable(channel):
-    return channel.stream_stream(_STREAM_STREAM)
+    return channel.stream_stream(
+        _STREAM_STREAM,
+        _registered_method=True,
+    )
 
 
 def _defective_handler_multi_callable(channel):
-    return channel.unary_unary(_DEFECTIVE_GENERIC_RPC_HANDLER)
+    return channel.unary_unary(
+        _DEFECTIVE_GENERIC_RPC_HANDLER,
+        _registered_method=True,
+    )
 
 
 def _defective_nested_exception_handler_multi_callable(channel):
-    return channel.unary_unary(_UNARY_UNARY_NESTED_EXCEPTION)
+    return channel.unary_unary(
+        _UNARY_UNARY_NESTED_EXCEPTION,
+        _registered_method=True,
+    )
 
 
 class InvocationDefectsTest(unittest.TestCase):
diff --git a/src/python/grpcio_tests/tests/unit/_local_credentials_test.py b/src/python/grpcio_tests/tests/unit/_local_credentials_test.py
index 165f6ca16eb..9c5b425eaf7 100644
--- a/src/python/grpcio_tests/tests/unit/_local_credentials_test.py
+++ b/src/python/grpcio_tests/tests/unit/_local_credentials_test.py
@@ -53,9 +53,10 @@ class LocalCredentialsTest(unittest.TestCase):
         ) as channel:
             self.assertEqual(
                 b"abc",
-                channel.unary_unary("/test/method")(
-                    b"abc", wait_for_ready=True
-                ),
+                channel.unary_unary(
+                    "/test/method",
+                    _registered_method=True,
+                )(b"abc", wait_for_ready=True),
             )
         server.stop(None)
 
@@ -77,9 +78,10 @@ class LocalCredentialsTest(unittest.TestCase):
         with grpc.secure_channel(server_addr, channel_creds) as channel:
             self.assertEqual(
                 b"abc",
-                channel.unary_unary("/test/method")(
-                    b"abc", wait_for_ready=True
-                ),
+                channel.unary_unary(
+                    "/test/method",
+                    _registered_method=True,
+                )(b"abc", wait_for_ready=True),
             )
         server.stop(None)
 
diff --git a/src/python/grpcio_tests/tests/unit/_metadata_code_details_test.py b/src/python/grpcio_tests/tests/unit/_metadata_code_details_test.py
index 3c530058dc3..320deb7e5f6 100644
--- a/src/python/grpcio_tests/tests/unit/_metadata_code_details_test.py
+++ b/src/python/grpcio_tests/tests/unit/_metadata_code_details_test.py
@@ -207,45 +207,53 @@ class MetadataCodeDetailsTest(unittest.TestCase):
         self._server.start()
 
         self._channel = grpc.insecure_channel("localhost:{}".format(port))
+        unary_unary_method_name = "/".join(
+            (
+                "",
+                _SERVICE,
+                _UNARY_UNARY,
+            )
+        )
         self._unary_unary = self._channel.unary_unary(
-            "/".join(
-                (
-                    "",
-                    _SERVICE,
-                    _UNARY_UNARY,
-                )
-            ),
+            unary_unary_method_name,
             request_serializer=_REQUEST_SERIALIZER,
             response_deserializer=_RESPONSE_DESERIALIZER,
+            _registered_method=True,
+        )
+        unary_stream_method_name = "/".join(
+            (
+                "",
+                _SERVICE,
+                _UNARY_STREAM,
+            )
         )
         self._unary_stream = self._channel.unary_stream(
-            "/".join(
-                (
-                    "",
-                    _SERVICE,
-                    _UNARY_STREAM,
-                )
-            ),
+            unary_stream_method_name,
+            _registered_method=True,
+        )
+        stream_unary_method_name = "/".join(
+            (
+                "",
+                _SERVICE,
+                _STREAM_UNARY,
+            )
         )
         self._stream_unary = self._channel.stream_unary(
-            "/".join(
-                (
-                    "",
-                    _SERVICE,
-                    _STREAM_UNARY,
-                )
-            ),
+            stream_unary_method_name,
+            _registered_method=True,
+        )
+        stream_stream_method_name = "/".join(
+            (
+                "",
+                _SERVICE,
+                _STREAM_STREAM,
+            )
         )
         self._stream_stream = self._channel.stream_stream(
-            "/".join(
-                (
-                    "",
-                    _SERVICE,
-                    _STREAM_STREAM,
-                )
-            ),
+            stream_stream_method_name,
             request_serializer=_REQUEST_SERIALIZER,
             response_deserializer=_RESPONSE_DESERIALIZER,
+            _registered_method=True,
         )
 
     def tearDown(self):
@@ -828,16 +836,18 @@ class InspectContextTest(unittest.TestCase):
         self._server.start()
 
         self._channel = grpc.insecure_channel("localhost:{}".format(port))
+        unary_unary_method_name = "/".join(
+            (
+                "",
+                _SERVICE,
+                _UNARY_UNARY,
+            )
+        )
         self._unary_unary = self._channel.unary_unary(
-            "/".join(
-                (
-                    "",
-                    _SERVICE,
-                    _UNARY_UNARY,
-                )
-            ),
+            unary_unary_method_name,
             request_serializer=_REQUEST_SERIALIZER,
             response_deserializer=_RESPONSE_DESERIALIZER,
+            _registered_method=True,
         )
 
     def tearDown(self):
diff --git a/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py b/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py
index a67a496860f..2cd9ad9bd89 100644
--- a/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py
+++ b/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py
@@ -110,7 +110,10 @@ def create_phony_channel():
 
 
 def perform_unary_unary_call(channel, wait_for_ready=None):
-    channel.unary_unary(_UNARY_UNARY).__call__(
+    channel.unary_unary(
+        _UNARY_UNARY,
+        _registered_method=True,
+    ).__call__(
         _REQUEST,
         timeout=test_constants.LONG_TIMEOUT,
         wait_for_ready=wait_for_ready,
@@ -118,7 +121,10 @@ def perform_unary_unary_call(channel, wait_for_ready=None):
 
 
 def perform_unary_unary_with_call(channel, wait_for_ready=None):
-    channel.unary_unary(_UNARY_UNARY).with_call(
+    channel.unary_unary(
+        _UNARY_UNARY,
+        _registered_method=True,
+    ).with_call(
         _REQUEST,
         timeout=test_constants.LONG_TIMEOUT,
         wait_for_ready=wait_for_ready,
@@ -126,7 +132,10 @@ def perform_unary_unary_with_call(channel, wait_for_ready=None):
 
 
 def perform_unary_unary_future(channel, wait_for_ready=None):
-    channel.unary_unary(_UNARY_UNARY).future(
+    channel.unary_unary(
+        _UNARY_UNARY,
+        _registered_method=True,
+    ).future(
         _REQUEST,
         timeout=test_constants.LONG_TIMEOUT,
         wait_for_ready=wait_for_ready,
@@ -134,7 +143,10 @@ def perform_unary_unary_future(channel, wait_for_ready=None):
 
 
 def perform_unary_stream_call(channel, wait_for_ready=None):
-    response_iterator = channel.unary_stream(_UNARY_STREAM).__call__(
+    response_iterator = channel.unary_stream(
+        _UNARY_STREAM,
+        _registered_method=True,
+    ).__call__(
         _REQUEST,
         timeout=test_constants.LONG_TIMEOUT,
         wait_for_ready=wait_for_ready,
@@ -144,7 +156,10 @@ def perform_unary_stream_call(channel, wait_for_ready=None):
 
 
 def perform_stream_unary_call(channel, wait_for_ready=None):
-    channel.stream_unary(_STREAM_UNARY).__call__(
+    channel.stream_unary(
+        _STREAM_UNARY,
+        _registered_method=True,
+    ).__call__(
         iter([_REQUEST] * test_constants.STREAM_LENGTH),
         timeout=test_constants.LONG_TIMEOUT,
         wait_for_ready=wait_for_ready,
@@ -152,7 +167,10 @@ def perform_stream_unary_call(channel, wait_for_ready=None):
 
 
 def perform_stream_unary_with_call(channel, wait_for_ready=None):
-    channel.stream_unary(_STREAM_UNARY).with_call(
+    channel.stream_unary(
+        _STREAM_UNARY,
+        _registered_method=True,
+    ).with_call(
         iter([_REQUEST] * test_constants.STREAM_LENGTH),
         timeout=test_constants.LONG_TIMEOUT,
         wait_for_ready=wait_for_ready,
@@ -160,7 +178,10 @@ def perform_stream_unary_with_call(channel, wait_for_ready=None):
 
 
 def perform_stream_unary_future(channel, wait_for_ready=None):
-    channel.stream_unary(_STREAM_UNARY).future(
+    channel.stream_unary(
+        _STREAM_UNARY,
+        _registered_method=True,
+    ).future(
         iter([_REQUEST] * test_constants.STREAM_LENGTH),
         timeout=test_constants.LONG_TIMEOUT,
         wait_for_ready=wait_for_ready,
@@ -168,7 +189,9 @@ def perform_stream_unary_future(channel, wait_for_ready=None):
 
 
 def perform_stream_stream_call(channel, wait_for_ready=None):
-    response_iterator = channel.stream_stream(_STREAM_STREAM).__call__(
+    response_iterator = channel.stream_stream(
+        _STREAM_STREAM, _registered_method=True
+    ).__call__(
         iter([_REQUEST] * test_constants.STREAM_LENGTH),
         timeout=test_constants.LONG_TIMEOUT,
         wait_for_ready=wait_for_ready,
diff --git a/src/python/grpcio_tests/tests/unit/_metadata_test.py b/src/python/grpcio_tests/tests/unit/_metadata_test.py
index 7110177fa18..b9b7502972c 100644
--- a/src/python/grpcio_tests/tests/unit/_metadata_test.py
+++ b/src/python/grpcio_tests/tests/unit/_metadata_test.py
@@ -195,7 +195,9 @@ class MetadataTest(unittest.TestCase):
         self._channel.close()
 
     def testUnaryUnary(self):
-        multi_callable = self._channel.unary_unary(_UNARY_UNARY)
+        multi_callable = self._channel.unary_unary(
+            _UNARY_UNARY, _registered_method=True
+        )
         unused_response, call = multi_callable.with_call(
             _REQUEST, metadata=_INVOCATION_METADATA
         )
@@ -211,7 +213,9 @@ class MetadataTest(unittest.TestCase):
         )
 
     def testUnaryStream(self):
-        multi_callable = self._channel.unary_stream(_UNARY_STREAM)
+        multi_callable = self._channel.unary_stream(
+            _UNARY_STREAM, _registered_method=True
+        )
         call = multi_callable(_REQUEST, metadata=_INVOCATION_METADATA)
         self.assertTrue(
             test_common.metadata_transmitted(
@@ -227,7 +231,9 @@ class MetadataTest(unittest.TestCase):
         )
 
     def testStreamUnary(self):
-        multi_callable = self._channel.stream_unary(_STREAM_UNARY)
+        multi_callable = self._channel.stream_unary(
+            _STREAM_UNARY, _registered_method=True
+        )
         unused_response, call = multi_callable.with_call(
             iter([_REQUEST] * test_constants.STREAM_LENGTH),
             metadata=_INVOCATION_METADATA,
@@ -244,7 +250,9 @@ class MetadataTest(unittest.TestCase):
         )
 
     def testStreamStream(self):
-        multi_callable = self._channel.stream_stream(_STREAM_STREAM)
+        multi_callable = self._channel.stream_stream(
+            _STREAM_STREAM, _registered_method=True
+        )
         call = multi_callable(
             iter([_REQUEST] * test_constants.STREAM_LENGTH),
             metadata=_INVOCATION_METADATA,
diff --git a/src/python/grpcio_tests/tests/unit/_reconnect_test.py b/src/python/grpcio_tests/tests/unit/_reconnect_test.py
index d412533251c..8d4fadaa3da 100644
--- a/src/python/grpcio_tests/tests/unit/_reconnect_test.py
+++ b/src/python/grpcio_tests/tests/unit/_reconnect_test.py
@@ -52,7 +52,10 @@ class ReconnectTest(unittest.TestCase):
             server.add_insecure_port(addr)
             server.start()
         channel = grpc.insecure_channel(addr)
-        multi_callable = channel.unary_unary(_UNARY_UNARY)
+        multi_callable = channel.unary_unary(
+            _UNARY_UNARY,
+            _registered_method=True,
+        )
         self.assertEqual(_RESPONSE, multi_callable(_REQUEST))
         server.stop(None)
         # By default, the channel connectivity is checked every 5s
diff --git a/src/python/grpcio_tests/tests/unit/_resource_exhausted_test.py b/src/python/grpcio_tests/tests/unit/_resource_exhausted_test.py
index 3fc04f06a18..93e72c84f07 100644
--- a/src/python/grpcio_tests/tests/unit/_resource_exhausted_test.py
+++ b/src/python/grpcio_tests/tests/unit/_resource_exhausted_test.py
@@ -149,7 +149,10 @@ class ResourceExhaustedTest(unittest.TestCase):
         self._channel.close()
 
     def testUnaryUnary(self):
-        multi_callable = self._channel.unary_unary(_UNARY_UNARY)
+        multi_callable = self._channel.unary_unary(
+            _UNARY_UNARY,
+            _registered_method=True,
+        )
         futures = []
         for _ in range(test_constants.THREAD_CONCURRENCY):
             futures.append(multi_callable.future(_REQUEST))
@@ -178,7 +181,10 @@ class ResourceExhaustedTest(unittest.TestCase):
         self.assertEqual(_RESPONSE, multi_callable(_REQUEST))
 
     def testUnaryStream(self):
-        multi_callable = self._channel.unary_stream(_UNARY_STREAM)
+        multi_callable = self._channel.unary_stream(
+            _UNARY_STREAM,
+            _registered_method=True,
+        )
         calls = []
         for _ in range(test_constants.THREAD_CONCURRENCY):
             calls.append(multi_callable(_REQUEST))
@@ -205,7 +211,10 @@ class ResourceExhaustedTest(unittest.TestCase):
             self.assertEqual(_RESPONSE, response)
 
     def testStreamUnary(self):
-        multi_callable = self._channel.stream_unary(_STREAM_UNARY)
+        multi_callable = self._channel.stream_unary(
+            _STREAM_UNARY,
+            _registered_method=True,
+        )
         futures = []
         request = iter([_REQUEST] * test_constants.STREAM_LENGTH)
         for _ in range(test_constants.THREAD_CONCURRENCY):
@@ -236,7 +245,10 @@ class ResourceExhaustedTest(unittest.TestCase):
         self.assertEqual(_RESPONSE, multi_callable(request))
 
     def testStreamStream(self):
-        multi_callable = self._channel.stream_stream(_STREAM_STREAM)
+        multi_callable = self._channel.stream_stream(
+            _STREAM_STREAM,
+            _registered_method=True,
+        )
         calls = []
         request = iter([_REQUEST] * test_constants.STREAM_LENGTH)
         for _ in range(test_constants.THREAD_CONCURRENCY):
diff --git a/src/python/grpcio_tests/tests/unit/_rpc_test_helpers.py b/src/python/grpcio_tests/tests/unit/_rpc_test_helpers.py
index 1027be1c677..d85eb30c8e7 100644
--- a/src/python/grpcio_tests/tests/unit/_rpc_test_helpers.py
+++ b/src/python/grpcio_tests/tests/unit/_rpc_test_helpers.py
@@ -277,7 +277,10 @@ class _GenericHandler(grpc.GenericRpcHandler):
 
 
 def unary_unary_multi_callable(channel):
-    return channel.unary_unary(_UNARY_UNARY)
+    return channel.unary_unary(
+        _UNARY_UNARY,
+        _registered_method=True,
+    )
 
 
 def unary_stream_multi_callable(channel):
@@ -285,6 +288,7 @@ def unary_stream_multi_callable(channel):
         _UNARY_STREAM,
         request_serializer=_SERIALIZE_REQUEST,
         response_deserializer=_DESERIALIZE_RESPONSE,
+        _registered_method=True,
     )
 
 
@@ -293,6 +297,7 @@ def unary_stream_non_blocking_multi_callable(channel):
         _UNARY_STREAM_NON_BLOCKING,
         request_serializer=_SERIALIZE_REQUEST,
         response_deserializer=_DESERIALIZE_RESPONSE,
+        _registered_method=True,
     )
 
 
@@ -301,15 +306,22 @@ def stream_unary_multi_callable(channel):
         _STREAM_UNARY,
         request_serializer=_SERIALIZE_REQUEST,
         response_deserializer=_DESERIALIZE_RESPONSE,
+        _registered_method=True,
     )
 
 
 def stream_stream_multi_callable(channel):
-    return channel.stream_stream(_STREAM_STREAM)
+    return channel.stream_stream(
+        _STREAM_STREAM,
+        _registered_method=True,
+    )
 
 
 def stream_stream_non_blocking_multi_callable(channel):
-    return channel.stream_stream(_STREAM_STREAM_NON_BLOCKING)
+    return channel.stream_stream(
+        _STREAM_STREAM_NON_BLOCKING,
+        _registered_method=True,
+    )
 
 
 class BaseRPCTest(object):
diff --git a/src/python/grpcio_tests/tests/unit/_server_shutdown_scenarios.py b/src/python/grpcio_tests/tests/unit/_server_shutdown_scenarios.py
index 9190f108f7b..34d51fd72ec 100644
--- a/src/python/grpcio_tests/tests/unit/_server_shutdown_scenarios.py
+++ b/src/python/grpcio_tests/tests/unit/_server_shutdown_scenarios.py
@@ -81,7 +81,10 @@ def run_test(args):
         thread.start()
         port = port_queue.get()
         channel = grpc.insecure_channel("localhost:%d" % port)
-        multi_callable = channel.unary_unary(FORK_EXIT)
+        multi_callable = channel.unary_unary(
+            FORK_EXIT,
+            _registered_method=True,
+        )
         result, call = multi_callable.with_call(REQUEST, wait_for_ready=True)
         os.wait()
     else:
diff --git a/src/python/grpcio_tests/tests/unit/_session_cache_test.py b/src/python/grpcio_tests/tests/unit/_session_cache_test.py
index acf671d1ca9..e4bc64f7d11 100644
--- a/src/python/grpcio_tests/tests/unit/_session_cache_test.py
+++ b/src/python/grpcio_tests/tests/unit/_session_cache_test.py
@@ -77,7 +77,10 @@ class SSLSessionCacheTest(unittest.TestCase):
         channel = grpc.secure_channel(
             "localhost:{}".format(port), channel_creds, options=channel_options
         )
-        response = channel.unary_unary(_UNARY_UNARY)(_REQUEST)
+        response = channel.unary_unary(
+            _UNARY_UNARY,
+            _registered_method=True,
+        )(_REQUEST)
         auth_data = pickle.loads(response)
         self.assertEqual(
             expect_ssl_session_reused,
diff --git a/src/python/grpcio_tests/tests/unit/_signal_client.py b/src/python/grpcio_tests/tests/unit/_signal_client.py
index 56563c20075..34c3da0c933 100644
--- a/src/python/grpcio_tests/tests/unit/_signal_client.py
+++ b/src/python/grpcio_tests/tests/unit/_signal_client.py
@@ -53,7 +53,10 @@ def main_unary(server_target):
     """Initiate a unary RPC to be interrupted by a SIGINT."""
     global per_process_rpc_future  # pylint: disable=global-statement
     with grpc.insecure_channel(server_target) as channel:
-        multicallable = channel.unary_unary(UNARY_UNARY)
+        multicallable = channel.unary_unary(
+            UNARY_UNARY,
+            _registered_method=True,
+        )
         signal.signal(signal.SIGINT, handle_sigint)
         per_process_rpc_future = multicallable.future(
             _MESSAGE, wait_for_ready=True
@@ -67,9 +70,10 @@ def main_streaming(server_target):
     global per_process_rpc_future  # pylint: disable=global-statement
     with grpc.insecure_channel(server_target) as channel:
         signal.signal(signal.SIGINT, handle_sigint)
-        per_process_rpc_future = channel.unary_stream(UNARY_STREAM)(
-            _MESSAGE, wait_for_ready=True
-        )
+        per_process_rpc_future = channel.unary_stream(
+            UNARY_STREAM,
+            _registered_method=True,
+        )(_MESSAGE, wait_for_ready=True)
         for result in per_process_rpc_future:
             pass
         assert False, _ASSERTION_MESSAGE
@@ -79,7 +83,10 @@ def main_unary_with_exception(server_target):
     """Initiate a unary RPC with a signal handler that will raise."""
     channel = grpc.insecure_channel(server_target)
     try:
-        channel.unary_unary(UNARY_UNARY)(_MESSAGE, wait_for_ready=True)
+        channel.unary_unary(
+            UNARY_UNARY,
+            _registered_method=True,
+        )(_MESSAGE, wait_for_ready=True)
     except KeyboardInterrupt:
         sys.stderr.write("Running signal handler.\n")
         sys.stderr.flush()
@@ -92,9 +99,10 @@ def main_streaming_with_exception(server_target):
     """Initiate a streaming RPC with a signal handler that will raise."""
     channel = grpc.insecure_channel(server_target)
     try:
-        for _ in channel.unary_stream(UNARY_STREAM)(
-            _MESSAGE, wait_for_ready=True
-        ):
+        for _ in channel.unary_stream(
+            UNARY_STREAM,
+            _registered_method=True,
+        )(_MESSAGE, wait_for_ready=True):
             pass
     except KeyboardInterrupt:
         sys.stderr.write("Running signal handler.\n")
diff --git a/src/python/grpcio_tests/tests/unit/_xds_credentials_test.py b/src/python/grpcio_tests/tests/unit/_xds_credentials_test.py
index 977d564888d..6d8b2b6a041 100644
--- a/src/python/grpcio_tests/tests/unit/_xds_credentials_test.py
+++ b/src/python/grpcio_tests/tests/unit/_xds_credentials_test.py
@@ -71,9 +71,10 @@ class XdsCredentialsTest(unittest.TestCase):
                 server_address, channel_creds, options=override_options
             ) as channel:
                 request = b"abc"
-                response = channel.unary_unary("/test/method")(
-                    request, wait_for_ready=True
-                )
+                response = channel.unary_unary(
+                    "/test/method",
+                    _registered_method=True,
+                )(request, wait_for_ready=True)
                 self.assertEqual(response, request)
 
     def test_xds_creds_fallback_insecure(self):
@@ -89,9 +90,10 @@ class XdsCredentialsTest(unittest.TestCase):
             channel_creds = grpc.xds_channel_credentials(channel_fallback_creds)
             with grpc.secure_channel(server_address, channel_creds) as channel:
                 request = b"abc"
-                response = channel.unary_unary("/test/method")(
-                    request, wait_for_ready=True
-                )
+                response = channel.unary_unary(
+                    "/test/method",
+                    _registered_method=True,
+                )(request, wait_for_ready=True)
                 self.assertEqual(response, request)
 
     def test_start_xds_server(self):
diff --git a/src/python/grpcio_tests/tests_gevent/unit/close_channel_test.py b/src/python/grpcio_tests/tests_gevent/unit/close_channel_test.py
index 47fdb2c22e7..f09c47734e0 100644
--- a/src/python/grpcio_tests/tests_gevent/unit/close_channel_test.py
+++ b/src/python/grpcio_tests/tests_gevent/unit/close_channel_test.py
@@ -65,6 +65,7 @@ class CloseChannelTest(unittest.TestCase):
             _UNARY_CALL_METHOD_WITH_SLEEP,
             request_serializer=messages_pb2.SimpleRequest.SerializeToString,
             response_deserializer=messages_pb2.SimpleResponse.FromString,
+            _registered_method=True,
         )
         greenlet = group.spawn(self._run_client, UnaryCallWithSleep)
         # release loop so that greenlet can take control
@@ -78,6 +79,7 @@ class CloseChannelTest(unittest.TestCase):
             _UNARY_CALL_METHOD_WITH_SLEEP,
             request_serializer=messages_pb2.SimpleRequest.SerializeToString,
             response_deserializer=messages_pb2.SimpleResponse.FromString,
+            _registered_method=True,
         )
         greenlet = group.spawn(self._run_client, UnaryCallWithSleep)
         # release loop so that greenlet can take control
diff --git a/src/python/grpcio_tests/tests_py3_only/unit/_leak_test.py b/src/python/grpcio_tests/tests_py3_only/unit/_leak_test.py
index c917bd10521..06fa6466014 100644
--- a/src/python/grpcio_tests/tests_py3_only/unit/_leak_test.py
+++ b/src/python/grpcio_tests/tests_py3_only/unit/_leak_test.py
@@ -68,7 +68,10 @@ def _start_a_test_server():
 
 def _perform_an_rpc(address):
     channel = grpc.insecure_channel(address)
-    multicallable = channel.unary_unary(_TEST_METHOD)
+    multicallable = channel.unary_unary(
+        _TEST_METHOD,
+        _registered_method=True,
+    )
     response = multicallable(_REQUEST)
     assert _REQUEST == response
 
diff --git a/src/python/grpcio_tests/tests_py3_only/unit/_simple_stubs_test.py b/src/python/grpcio_tests/tests_py3_only/unit/_simple_stubs_test.py
index 771097936f6..adcc1299e9c 100644
--- a/src/python/grpcio_tests/tests_py3_only/unit/_simple_stubs_test.py
+++ b/src/python/grpcio_tests/tests_py3_only/unit/_simple_stubs_test.py
@@ -193,6 +193,7 @@ class SimpleStubsTest(unittest.TestCase):
                 _UNARY_UNARY,
                 channel_credentials=grpc.experimental.insecure_channel_credentials(),
                 timeout=None,
+                _registered_method=0,
             )
             self.assertEqual(_REQUEST, response)
 
@@ -205,6 +206,7 @@ class SimpleStubsTest(unittest.TestCase):
                 _UNARY_UNARY,
                 channel_credentials=grpc.local_channel_credentials(),
                 timeout=None,
+                _registered_method=0,
             )
             self.assertEqual(_REQUEST, response)
 
@@ -213,7 +215,10 @@ class SimpleStubsTest(unittest.TestCase):
             target = f"localhost:{port}"
             test_name = inspect.stack()[0][3]
             args = (_REQUEST, target, _UNARY_UNARY)
-            kwargs = {"channel_credentials": grpc.local_channel_credentials()}
+            kwargs = {
+                "channel_credentials": grpc.local_channel_credentials(),
+                "_registered_method": True,
+            }
 
             def _invoke(seed: str):
                 run_kwargs = dict(kwargs)
@@ -230,6 +235,7 @@ class SimpleStubsTest(unittest.TestCase):
                 target,
                 _UNARY_UNARY,
                 channel_credentials=grpc.local_channel_credentials(),
+                _registered_method=0,
             )
             self.assert_eventually(
                 lambda: grpc._simple_stubs.ChannelCache.get()._test_only_channel_count()
@@ -250,6 +256,7 @@ class SimpleStubsTest(unittest.TestCase):
                     _UNARY_UNARY,
                     options=options,
                     channel_credentials=grpc.local_channel_credentials(),
+                    _registered_method=0,
                 )
                 self.assert_eventually(
                     lambda: grpc._simple_stubs.ChannelCache.get()._test_only_channel_count()
@@ -265,6 +272,7 @@ class SimpleStubsTest(unittest.TestCase):
                 target,
                 _UNARY_STREAM,
                 channel_credentials=grpc.local_channel_credentials(),
+                _registered_method=0,
             ):
                 self.assertEqual(_REQUEST, response)
 
@@ -280,6 +288,7 @@ class SimpleStubsTest(unittest.TestCase):
                 target,
                 _STREAM_UNARY,
                 channel_credentials=grpc.local_channel_credentials(),
+                _registered_method=0,
             )
             self.assertEqual(_REQUEST, response)
 
@@ -295,6 +304,7 @@ class SimpleStubsTest(unittest.TestCase):
                 target,
                 _STREAM_STREAM,
                 channel_credentials=grpc.local_channel_credentials(),
+                _registered_method=0,
             ):
                 self.assertEqual(_REQUEST, response)
 
@@ -319,14 +329,22 @@ class SimpleStubsTest(unittest.TestCase):
             with _server(server_creds) as port:
                 target = f"localhost:{port}"
                 response = grpc.experimental.unary_unary(
-                    _REQUEST, target, _UNARY_UNARY, options=_property_options
+                    _REQUEST,
+                    target,
+                    _UNARY_UNARY,
+                    options=_property_options,
+                    _registered_method=0,
                 )
 
     def test_insecure_sugar(self):
         with _server(None) as port:
             target = f"localhost:{port}"
             response = grpc.experimental.unary_unary(
-                _REQUEST, target, _UNARY_UNARY, insecure=True
+                _REQUEST,
+                target,
+                _UNARY_UNARY,
+                insecure=True,
+                _registered_method=0,
             )
             self.assertEqual(_REQUEST, response)
 
@@ -340,14 +358,24 @@ class SimpleStubsTest(unittest.TestCase):
                     _UNARY_UNARY,
                     insecure=True,
                     channel_credentials=grpc.local_channel_credentials(),
+                    _registered_method=0,
                 )
 
     def test_default_wait_for_ready(self):
         addr, port, sock = get_socket()
         sock.close()
         target = f"{addr}:{port}"
-        channel = grpc._simple_stubs.ChannelCache.get().get_channel(
-            target, (), None, True, None
+        (
+            channel,
+            unused_method_handle,
+        ) = grpc._simple_stubs.ChannelCache.get().get_channel(
+            target=target,
+            options=(),
+            channel_credentials=None,
+            insecure=True,
+            compression=None,
+            method=_UNARY_UNARY,
+            _registered_method=True,
         )
         rpc_finished_event = threading.Event()
         rpc_failed_event = threading.Event()
@@ -376,7 +404,12 @@ class SimpleStubsTest(unittest.TestCase):
         def _send_rpc():
             try:
                 response = grpc.experimental.unary_unary(
-                    _REQUEST, target, _UNARY_UNARY, timeout=None, insecure=True
+                    _REQUEST,
+                    target,
+                    _UNARY_UNARY,
+                    timeout=None,
+                    insecure=True,
+                    _registered_method=0,
                 )
                 rpc_finished_event.set()
             except Exception as e:
@@ -399,6 +432,7 @@ class SimpleStubsTest(unittest.TestCase):
                     target,
                     _BLACK_HOLE,
                     insecure=True,
+                    _registered_method=0,
                     **invocation_args,
                 )
             self.assertEqual(
diff --git a/templates/src/python/grpcio_observability/_parallel_compile_patch.py.template b/templates/src/python/grpcio_observability/_parallel_compile_patch.py.template
new file mode 100644
index 00000000000..1e1159666b3
--- /dev/null
+++ b/templates/src/python/grpcio_observability/_parallel_compile_patch.py.template
@@ -0,0 +1,23 @@
+%YAML 1.2
+--- |
+  # Copyright 2023 The gRPC Authors
+  #
+  # Licensed under the Apache License, Version 2.0 (the "License");
+  # you may not use this file except in compliance with the License.
+  # You may obtain a copy of the License at
+  #
+  #     http://www.apache.org/licenses/LICENSE-2.0
+  #
+  # Unless required by applicable law or agreed to in writing, software
+  # distributed under the License is distributed on an "AS IS" BASIS,
+  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  # See the License for the specific language governing permissions and
+  # limitations under the License.
+  #
+  # This file has been automatically generated from a template file.
+  # Please make modifications to
+  # `$REPO_ROOT/templates/src/python/grpcio/_parallel_compile_patch.py.template`
+  # instead. This file can be regenerated from the template by running
+  # `tools/buildgen/generate_projects.sh`.
+  
+  <%include file="../_parallel_compile_patch.py.include" />
\ No newline at end of file
diff --git a/test/core/channel/server_call_tracer_factory_test.cc b/test/core/channel/server_call_tracer_factory_test.cc
index 09e79852fea..77862155b6c 100644
--- a/test/core/channel/server_call_tracer_factory_test.cc
+++ b/test/core/channel/server_call_tracer_factory_test.cc
@@ -26,7 +26,8 @@ namespace {
 
 class TestServerCallTracerFactory : public ServerCallTracerFactory {
  public:
-  ServerCallTracer* CreateNewServerCallTracer(Arena* /*arena*/) override {
+  ServerCallTracer* CreateNewServerCallTracer(
+      Arena* /*arena*/, const ChannelArgs& /*args*/) override {
     Crash("Not implemented");
   }
 };
diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc
index d58e143b996..3cec7990f42 100644
--- a/test/core/end2end/fuzzers/api_fuzzer.cc
+++ b/test/core/end2end/fuzzers/api_fuzzer.cc
@@ -29,6 +29,8 @@
 
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 
@@ -407,6 +409,21 @@ void ApiFuzzer::Tick() {
   }
 }
 
+namespace {
+
+// If there are more than 1K comma-delimited strings in target, remove
+// the extra ones.
+std::string SanitizeTargetUri(absl::string_view target) {
+  constexpr size_t kMaxCommaDelimitedStrings = 1000;
+  std::vector<absl::string_view> parts = absl::StrSplit(target, ',');
+  if (parts.size() > kMaxCommaDelimitedStrings) {
+    parts.resize(kMaxCommaDelimitedStrings);
+  }
+  return absl::StrJoin(parts, ",");
+}
+
+}  // namespace
+
 ApiFuzzer::Result ApiFuzzer::CreateChannel(
     const api_fuzzer::CreateChannel& create_channel) {
   if (channel_ != nullptr) return Result::kComplete;
@@ -423,8 +440,9 @@ ApiFuzzer::Result ApiFuzzer::CreateChannel(
         create_channel.has_channel_creds()
             ? ReadChannelCreds(create_channel.channel_creds())
             : grpc_insecure_credentials_create();
-    channel_ = grpc_channel_create(create_channel.target().c_str(), creds,
-                                   args.ToC().get());
+    channel_ =
+        grpc_channel_create(SanitizeTargetUri(create_channel.target()).c_str(),
+                            creds, args.ToC().get());
     grpc_channel_credentials_release(creds);
   }
   GPR_ASSERT(channel_ != nullptr);
diff --git a/test/core/end2end/tests/http2_stats.cc b/test/core/end2end/tests/http2_stats.cc
index d2fc0ea560c..14f8dbeb648 100644
--- a/test/core/end2end/tests/http2_stats.cc
+++ b/test/core/end2end/tests/http2_stats.cc
@@ -200,7 +200,8 @@ grpc_transport_stream_stats FakeServerCallTracer::transport_stream_stats_;
 
 class FakeServerCallTracerFactory : public ServerCallTracerFactory {
  public:
-  ServerCallTracer* CreateNewServerCallTracer(Arena* arena) override {
+  ServerCallTracer* CreateNewServerCallTracer(
+      Arena* arena, const ChannelArgs& /*args*/) override {
     return arena->ManagedNew<FakeServerCallTracer>();
   }
 };
@@ -214,8 +215,8 @@ CORE_END2END_TEST(Http2FullstackSingleHopTest, StreamStats) {
   g_client_call_ended_notify = new Notification();
   g_server_call_ended_notify = new Notification();
   CoreConfiguration::RegisterBuilder([](CoreConfiguration::Builder* builder) {
-    builder->channel_init()->RegisterFilter(GRPC_CLIENT_CHANNEL,
-                                            &FakeClientFilter::kFilter);
+    builder->channel_init()->RegisterFilter<FakeClientFilter>(
+        GRPC_CLIENT_CHANNEL);
   });
   ServerCallTracerFactory::RegisterGlobal(new FakeServerCallTracerFactory);
 
diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
index c788c43cee3..404781ee5b7 100644
--- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
+++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc
@@ -543,11 +543,18 @@ EventEngine::TaskHandle FuzzingEventEngine::RunAfterLocked(
   const intptr_t id = next_task_id_;
   ++next_task_id_;
   Duration delay_taken = Duration::zero();
-  if (run_type != RunType::kExact && !task_delays_.empty()) {
-    delay_taken = grpc_core::Clamp(task_delays_.front(), Duration::zero(),
-                                   max_delay_[static_cast<int>(run_type)]);
+  if (run_type != RunType::kExact) {
+    if (!task_delays_.empty()) {
+      delay_taken = grpc_core::Clamp(task_delays_.front(), Duration::zero(),
+                                     max_delay_[static_cast<int>(run_type)]);
+      task_delays_.pop();
+    } else if (run_type != RunType::kWrite && when == Duration::zero()) {
+      // For zero-duration events, if there is no more delay input from
+      // the test case, we default to a small non-zero value to avoid
+      // busy loops that prevent us from making forward progress.
+      delay_taken = std::chrono::microseconds(1);
+    }
     when += delay_taken;
-    task_delays_.pop();
   }
   auto task = std::make_shared<Task>(id, std::move(closure));
   tasks_by_id_.emplace(id, task);
diff --git a/test/core/promise/BUILD b/test/core/promise/BUILD
index b4c4ce855c6..a035820d5a8 100644
--- a/test/core/promise/BUILD
+++ b/test/core/promise/BUILD
@@ -197,6 +197,17 @@ grpc_cc_test(
     deps = ["//src/core:if"],
 )
 
+grpc_cc_test(
+    name = "switch_test",
+    srcs = ["switch_test.cc"],
+    external_deps = ["gtest"],
+    language = "c++",
+    tags = ["promise_test"],
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = ["//src/core:switch"],
+)
+
 grpc_cc_test(
     name = "loop_test",
     srcs = ["loop_test.cc"],
diff --git a/test/core/promise/mpsc_test.cc b/test/core/promise/mpsc_test.cc
index 38baa68cb60..3d6e669a173 100644
--- a/test/core/promise/mpsc_test.cc
+++ b/test/core/promise/mpsc_test.cc
@@ -95,6 +95,8 @@ TEST(MpscTest, SendingLotsOfThingsGivesPushback) {
   EXPECT_EQ(NowOrNever(sender.Send(MakePayload(1))), true);
   EXPECT_EQ(NowOrNever(sender.Send(MakePayload(2))), absl::nullopt);
   activity1.Deactivate();
+
+  EXPECT_CALL(activity1, WakeupRequested());
 }
 
 TEST(MpscTest, ReceivingAfterBlockageWakesUp) {
diff --git a/test/core/promise/party_test.cc b/test/core/promise/party_test.cc
index 551443ac4d5..6f915c26805 100644
--- a/test/core/promise/party_test.cc
+++ b/test/core/promise/party_test.cc
@@ -490,6 +490,54 @@ TEST_F(PartyTest, CanBulkSpawn) {
   n2.WaitForNotification();
 }
 
+TEST_F(PartyTest, AfterCurrentPollWorks) {
+  auto party = MakeRefCounted<TestParty>();
+  Notification n;
+  int state = 0;
+  {
+    Party::BulkSpawner spawner(party.get());
+    // BulkSpawner will schedule and poll this promise first, but the
+    // `AfterCurrentPoll` will pause it.
+    // Then spawn1, spawn2, and spawn3 will run in order (with EXPECT_EQ checks
+    // demonstrating this), at which point the poll will complete, causing
+    // spawn_final to be awoken and scheduled and see the final state.
+    spawner.Spawn(
+        "spawn_final",
+        [&state, &party]() {
+          return Seq(party->AfterCurrentPoll(), [&state]() {
+            EXPECT_EQ(state, 3);
+            return Empty{};
+          });
+        },
+        [&n](Empty) { n.Notify(); });
+    spawner.Spawn(
+        "spawn1",
+        [&state]() {
+          EXPECT_EQ(state, 0);
+          state = 1;
+          return Empty{};
+        },
+        [](Empty) {});
+    spawner.Spawn(
+        "spawn2",
+        [&state]() {
+          EXPECT_EQ(state, 1);
+          state = 2;
+          return Empty{};
+        },
+        [](Empty) {});
+    spawner.Spawn(
+        "spawn3",
+        [&state]() {
+          EXPECT_EQ(state, 2);
+          state = 3;
+          return Empty{};
+        },
+        [](Empty) {});
+  }
+  n.WaitForNotification();
+}
+
 TEST_F(PartyTest, ThreadStressTest) {
   auto party = MakeRefCounted<TestParty>();
   std::vector<std::thread> threads;
diff --git a/test/core/promise/switch_test.cc b/test/core/promise/switch_test.cc
new file mode 100644
index 00000000000..ed18c1113ed
--- /dev/null
+++ b/test/core/promise/switch_test.cc
@@ -0,0 +1,69 @@
+// Copyright 2023 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "src/core/lib/promise/switch.h"
+
+#include "gtest/gtest.h"
+
+namespace grpc_core {
+
+TEST(SwitchTest, JustDefault) {
+  EXPECT_EQ(Switch(42, Default([] { return 1; }))(), Poll<int>(1));
+}
+
+TEST(SwitchTest, ThreeCases) {
+  auto test_switch = [](int d) {
+    return Switch(d, Case(1, [] { return 25; }), Case(2, [] { return 95; }),
+                  Case(3, [] { return 68; }), Default([] { return 52; }));
+  };
+  EXPECT_EQ(test_switch(0)(), Poll<int>(52));
+  EXPECT_EQ(test_switch(1)(), Poll<int>(25));
+  EXPECT_EQ(test_switch(2)(), Poll<int>(95));
+  EXPECT_EQ(test_switch(3)(), Poll<int>(68));
+  EXPECT_EQ(test_switch(4)(), Poll<int>(52));
+}
+
+TEST(SwitchTest, Pending) {
+  auto test_switch = [](int d) {
+    return Switch(d, Case(42, []() -> Poll<int> { return Pending{}; }),
+                  Case(1, [] { return 25; }), Case(2, [] { return 95; }),
+                  Case(3, [] { return 68; }), Default([] { return 52; }));
+  };
+  EXPECT_EQ(test_switch(0)(), Poll<int>(52));
+  EXPECT_EQ(test_switch(1)(), Poll<int>(25));
+  EXPECT_EQ(test_switch(2)(), Poll<int>(95));
+  EXPECT_EQ(test_switch(3)(), Poll<int>(68));
+  EXPECT_EQ(test_switch(4)(), Poll<int>(52));
+  EXPECT_EQ(test_switch(42)(), Poll<int>(Pending{}));
+}
+
+TEST(SwitchTest, ThreeCasesFromEnum) {
+  enum class X : uint8_t { A, B, C };
+
+  auto test_switch = [](X d) {
+    return Switch(d, Case(X::A, [] { return 25; }),
+                  Case(X::B, [] { return 95; }), Case(X::C, [] { return 68; }),
+                  Default([] { return 52; }));
+  };
+  EXPECT_EQ(test_switch(X::A)(), Poll<int>(25));
+  EXPECT_EQ(test_switch(X::B)(), Poll<int>(95));
+  EXPECT_EQ(test_switch(X::C)(), Poll<int>(68));
+}
+
+}  // namespace grpc_core
+
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
diff --git a/test/core/transport/BUILD b/test/core/transport/BUILD
index d42792f9093..df6c57785c4 100644
--- a/test/core/transport/BUILD
+++ b/test/core/transport/BUILD
@@ -94,21 +94,6 @@ grpc_cc_test(
     ],
 )
 
-grpc_cc_test(
-    name = "pid_controller_test",
-    srcs = ["pid_controller_test.cc"],
-    external_deps = [
-        "gtest",
-    ],
-    language = "C++",
-    deps = [
-        "//:gpr",
-        "//:grpc",
-        "//test/core/util:grpc_test_util",
-        "//test/core/util:grpc_test_util_base",
-    ],
-)
-
 grpc_cc_test(
     name = "promise_endpoint_test",
     srcs = ["promise_endpoint_test.cc"],
diff --git a/test/core/transport/chaotic_good/BUILD b/test/core/transport/chaotic_good/BUILD
index fc698aeec44..11daa792100 100644
--- a/test/core/transport/chaotic_good/BUILD
+++ b/test/core/transport/chaotic_good/BUILD
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("//bazel:grpc_build_system.bzl", "grpc_cc_test", "grpc_package")
-load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer")
+load("//bazel:grpc_build_system.bzl", "grpc_cc_library", "grpc_cc_test", "grpc_package")
+load("//test/core/util:grpc_fuzzer.bzl", "grpc_fuzzer", "grpc_proto_fuzzer")
 
 licenses(["notice"])
 
@@ -22,6 +22,34 @@ grpc_package(
     visibility = "tests",
 )
 
+grpc_cc_library(
+    name = "mock_promise_endpoint",
+    testonly = 1,
+    srcs = ["mock_promise_endpoint.cc"],
+    hdrs = ["mock_promise_endpoint.h"],
+    external_deps = ["gtest"],
+    deps = [
+        "//:grpc",
+        "//src/core:grpc_promise_endpoint",
+    ],
+)
+
+grpc_cc_library(
+    name = "transport_test",
+    testonly = 1,
+    srcs = ["transport_test.cc"],
+    hdrs = ["transport_test.h"],
+    external_deps = ["gtest"],
+    deps = [
+        "//:iomgr_timer",
+        "//src/core:chaotic_good_frame",
+        "//src/core:memory_quota",
+        "//src/core:resource_quota",
+        "//test/core/event_engine/fuzzing_event_engine",
+        "//test/core/event_engine/fuzzing_event_engine:fuzzing_event_engine_proto",
+    ],
+)
+
 grpc_cc_test(
     name = "frame_header_test",
     srcs = ["frame_header_test.cc"],
@@ -54,7 +82,7 @@ grpc_cc_test(
     deps = ["//src/core:chaotic_good_frame"],
 )
 
-grpc_fuzzer(
+grpc_proto_fuzzer(
     name = "frame_fuzzer",
     srcs = ["frame_fuzzer.cc"],
     corpus = "frame_fuzzer_corpus",
@@ -63,7 +91,10 @@ grpc_fuzzer(
         "absl/status:statusor",
     ],
     language = "C++",
+    proto = "frame_fuzzer.proto",
     tags = ["no_windows"],
+    uses_event_engine = False,
+    uses_polling = False,
     deps = [
         "//:exec_ctx",
         "//:gpr",
@@ -96,18 +127,46 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
+        "mock_promise_endpoint",
+        "transport_test",
         "//:grpc",
         "//:grpc_public_hdrs",
+        "//src/core:arena",
+        "//src/core:chaotic_good_client_transport",
+        "//src/core:if",
+        "//src/core:loop",
+        "//src/core:seq",
+        "//src/core:slice_buffer",
+    ],
+)
+
+grpc_cc_test(
+    name = "client_transport_error_test",
+    srcs = ["client_transport_error_test.cc"],
+    external_deps = [
+        "absl/functional:any_invocable",
+        "absl/status",
+        "absl/status:statusor",
+        "absl/strings:str_format",
+        "absl/types:optional",
+        "gtest",
+    ],
+    language = "C++",
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        "//:grpc_public_hdrs",
+        "//:grpc_unsecure",
         "//:iomgr_timer",
         "//:ref_counted_ptr",
         "//src/core:activity",
         "//src/core:arena",
         "//src/core:chaotic_good_client_transport",
         "//src/core:event_engine_wakeup_scheduler",
+        "//src/core:grpc_promise_endpoint",
         "//src/core:if",
         "//src/core:join",
         "//src/core:loop",
-        "//src/core:map",
         "//src/core:memory_quota",
         "//src/core:pipe",
         "//src/core:resource_quota",
@@ -120,8 +179,8 @@ grpc_cc_test(
 )
 
 grpc_cc_test(
-    name = "client_transport_error_test",
-    srcs = ["client_transport_error_test.cc"],
+    name = "server_transport_test",
+    srcs = ["server_transport_test.cc"],
     external_deps = [
         "absl/functional:any_invocable",
         "absl/status",
@@ -134,20 +193,15 @@ grpc_cc_test(
     uses_event_engine = False,
     uses_polling = False,
     deps = [
+        "mock_promise_endpoint",
+        "transport_test",
         "//:grpc",
         "//:grpc_public_hdrs",
         "//:iomgr_timer",
         "//:ref_counted_ptr",
-        "//src/core:activity",
         "//src/core:arena",
-        "//src/core:chaotic_good_client_transport",
-        "//src/core:event_engine_wakeup_scheduler",
-        "//src/core:grpc_promise_endpoint",
-        "//src/core:if",
-        "//src/core:join",
-        "//src/core:loop",
+        "//src/core:chaotic_good_server_transport",
         "//src/core:memory_quota",
-        "//src/core:pipe",
         "//src/core:resource_quota",
         "//src/core:seq",
         "//src/core:slice",
diff --git a/test/core/transport/chaotic_good/client_transport_error_test.cc b/test/core/transport/chaotic_good/client_transport_error_test.cc
index 3b30c4ca330..295e060b809 100644
--- a/test/core/transport/chaotic_good/client_transport_error_test.cc
+++ b/test/core/transport/chaotic_good/client_transport_error_test.cc
@@ -12,37 +12,31 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "absl/status/status.h"
-
-#include "src/core/ext/transport/chaotic_good/client_transport.h"
-#include "src/core/lib/transport/promise_endpoint.h"
-#include "src/core/lib/transport/transport.h"
-
-// IWYU pragma: no_include <sys/socket.h>
-
 #include <stddef.h>
 
-#include <algorithm>  // IWYU pragma: keep
+#include <algorithm>
 #include <memory>
-#include <string>  // IWYU pragma: keep
+#include <string>
 #include <tuple>
 #include <utility>
-#include <vector>  // IWYU pragma: keep
+#include <vector>
 
 #include "absl/functional/any_invocable.h"
-#include "absl/status/statusor.h"     // IWYU pragma: keep
-#include "absl/strings/str_format.h"  // IWYU pragma: keep
-#include "absl/types/optional.h"      // IWYU pragma: keep
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_format.h"
+#include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice.h>  // IWYU pragma: keep
+#include <grpc/event_engine/slice.h>
 #include <grpc/event_engine/slice_buffer.h>
 #include <grpc/grpc.h>
-#include <grpc/status.h>  // IWYU pragma: keep
+#include <grpc/status.h>
 
+#include "src/core/ext/transport/chaotic_good/client_transport.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/iomgr/timer_manager.h"
 #include "src/core/lib/promise/activity.h"
@@ -56,14 +50,16 @@
 #include "src/core/lib/resource_quota/memory_quota.h"
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/lib/slice/slice_buffer.h"
-#include "src/core/lib/slice/slice_internal.h"      // IWYU pragma: keep
-#include "src/core/lib/transport/metadata_batch.h"  // IWYU pragma: keep
+#include "src/core/lib/slice/slice_internal.h"
+#include "src/core/lib/transport/metadata_batch.h"
+#include "src/core/lib/transport/promise_endpoint.h"
+#include "src/core/lib/transport/transport.h"
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
 #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h"
 
+using testing::AtMost;
 using testing::MockFunction;
 using testing::Return;
-using testing::Sequence;
 using testing::StrictMock;
 using testing::WithArgs;
 
@@ -98,333 +94,308 @@ class MockEndpoint
       GetLocalAddress, (), (const, override));
 };
 
+struct MockPromiseEndpoint {
+  StrictMock<MockEndpoint>* endpoint = new StrictMock<MockEndpoint>();
+  std::unique_ptr<PromiseEndpoint> promise_endpoint =
+      std::make_unique<PromiseEndpoint>(
+          std::unique_ptr<StrictMock<MockEndpoint>>(endpoint), SliceBuffer());
+};
+
+// Send messages from client to server.
+auto SendClientToServerMessages(CallInitiator initiator, int num_messages) {
+  return Loop([initiator, num_messages]() mutable {
+    bool has_message = (num_messages > 0);
+    return If(
+        has_message,
+        Seq(initiator.PushMessage(GetContext<Arena>()->MakePooled<Message>()),
+            [&num_messages]() -> LoopCtl<absl::Status> {
+              --num_messages;
+              return Continue();
+            }),
+        [initiator]() mutable -> LoopCtl<absl::Status> {
+          initiator.FinishSends();
+          return absl::OkStatus();
+        });
+  });
+}
+
+ClientMetadataHandle TestInitialMetadata() {
+  auto md =
+      GetContext<Arena>()->MakePooled<ClientMetadata>(GetContext<Arena>());
+  md->Set(HttpPathMetadata(), Slice::FromStaticString("/test"));
+  return md;
+}
+
 class ClientTransportTest : public ::testing::Test {
- public:
-  ClientTransportTest()
-      : control_endpoint_ptr_(new StrictMock<MockEndpoint>()),
-        data_endpoint_ptr_(new StrictMock<MockEndpoint>()),
-        memory_allocator_(
-            ResourceQuota::Default()->memory_quota()->CreateMemoryAllocator(
-                "test")),
-        control_endpoint_(*control_endpoint_ptr_),
-        data_endpoint_(*data_endpoint_ptr_),
-        event_engine_(std::make_shared<
-                      grpc_event_engine::experimental::FuzzingEventEngine>(
-            []() {
-              grpc_timer_manager_set_threading(false);
-              grpc_event_engine::experimental::FuzzingEventEngine::Options
-                  options;
-              return options;
-            }(),
-            fuzzing_event_engine::Actions())),
-        arena_(MakeScopedArena(initial_arena_size, &memory_allocator_)),
-        pipe_client_to_server_messages_(arena_.get()),
-        pipe_server_to_client_messages_(arena_.get()),
-        pipe_server_intial_metadata_(arena_.get()),
-        pipe_client_to_server_messages_second_(arena_.get()),
-        pipe_server_to_client_messages_second_(arena_.get()),
-        pipe_server_intial_metadata_second_(arena_.get()) {}
-  // Initial ClientTransport with read expecations
-  void InitialClientTransport() {
-    client_transport_ = std::make_unique<ClientTransport>(
-        std::make_unique<PromiseEndpoint>(
-            std::unique_ptr<MockEndpoint>(control_endpoint_ptr_),
-            SliceBuffer()),
-        std::make_unique<PromiseEndpoint>(
-            std::unique_ptr<MockEndpoint>(data_endpoint_ptr_), SliceBuffer()),
-        event_engine_);
-  }
-  // Send messages from client to server.
-  auto SendClientToServerMessages(
-      Pipe<MessageHandle>& pipe_client_to_server_messages,
-      int num_of_messages) {
-    return Loop([&pipe_client_to_server_messages, num_of_messages,
-                 this]() mutable {
-      bool has_message = (num_of_messages > 0);
-      return If(
-          has_message,
-          Seq(pipe_client_to_server_messages.sender.Push(
-                  arena_->MakePooled<Message>()),
-              [&num_of_messages]() -> LoopCtl<absl::Status> {
-                num_of_messages--;
-                return Continue();
-              }),
-          [&pipe_client_to_server_messages]() mutable -> LoopCtl<absl::Status> {
-            pipe_client_to_server_messages.sender.Close();
-            return absl::OkStatus();
-          });
-    });
-  }
-  // Add stream into client transport, and expect return trailers of
-  // "grpc-status:code".
-  auto AddStream(CallArgs args) {
-    return client_transport_->AddStream(std::move(args));
+ protected:
+  const std::shared_ptr<grpc_event_engine::experimental::FuzzingEventEngine>&
+  event_engine() {
+    return event_engine_;
   }
+  MemoryAllocator* memory_allocator() { return &allocator_; }
 
  private:
-  MockEndpoint* control_endpoint_ptr_;
-  MockEndpoint* data_endpoint_ptr_;
-  size_t initial_arena_size = 1024;
-  MemoryAllocator memory_allocator_;
-
- protected:
-  MockEndpoint& control_endpoint_;
-  MockEndpoint& data_endpoint_;
   std::shared_ptr<grpc_event_engine::experimental::FuzzingEventEngine>
-      event_engine_;
-  std::unique_ptr<ClientTransport> client_transport_;
-  ScopedArenaPtr arena_;
-  Pipe<MessageHandle> pipe_client_to_server_messages_;
-  Pipe<MessageHandle> pipe_server_to_client_messages_;
-  Pipe<ServerMetadataHandle> pipe_server_intial_metadata_;
-  // Added for mutliple streams tests.
-  Pipe<MessageHandle> pipe_client_to_server_messages_second_;
-  Pipe<MessageHandle> pipe_server_to_client_messages_second_;
-  Pipe<ServerMetadataHandle> pipe_server_intial_metadata_second_;
-  absl::AnyInvocable<void(absl::Status)> read_callback_;
-  Sequence control_endpoint_sequence_;
-  Sequence data_endpoint_sequence_;
-  // Added to verify received message payload.
-  const std::string message_ = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08};
+      event_engine_{
+          std::make_shared<grpc_event_engine::experimental::FuzzingEventEngine>(
+              []() {
+                grpc_timer_manager_set_threading(false);
+                grpc_event_engine::experimental::FuzzingEventEngine::Options
+                    options;
+                return options;
+              }(),
+              fuzzing_event_engine::Actions())};
+  MemoryAllocator allocator_ = MakeResourceQuota("test-quota")
+                                   ->memory_quota()
+                                   ->CreateMemoryAllocator("test-allocator");
 };
 
 TEST_F(ClientTransportTest, AddOneStreamWithWriteFailed) {
+  MockPromiseEndpoint control_endpoint;
+  MockPromiseEndpoint data_endpoint;
   // Mock write failed and read is pending.
-  EXPECT_CALL(control_endpoint_, Write)
+  EXPECT_CALL(*control_endpoint.endpoint, Write)
+      .Times(AtMost(1))
       .WillOnce(
           WithArgs<0>([](absl::AnyInvocable<void(absl::Status)> on_write) {
             on_write(absl::InternalError("control endpoint write failed."));
             return false;
           }));
-  EXPECT_CALL(data_endpoint_, Write)
+  EXPECT_CALL(*data_endpoint.endpoint, Write)
+      .Times(AtMost(1))
       .WillOnce(
           WithArgs<0>([](absl::AnyInvocable<void(absl::Status)> on_write) {
             on_write(absl::InternalError("data endpoint write failed."));
             return false;
           }));
-  EXPECT_CALL(control_endpoint_, Read)
-      .InSequence(control_endpoint_sequence_)
-      .WillOnce(Return(false));
-  InitialClientTransport();
-  ClientMetadataHandle md;
-  auto args = CallArgs{std::move(md),
-                       ClientInitialMetadataOutstandingToken::Empty(),
-                       nullptr,
-                       &pipe_server_intial_metadata_.sender,
-                       &pipe_client_to_server_messages_.receiver,
-                       &pipe_server_to_client_messages_.sender};
-  StrictMock<MockFunction<void(absl::Status)>> on_done;
-  EXPECT_CALL(on_done, Call(absl::OkStatus()));
-  auto activity = MakeActivity(
-      Seq(
-          // Concurrently: write and read messages in client transport.
-          Join(
-              // Add first stream with call_args into client transport.
-              // Expect return trailers "grpc-status:unavailable".
-              AddStream(std::move(args)),
-              // Send messages to call_args.client_to_server_messages pipe,
-              // which will be eventually sent to control/data endpoints.
-              SendClientToServerMessages(pipe_client_to_server_messages_, 1)),
-          // Once complete, verify successful sending and the received value.
-          [](const std::tuple<ServerMetadataHandle, absl::Status>& ret) {
-            EXPECT_EQ(std::get<0>(ret)->get(GrpcStatusMetadata()).value(),
-                      GRPC_STATUS_UNAVAILABLE);
-            EXPECT_TRUE(std::get<1>(ret).ok());
-            return absl::OkStatus();
-          }),
-      EventEngineWakeupScheduler(event_engine_),
-      [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
+  EXPECT_CALL(*control_endpoint.endpoint, Read).WillOnce(Return(false));
+  auto transport = MakeOrphanable<ChaoticGoodClientTransport>(
+      std::move(control_endpoint.promise_endpoint),
+      std::move(data_endpoint.promise_endpoint), event_engine());
+  auto call =
+      MakeCall(event_engine().get(), Arena::Create(8192, memory_allocator()));
+  transport->StartCall(std::move(call.handler));
+  call.initiator.SpawnGuarded("test-send", [initiator =
+                                                call.initiator]() mutable {
+    return TrySeq(initiator.PushClientInitialMetadata(TestInitialMetadata()),
+                  SendClientToServerMessages(initiator, 1));
+  });
+  StrictMock<MockFunction<void()>> on_done;
+  EXPECT_CALL(on_done, Call());
+  call.initiator.SpawnInfallible(
+      "test-read", [&on_done, initiator = call.initiator]() mutable {
+        return Seq(
+            initiator.PullServerInitialMetadata(),
+            [](ValueOrFailure<ServerMetadataHandle> md) {
+              EXPECT_FALSE(md.ok());
+              return Empty{};
+            },
+            initiator.PullServerTrailingMetadata(),
+            [&on_done](ServerMetadataHandle md) {
+              EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
+                        GRPC_STATUS_UNAVAILABLE);
+              on_done.Call();
+              return Empty{};
+            });
+      });
   // Wait until ClientTransport's internal activities to finish.
-  event_engine_->TickUntilIdle();
-  event_engine_->UnsetGlobalHooks();
+  event_engine()->TickUntilIdle();
+  event_engine()->UnsetGlobalHooks();
 }
 
 TEST_F(ClientTransportTest, AddOneStreamWithReadFailed) {
+  MockPromiseEndpoint control_endpoint;
+  MockPromiseEndpoint data_endpoint;
   // Mock read failed.
-  EXPECT_CALL(control_endpoint_, Read)
-      .InSequence(control_endpoint_sequence_)
+  EXPECT_CALL(*control_endpoint.endpoint, Read)
       .WillOnce(WithArgs<0>(
           [](absl::AnyInvocable<void(absl::Status)> on_read) mutable {
             on_read(absl::InternalError("control endpoint read failed."));
             // Return false to mock EventEngine read not finish.
             return false;
           }));
-  InitialClientTransport();
-  ClientMetadataHandle md;
-  auto args = CallArgs{std::move(md),
-                       ClientInitialMetadataOutstandingToken::Empty(),
-                       nullptr,
-                       &pipe_server_intial_metadata_.sender,
-                       &pipe_client_to_server_messages_.receiver,
-                       &pipe_server_to_client_messages_.sender};
-  StrictMock<MockFunction<void(absl::Status)>> on_done;
-  EXPECT_CALL(on_done, Call(absl::OkStatus()));
-  auto activity = MakeActivity(
-      Seq(
-          // Concurrently: write and read messages in client transport.
-          Join(
-              // Add first stream with call_args into client transport.
-              // Expect return trailers "grpc-status:unavailable".
-              AddStream(std::move(args)),
-              // Send messages to call_args.client_to_server_messages pipe.
-              SendClientToServerMessages(pipe_client_to_server_messages_, 1)),
-          // Once complete, verify successful sending and the received value.
-          [](const std::tuple<ServerMetadataHandle, absl::Status>& ret) {
-            EXPECT_EQ(std::get<0>(ret)->get(GrpcStatusMetadata()).value(),
-                      GRPC_STATUS_UNAVAILABLE);
-            EXPECT_TRUE(std::get<1>(ret).ok());
-            return absl::OkStatus();
-          }),
-      EventEngineWakeupScheduler(event_engine_),
-      [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
+  auto transport = MakeOrphanable<ChaoticGoodClientTransport>(
+      std::move(control_endpoint.promise_endpoint),
+      std::move(data_endpoint.promise_endpoint), event_engine());
+  auto call =
+      MakeCall(event_engine().get(), Arena::Create(8192, memory_allocator()));
+  transport->StartCall(std::move(call.handler));
+  call.initiator.SpawnGuarded("test-send", [initiator =
+                                                call.initiator]() mutable {
+    return TrySeq(initiator.PushClientInitialMetadata(TestInitialMetadata()),
+                  SendClientToServerMessages(initiator, 1));
+  });
+  StrictMock<MockFunction<void()>> on_done;
+  EXPECT_CALL(on_done, Call());
+  call.initiator.SpawnInfallible(
+      "test-read", [&on_done, initiator = call.initiator]() mutable {
+        return Seq(
+            initiator.PullServerInitialMetadata(),
+            [](ValueOrFailure<ServerMetadataHandle> md) {
+              EXPECT_FALSE(md.ok());
+              return Empty{};
+            },
+            initiator.PullServerTrailingMetadata(),
+            [&on_done](ServerMetadataHandle md) {
+              EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
+                        GRPC_STATUS_UNAVAILABLE);
+              on_done.Call();
+              return Empty{};
+            });
+      });
   // Wait until ClientTransport's internal activities to finish.
-  event_engine_->TickUntilIdle();
-  event_engine_->UnsetGlobalHooks();
+  event_engine()->TickUntilIdle();
+  event_engine()->UnsetGlobalHooks();
 }
 
 TEST_F(ClientTransportTest, AddMultipleStreamWithWriteFailed) {
   // Mock write failed at first stream and second stream's write will fail too.
-  EXPECT_CALL(control_endpoint_, Write)
-      .Times(1)
+  MockPromiseEndpoint control_endpoint;
+  MockPromiseEndpoint data_endpoint;
+  EXPECT_CALL(*control_endpoint.endpoint, Write)
+      .Times(AtMost(1))
       .WillRepeatedly(
           WithArgs<0>([](absl::AnyInvocable<void(absl::Status)> on_write) {
             on_write(absl::InternalError("control endpoint write failed."));
             return false;
           }));
-  EXPECT_CALL(data_endpoint_, Write)
-      .Times(1)
+  EXPECT_CALL(*data_endpoint.endpoint, Write)
+      .Times(AtMost(1))
       .WillRepeatedly(
           WithArgs<0>([](absl::AnyInvocable<void(absl::Status)> on_write) {
             on_write(absl::InternalError("data endpoint write failed."));
             return false;
           }));
-  EXPECT_CALL(control_endpoint_, Read)
-      .InSequence(control_endpoint_sequence_)
-      .WillOnce(Return(false));
-  InitialClientTransport();
-  ClientMetadataHandle first_stream_md;
-  ClientMetadataHandle second_stream_md;
-  auto first_stream_args =
-      CallArgs{std::move(first_stream_md),
-               ClientInitialMetadataOutstandingToken::Empty(),
-               nullptr,
-               &pipe_server_intial_metadata_.sender,
-               &pipe_client_to_server_messages_.receiver,
-               &pipe_server_to_client_messages_.sender};
-  auto second_stream_args =
-      CallArgs{std::move(second_stream_md),
-               ClientInitialMetadataOutstandingToken::Empty(),
-               nullptr,
-               &pipe_server_intial_metadata_second_.sender,
-               &pipe_client_to_server_messages_second_.receiver,
-               &pipe_server_to_client_messages_second_.sender};
-  StrictMock<MockFunction<void(absl::Status)>> on_done;
-  EXPECT_CALL(on_done, Call(absl::OkStatus()));
-  auto activity = MakeActivity(
-      Seq(
-          // Concurrently: write and read messages from client transport.
-          Join(
-              // Add first stream with call_args into client transport.
-              // Expect return trailers "grpc-status:unavailable".
-              AddStream(std::move(first_stream_args)),
-              // Send messages to first stream's
-              // call_args.client_to_server_messages pipe.
-              SendClientToServerMessages(pipe_client_to_server_messages_, 1)),
-          // Once complete, verify successful sending and the received value.
-          [](const std::tuple<ServerMetadataHandle, absl::Status>& ret) {
-            EXPECT_EQ(std::get<0>(ret)->get(GrpcStatusMetadata()).value(),
-                      GRPC_STATUS_UNAVAILABLE);
-            EXPECT_TRUE(std::get<1>(ret).ok());
-            return absl::OkStatus();
-          },
-          Join(
-              // Add second stream with call_args into client transport.
-              // Expect return trailers "grpc-status:unavailable".
-              AddStream(std::move(second_stream_args)),
-              // Send messages to second stream's
-              // call_args.client_to_server_messages pipe.
-              SendClientToServerMessages(pipe_client_to_server_messages_second_,
-                                         1)),
-          // Once complete, verify successful sending and the received value.
-          [](const std::tuple<ServerMetadataHandle, absl::Status>& ret) {
-            EXPECT_EQ(std::get<0>(ret)->get(GrpcStatusMetadata()).value(),
-                      GRPC_STATUS_UNAVAILABLE);
-            EXPECT_TRUE(std::get<1>(ret).ok());
-            return absl::OkStatus();
-          }),
-      EventEngineWakeupScheduler(event_engine_),
-      [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
+  EXPECT_CALL(*control_endpoint.endpoint, Read).WillOnce(Return(false));
+  auto transport = MakeOrphanable<ChaoticGoodClientTransport>(
+      std::move(control_endpoint.promise_endpoint),
+      std::move(data_endpoint.promise_endpoint), event_engine());
+  auto call1 =
+      MakeCall(event_engine().get(), Arena::Create(8192, memory_allocator()));
+  transport->StartCall(std::move(call1.handler));
+  auto call2 =
+      MakeCall(event_engine().get(), Arena::Create(8192, memory_allocator()));
+  transport->StartCall(std::move(call2.handler));
+  call1.initiator.SpawnGuarded("test-send-1", [initiator =
+                                                   call1.initiator]() mutable {
+    return TrySeq(initiator.PushClientInitialMetadata(TestInitialMetadata()),
+                  SendClientToServerMessages(initiator, 1));
+  });
+  call2.initiator.SpawnGuarded("test-send-2", [initiator =
+                                                   call2.initiator]() mutable {
+    return TrySeq(initiator.PushClientInitialMetadata(TestInitialMetadata()),
+                  SendClientToServerMessages(initiator, 1));
+  });
+  StrictMock<MockFunction<void()>> on_done1;
+  EXPECT_CALL(on_done1, Call());
+  StrictMock<MockFunction<void()>> on_done2;
+  EXPECT_CALL(on_done2, Call());
+  call1.initiator.SpawnInfallible(
+      "test-read-1", [&on_done1, initiator = call1.initiator]() mutable {
+        return Seq(
+            initiator.PullServerInitialMetadata(),
+            [](ValueOrFailure<ServerMetadataHandle> md) {
+              EXPECT_FALSE(md.ok());
+              return Empty{};
+            },
+            initiator.PullServerTrailingMetadata(),
+            [&on_done1](ServerMetadataHandle md) {
+              EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
+                        GRPC_STATUS_UNAVAILABLE);
+              on_done1.Call();
+              return Empty{};
+            });
+      });
+  call2.initiator.SpawnInfallible(
+      "test-read-2", [&on_done2, initiator = call2.initiator]() mutable {
+        return Seq(
+            initiator.PullServerInitialMetadata(),
+            [](ValueOrFailure<ServerMetadataHandle> md) {
+              EXPECT_FALSE(md.ok());
+              return Empty{};
+            },
+            initiator.PullServerTrailingMetadata(),
+            [&on_done2](ServerMetadataHandle md) {
+              EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
+                        GRPC_STATUS_UNAVAILABLE);
+              on_done2.Call();
+              return Empty{};
+            });
+      });
   // Wait until ClientTransport's internal activities to finish.
-  event_engine_->TickUntilIdle();
-  event_engine_->UnsetGlobalHooks();
+  event_engine()->TickUntilIdle();
+  event_engine()->UnsetGlobalHooks();
 }
 
 TEST_F(ClientTransportTest, AddMultipleStreamWithReadFailed) {
+  MockPromiseEndpoint control_endpoint;
+  MockPromiseEndpoint data_endpoint;
   // Mock read failed at first stream, and second stream's write will fail too.
-  EXPECT_CALL(control_endpoint_, Read)
-      .InSequence(control_endpoint_sequence_)
+  EXPECT_CALL(*control_endpoint.endpoint, Read)
       .WillOnce(WithArgs<0>(
           [](absl::AnyInvocable<void(absl::Status)> on_read) mutable {
             on_read(absl::InternalError("control endpoint read failed."));
             // Return false to mock EventEngine read not finish.
             return false;
           }));
-  InitialClientTransport();
-  ClientMetadataHandle first_stream_md;
-  ClientMetadataHandle second_stream_md;
-  auto first_stream_args =
-      CallArgs{std::move(first_stream_md),
-               ClientInitialMetadataOutstandingToken::Empty(),
-               nullptr,
-               &pipe_server_intial_metadata_.sender,
-               &pipe_client_to_server_messages_.receiver,
-               &pipe_server_to_client_messages_.sender};
-  auto second_stream_args =
-      CallArgs{std::move(second_stream_md),
-               ClientInitialMetadataOutstandingToken::Empty(),
-               nullptr,
-               &pipe_server_intial_metadata_second_.sender,
-               &pipe_client_to_server_messages_second_.receiver,
-               &pipe_server_to_client_messages_second_.sender};
-  StrictMock<MockFunction<void(absl::Status)>> on_done;
-  EXPECT_CALL(on_done, Call(absl::OkStatus()));
-  auto activity = MakeActivity(
-      Seq(
-          // Concurrently: write and read messages from client transport.
-          Join(
-              // Add first stream with call_args into client transport.
-              AddStream(std::move(first_stream_args)),
-              // Send messages to first stream's
-              // call_args.client_to_server_messages pipe, which will be
-              // eventually sent to control/data endpoints.
-              SendClientToServerMessages(pipe_client_to_server_messages_, 1)),
-          // Once complete, verify successful sending and the received value.
-          [](const std::tuple<ServerMetadataHandle, absl::Status>& ret) {
-            EXPECT_EQ(std::get<0>(ret)->get(GrpcStatusMetadata()).value(),
-                      GRPC_STATUS_UNAVAILABLE);
-            EXPECT_TRUE(std::get<1>(ret).ok());
-            return absl::OkStatus();
-          },
-          Join(
-              // Add second stream with call_args into client transport.
-              AddStream(std::move(second_stream_args)),
-              // Send messages to second stream's
-              // call_args.client_to_server_messages pipe, which will be
-              // eventually sent to control/data endpoints.
-              SendClientToServerMessages(pipe_client_to_server_messages_second_,
-                                         1)),
-          // Once complete, verify successful sending and the received value.
-          [](const std::tuple<ServerMetadataHandle, absl::Status>& ret) {
-            EXPECT_EQ(std::get<0>(ret)->get(GrpcStatusMetadata()).value(),
-                      GRPC_STATUS_UNAVAILABLE);
-            EXPECT_TRUE(std::get<1>(ret).ok());
-            return absl::OkStatus();
-          }),
-      EventEngineWakeupScheduler(event_engine_),
-      [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
+  auto transport = MakeOrphanable<ChaoticGoodClientTransport>(
+      std::move(control_endpoint.promise_endpoint),
+      std::move(data_endpoint.promise_endpoint), event_engine());
+  auto call1 =
+      MakeCall(event_engine().get(), Arena::Create(8192, memory_allocator()));
+  transport->StartCall(std::move(call1.handler));
+  auto call2 =
+      MakeCall(event_engine().get(), Arena::Create(8192, memory_allocator()));
+  transport->StartCall(std::move(call2.handler));
+  call1.initiator.SpawnGuarded("test-send", [initiator =
+                                                 call1.initiator]() mutable {
+    return TrySeq(initiator.PushClientInitialMetadata(TestInitialMetadata()),
+                  SendClientToServerMessages(initiator, 1));
+  });
+  call2.initiator.SpawnGuarded("test-send", [initiator =
+                                                 call2.initiator]() mutable {
+    return TrySeq(initiator.PushClientInitialMetadata(TestInitialMetadata()),
+                  SendClientToServerMessages(initiator, 1));
+  });
+  StrictMock<MockFunction<void()>> on_done1;
+  EXPECT_CALL(on_done1, Call());
+  StrictMock<MockFunction<void()>> on_done2;
+  EXPECT_CALL(on_done2, Call());
+  call1.initiator.SpawnInfallible(
+      "test-read", [&on_done1, initiator = call1.initiator]() mutable {
+        return Seq(
+            initiator.PullServerInitialMetadata(),
+            [](ValueOrFailure<ServerMetadataHandle> md) {
+              EXPECT_FALSE(md.ok());
+              return Empty{};
+            },
+            initiator.PullServerTrailingMetadata(),
+            [&on_done1](ServerMetadataHandle md) {
+              EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
+                        GRPC_STATUS_UNAVAILABLE);
+              on_done1.Call();
+              return Empty{};
+            });
+      });
+  call2.initiator.SpawnInfallible(
+      "test-read", [&on_done2, initiator = call2.initiator]() mutable {
+        return Seq(
+            initiator.PullServerInitialMetadata(),
+            [](ValueOrFailure<ServerMetadataHandle> md) {
+              EXPECT_FALSE(md.ok());
+              return Empty{};
+            },
+            initiator.PullServerTrailingMetadata(),
+            [&on_done2](ServerMetadataHandle md) {
+              EXPECT_EQ(md->get(GrpcStatusMetadata()).value(),
+                        GRPC_STATUS_UNAVAILABLE);
+              on_done2.Call();
+              return Empty{};
+            });
+      });
   // Wait until ClientTransport's internal activities to finish.
-  event_engine_->TickUntilIdle();
-  event_engine_->UnsetGlobalHooks();
+  event_engine()->TickUntilIdle();
+  event_engine()->UnsetGlobalHooks();
 }
 
 }  // namespace testing
diff --git a/test/core/transport/chaotic_good/client_transport_test.cc b/test/core/transport/chaotic_good/client_transport_test.cc
index 86bbf578c29..551c6fd5762 100644
--- a/test/core/transport/chaotic_good/client_transport_test.cc
+++ b/test/core/transport/chaotic_good/client_transport_test.cc
@@ -14,461 +14,245 @@
 
 #include "src/core/ext/transport/chaotic_good/client_transport.h"
 
-// IWYU pragma: no_include <sys/socket.h>
-
-#include <algorithm>  // IWYU pragma: keep
+#include <algorithm>
+#include <cstdlib>
+#include <initializer_list>
 #include <memory>
-#include <string>  // IWYU pragma: keep
+#include <string>
 #include <tuple>
-#include <vector>  // IWYU pragma: keep
+#include <vector>
 
 #include "absl/functional/any_invocable.h"
-#include "absl/status/statusor.h"     // IWYU pragma: keep
-#include "absl/strings/str_format.h"  // IWYU pragma: keep
-#include "absl/types/optional.h"      // IWYU pragma: keep
+#include "absl/status/statusor.h"
+#include "absl/strings/str_format.h"
+#include "absl/types/optional.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/event_engine/memory_allocator.h>
-#include <grpc/event_engine/slice.h>  // IWYU pragma: keep
+#include <grpc/event_engine/slice.h>
 #include <grpc/event_engine/slice_buffer.h>
 #include <grpc/grpc.h>
-#include <grpc/status.h>  // IWYU pragma: keep
+#include <grpc/status.h>
 
-#include "src/core/lib/gprpp/ref_counted_ptr.h"
-#include "src/core/lib/iomgr/timer_manager.h"
-#include "src/core/lib/promise/activity.h"
-#include "src/core/lib/promise/event_engine_wakeup_scheduler.h"
 #include "src/core/lib/promise/if.h"
-#include "src/core/lib/promise/join.h"
 #include "src/core/lib/promise/loop.h"
-#include "src/core/lib/promise/map.h"
-#include "src/core/lib/promise/pipe.h"
 #include "src/core/lib/promise/seq.h"
 #include "src/core/lib/resource_quota/arena.h"
-#include "src/core/lib/resource_quota/memory_quota.h"
-#include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/lib/slice/slice_buffer.h"
-#include "src/core/lib/slice/slice_internal.h"      // IWYU pragma: keep
-#include "src/core/lib/transport/metadata_batch.h"  // IWYU pragma: keep
-#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
-#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h"
+#include "src/core/lib/transport/metadata_batch.h"
+#include "test/core/transport/chaotic_good/mock_promise_endpoint.h"
+#include "test/core/transport/chaotic_good/transport_test.h"
 
 using testing::MockFunction;
 using testing::Return;
-using testing::Sequence;
 using testing::StrictMock;
-using testing::WithArgs;
+
+using EventEngineSlice = grpc_event_engine::experimental::Slice;
 
 namespace grpc_core {
 namespace chaotic_good {
 namespace testing {
 
-class MockEndpoint
-    : public grpc_event_engine::experimental::EventEngine::Endpoint {
- public:
-  MOCK_METHOD(
-      bool, Read,
-      (absl::AnyInvocable<void(absl::Status)> on_read,
-       grpc_event_engine::experimental::SliceBuffer* buffer,
-       const grpc_event_engine::experimental::EventEngine::Endpoint::ReadArgs*
-           args),
-      (override));
+// Encoded string of header ":path: /demo.Service/Step".
+const uint8_t kPathDemoServiceStep[] = {
+    0x40, 0x05, 0x3a, 0x70, 0x61, 0x74, 0x68, 0x12, 0x2f,
+    0x64, 0x65, 0x6d, 0x6f, 0x2e, 0x53, 0x65, 0x72, 0x76,
+    0x69, 0x63, 0x65, 0x2f, 0x53, 0x74, 0x65, 0x70};
 
-  MOCK_METHOD(
-      bool, Write,
-      (absl::AnyInvocable<void(absl::Status)> on_writable,
-       grpc_event_engine::experimental::SliceBuffer* data,
-       const grpc_event_engine::experimental::EventEngine::Endpoint::WriteArgs*
-           args),
-      (override));
+// Encoded string of trailer "grpc-status: 0".
+const uint8_t kGrpcStatus0[] = {0x10, 0x0b, 0x67, 0x72, 0x70, 0x63, 0x2d, 0x73,
+                                0x74, 0x61, 0x74, 0x75, 0x73, 0x01, 0x30};
 
-  MOCK_METHOD(
-      const grpc_event_engine::experimental::EventEngine::ResolvedAddress&,
-      GetPeerAddress, (), (const, override));
-  MOCK_METHOD(
-      const grpc_event_engine::experimental::EventEngine::ResolvedAddress&,
-      GetLocalAddress, (), (const, override));
-};
+ClientMetadataHandle TestInitialMetadata() {
+  auto md =
+      GetContext<Arena>()->MakePooled<ClientMetadata>(GetContext<Arena>());
+  md->Set(HttpPathMetadata(), Slice::FromStaticString("/demo.Service/Step"));
+  return md;
+}
 
-class ClientTransportTest : public ::testing::Test {
- public:
-  ClientTransportTest()
-      : control_endpoint_ptr_(new StrictMock<MockEndpoint>()),
-        data_endpoint_ptr_(new StrictMock<MockEndpoint>()),
-        memory_allocator_(
-            ResourceQuota::Default()->memory_quota()->CreateMemoryAllocator(
-                "test")),
-        control_endpoint_(*control_endpoint_ptr_),
-        data_endpoint_(*data_endpoint_ptr_),
-        event_engine_(std::make_shared<
-                      grpc_event_engine::experimental::FuzzingEventEngine>(
-            []() {
-              grpc_timer_manager_set_threading(false);
-              grpc_event_engine::experimental::FuzzingEventEngine::Options
-                  options;
-              return options;
-            }(),
-            fuzzing_event_engine::Actions())),
-        arena_(MakeScopedArena(initial_arena_size, &memory_allocator_)),
-        pipe_client_to_server_messages_(arena_.get()),
-        pipe_server_to_client_messages_(arena_.get()),
-        pipe_server_intial_metadata_(arena_.get()),
-        pipe_client_to_server_messages_second_(arena_.get()),
-        pipe_server_to_client_messages_second_(arena_.get()),
-        pipe_server_intial_metadata_second_(arena_.get()) {}
-  // Expect how client transport will read from control/data endpoints with a
-  // test frame.
-  void AddReadExpectations(int num_of_streams) {
-    for (int i = 0; i < num_of_streams; i++) {
-      EXPECT_CALL(control_endpoint_, Read)
-          .InSequence(control_endpoint_sequence)
-          .WillOnce(WithArgs<0, 1>(
-              [this, i](absl::AnyInvocable<void(absl::Status)> on_read,
-                        grpc_event_engine::experimental::SliceBuffer*
-                            buffer) mutable {
-                // Construct test frame for EventEngine read: headers  (15
-                // bytes), message(16 bytes), message padding (48 byte),
-                // trailers (15 bytes).
-                const std::string frame_header = {
-                    static_cast<char>(0x80),  // frame type = fragment
-                    0x03,                     // flag = has header + has trailer
-                    0x00,
-                    0x00,
-                    static_cast<char>(i + 1),  // stream id = 1
-                    0x00,
-                    0x00,
-                    0x00,
-                    0x1a,  // header length = 26
-                    0x00,
-                    0x00,
-                    0x00,
-                    0x08,  // message length = 8
-                    0x00,
-                    0x00,
-                    0x00,
-                    0x38,  // message padding =56
-                    0x00,
-                    0x00,
-                    0x00,
-                    0x0f,  // trailer length = 15
-                    0x00,
-                    0x00,
-                    0x00};
-                // Schedule mock_endpoint to read buffer.
-                grpc_event_engine::experimental::Slice slice(
-                    grpc_slice_from_cpp_string(frame_header));
-                buffer->Append(std::move(slice));
-                // Execute read callback later to control when read starts.
-                if (i == 0) {
-                  read_callback_ = std::move(on_read);
-                  // Return false to mock EventEngine read not finish.
-                  return false;
-                } else {
-                  return true;
-                }
-              }));
-      EXPECT_CALL(control_endpoint_, Read)
-          .InSequence(control_endpoint_sequence)
-          .WillOnce(WithArgs<1>(
-              [](grpc_event_engine::experimental::SliceBuffer* buffer) {
-                // Encoded string of header ":path: /demo.Service/Step".
-                const std::string header = {
-                    0x10, 0x05, 0x3a, 0x70, 0x61, 0x74, 0x68, 0x12, 0x2f,
-                    0x64, 0x65, 0x6d, 0x6f, 0x2e, 0x53, 0x65, 0x72, 0x76,
-                    0x69, 0x63, 0x65, 0x2f, 0x53, 0x74, 0x65, 0x70};
-                // Encoded string of trailer "grpc-status: 0".
-                const std::string trailers = {0x10, 0x0b, 0x67, 0x72, 0x70,
-                                              0x63, 0x2d, 0x73, 0x74, 0x61,
-                                              0x74, 0x75, 0x73, 0x01, 0x30};
-                // Schedule mock_endpoint to read buffer.
-                grpc_event_engine::experimental::Slice slice(
-                    grpc_slice_from_cpp_string(header + trailers));
-                buffer->Append(std::move(slice));
-                return true;
-              }));
-    }
-    EXPECT_CALL(control_endpoint_, Read)
-        .InSequence(control_endpoint_sequence)
-        .WillOnce(Return(false));
-    for (int i = 0; i < num_of_streams; i++) {
-      EXPECT_CALL(data_endpoint_, Read)
-          .InSequence(data_endpoint_sequence)
-          .WillOnce(WithArgs<1>(
-              [this](grpc_event_engine::experimental::SliceBuffer* buffer) {
-                const std::string message_padding = {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-                grpc_event_engine::experimental::Slice slice(
-                    grpc_slice_from_cpp_string(message_padding + message_));
-                buffer->Append(std::move(slice));
-                return true;
-              }));
-    }
-  }
-  // Initial ClientTransport with read expecations
-  void InitialClientTransport(int num_of_streams) {
-    // Read expectaions need to be added before transport initialization since
-    // reader_ activity loop is started in ClientTransport initialization,
-    AddReadExpectations(num_of_streams);
-    client_transport_ = std::make_unique<ClientTransport>(
-        std::make_unique<PromiseEndpoint>(
-            std::unique_ptr<MockEndpoint>(control_endpoint_ptr_),
-            SliceBuffer()),
-        std::make_unique<PromiseEndpoint>(
-            std::unique_ptr<MockEndpoint>(data_endpoint_ptr_), SliceBuffer()),
-        event_engine_);
-  }
-  // Send messages from client to server.
-  auto SendClientToServerMessages(
-      Pipe<MessageHandle>& pipe_client_to_server_messages,
-      int num_of_messages) {
-    return Loop([&pipe_client_to_server_messages, num_of_messages,
-                 this]() mutable {
-      bool has_message = (num_of_messages > 0);
-      return If(
-          has_message,
-          Seq(pipe_client_to_server_messages.sender.Push(
-                  arena_->MakePooled<Message>()),
-              [&num_of_messages]() -> LoopCtl<absl::Status> {
-                num_of_messages--;
-                return Continue();
-              }),
-          [&pipe_client_to_server_messages]() mutable -> LoopCtl<absl::Status> {
-            pipe_client_to_server_messages.sender.Close();
-            return absl::OkStatus();
-          });
-    });
-  }
-  // Add stream into client transport, and expect return trailers of
-  // "grpc-status:code".
-  auto AddStream(CallArgs args, const grpc_status_code trailers) {
-    return Seq(client_transport_->AddStream(std::move(args)),
-               [trailers](ServerMetadataHandle ret) {
-                 // AddStream will finish with server trailers:
-                 // "grpc-status:code".
-                 EXPECT_EQ(ret->get(GrpcStatusMetadata()).value(), trailers);
-                 return trailers;
-               });
-  }
-  // Start read from control endpoints.
-  auto StartRead(const absl::Status& read_status) {
-    return [read_status, this] {
-      read_callback_(read_status);
-      return read_status;
-    };
-  }
-  // Receive messages from server to client.
-  auto ReceiveServerToClientMessages(
-      Pipe<ServerMetadataHandle>& pipe_server_intial_metadata,
-      Pipe<MessageHandle>& pipe_server_to_client_messages) {
-    return Seq(
-        // Receive server initial metadata.
-        Map(pipe_server_intial_metadata.receiver.Next(),
-            [](NextResult<ServerMetadataHandle> r) {
-              // Expect value: ":path: /demo.Service/Step"
-              EXPECT_TRUE(r.has_value());
-              EXPECT_EQ(
-                  r.value()->get_pointer(HttpPathMetadata())->as_string_view(),
-                  "/demo.Service/Step");
-              return absl::OkStatus();
-            }),
-        // Receive server to client messages.
-        Map(pipe_server_to_client_messages.receiver.Next(),
-            [this](NextResult<MessageHandle> r) {
-              EXPECT_TRUE(r.has_value());
-              EXPECT_EQ(r.value()->payload()->JoinIntoString(), message_);
-              return absl::OkStatus();
+// Send messages from client to server.
+auto SendClientToServerMessages(CallInitiator initiator, int num_messages) {
+  return Loop([initiator, num_messages, i = 0]() mutable {
+    bool has_message = (i < num_messages);
+    return If(
+        has_message,
+        Seq(initiator.PushMessage(GetContext<Arena>()->MakePooled<Message>(
+                SliceBuffer(Slice::FromCopiedString(std::to_string(i))), 0)),
+            [&i]() -> LoopCtl<absl::Status> {
+              ++i;
+              return Continue();
             }),
-        [&pipe_server_intial_metadata,
-         &pipe_server_to_client_messages]() mutable {
-          // Close pipes after receive message.
-          pipe_server_to_client_messages.sender.Close();
-          pipe_server_intial_metadata.sender.Close();
+        [initiator]() mutable -> LoopCtl<absl::Status> {
+          initiator.FinishSends();
           return absl::OkStatus();
         });
-  }
-
- private:
-  MockEndpoint* control_endpoint_ptr_;
-  MockEndpoint* data_endpoint_ptr_;
-  size_t initial_arena_size = 1024;
-  MemoryAllocator memory_allocator_;
-  Sequence control_endpoint_sequence;
-  Sequence data_endpoint_sequence;
-
- protected:
-  MockEndpoint& control_endpoint_;
-  MockEndpoint& data_endpoint_;
-  std::shared_ptr<grpc_event_engine::experimental::FuzzingEventEngine>
-      event_engine_;
-  std::unique_ptr<ClientTransport> client_transport_;
-  ScopedArenaPtr arena_;
-  Pipe<MessageHandle> pipe_client_to_server_messages_;
-  Pipe<MessageHandle> pipe_server_to_client_messages_;
-  Pipe<ServerMetadataHandle> pipe_server_intial_metadata_;
-  // Added for mutliple streams tests.
-  Pipe<MessageHandle> pipe_client_to_server_messages_second_;
-  Pipe<MessageHandle> pipe_server_to_client_messages_second_;
-  Pipe<ServerMetadataHandle> pipe_server_intial_metadata_second_;
-  absl::AnyInvocable<void(absl::Status)> read_callback_;
-  // Added to verify received message payload.
-  const std::string message_ = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08};
-};
-
-TEST_F(ClientTransportTest, AddOneStream) {
-  InitialClientTransport(1);
-  ClientMetadataHandle md;
-  auto args = CallArgs{std::move(md),
-                       ClientInitialMetadataOutstandingToken::Empty(),
-                       nullptr,
-                       &pipe_server_intial_metadata_.sender,
-                       &pipe_client_to_server_messages_.receiver,
-                       &pipe_server_to_client_messages_.sender};
-  StrictMock<MockFunction<void(absl::Status)>> on_done;
-  EXPECT_CALL(on_done, Call(absl::OkStatus()));
-  EXPECT_CALL(control_endpoint_, Write).WillOnce(Return(true));
-  EXPECT_CALL(data_endpoint_, Write).WillOnce(Return(true));
-  auto activity = MakeActivity(
-      Seq(
-          // Concurrently: write and read messages in client transport.
-          Join(
-              // Add first stream with call_args into client transport.
-              AddStream(std::move(args), GRPC_STATUS_OK),
-              // Start read from control endpoints.
-              StartRead(absl::OkStatus()),
-              // Send messages to call_args.client_to_server_messages pipe,
-              // which will be eventually sent to control/data endpoints.
-              SendClientToServerMessages(pipe_client_to_server_messages_, 1),
-              // Receive messages from control/data endpoints.
-              ReceiveServerToClientMessages(pipe_server_intial_metadata_,
-                                            pipe_server_to_client_messages_)),
-          // Once complete, verify successful sending and the received value.
-          [](const std::tuple<grpc_status_code, absl::Status, absl::Status,
-                              absl::Status>& ret) {
-            EXPECT_EQ(std::get<0>(ret), GRPC_STATUS_OK);
-            EXPECT_TRUE(std::get<1>(ret).ok());
-            EXPECT_TRUE(std::get<2>(ret).ok());
-            EXPECT_TRUE(std::get<3>(ret).ok());
-            return absl::OkStatus();
-          }),
-      EventEngineWakeupScheduler(event_engine_),
-      [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
-  // Wait until ClientTransport's internal activities to finish.
-  event_engine_->TickUntilIdle();
-  event_engine_->UnsetGlobalHooks();
+  });
 }
 
-TEST_F(ClientTransportTest, AddOneStreamMultipleMessages) {
-  InitialClientTransport(1);
-  ClientMetadataHandle md;
-  auto args = CallArgs{std::move(md),
-                       ClientInitialMetadataOutstandingToken::Empty(),
-                       nullptr,
-                       &pipe_server_intial_metadata_.sender,
-                       &pipe_client_to_server_messages_.receiver,
-                       &pipe_server_to_client_messages_.sender};
-  StrictMock<MockFunction<void(absl::Status)>> on_done;
-  EXPECT_CALL(on_done, Call(absl::OkStatus()));
-  EXPECT_CALL(control_endpoint_, Write).Times(3).WillRepeatedly(Return(true));
-  EXPECT_CALL(data_endpoint_, Write).Times(3).WillRepeatedly(Return(true));
-  auto activity = MakeActivity(
-      Seq(
-          // Concurrently: write and read messages in client transport.
-          Join(
-              // Add first stream with call_args into client transport.
-              AddStream(std::move(args), GRPC_STATUS_OK),
-              // Start read from control endpoints.
-              StartRead(absl::OkStatus()),
-              // Send messages to call_args.client_to_server_messages pipe,
-              // which will be eventually sent to control/data endpoints.
-              SendClientToServerMessages(pipe_client_to_server_messages_, 3),
-              // Receive messages from control/data endpoints.
-              ReceiveServerToClientMessages(pipe_server_intial_metadata_,
-                                            pipe_server_to_client_messages_)),
-          // Once complete, verify successful sending and the received value.
-          [](const std::tuple<grpc_status_code, absl::Status, absl::Status,
-                              absl::Status>& ret) {
-            EXPECT_EQ(std::get<0>(ret), GRPC_STATUS_OK);
-            EXPECT_TRUE(std::get<1>(ret).ok());
-            EXPECT_TRUE(std::get<2>(ret).ok());
-            EXPECT_TRUE(std::get<3>(ret).ok());
-            return absl::OkStatus();
-          }),
-      EventEngineWakeupScheduler(event_engine_),
-      [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
+TEST_F(TransportTest, AddOneStream) {
+  MockPromiseEndpoint control_endpoint;
+  MockPromiseEndpoint data_endpoint;
+  control_endpoint.ExpectRead(
+      {SerializedFrameHeader(FrameType::kFragment, 7, 1, 26, 8, 56, 15),
+       EventEngineSlice::FromCopiedBuffer(kPathDemoServiceStep,
+                                          sizeof(kPathDemoServiceStep)),
+       EventEngineSlice::FromCopiedBuffer(kGrpcStatus0, sizeof(kGrpcStatus0))},
+      event_engine().get());
+  data_endpoint.ExpectRead(
+      {EventEngineSlice::FromCopiedString("12345678"), Zeros(56)}, nullptr);
+  EXPECT_CALL(*control_endpoint.endpoint, Read)
+      .InSequence(control_endpoint.read_sequence)
+      .WillOnce(Return(false));
+  auto transport = MakeOrphanable<ChaoticGoodClientTransport>(
+      std::move(control_endpoint.promise_endpoint),
+      std::move(data_endpoint.promise_endpoint), event_engine());
+  auto call =
+      MakeCall(event_engine().get(), Arena::Create(1024, memory_allocator()));
+  transport->StartCall(std::move(call.handler));
+  StrictMock<MockFunction<void()>> on_done;
+  EXPECT_CALL(on_done, Call());
+  control_endpoint.ExpectWrite(
+      {SerializedFrameHeader(FrameType::kFragment, 1, 1,
+                             sizeof(kPathDemoServiceStep), 0, 0, 0),
+       EventEngineSlice::FromCopiedBuffer(kPathDemoServiceStep,
+                                          sizeof(kPathDemoServiceStep))},
+      nullptr);
+  control_endpoint.ExpectWrite(
+      {SerializedFrameHeader(FrameType::kFragment, 2, 1, 0, 1, 63, 0)},
+      nullptr);
+  data_endpoint.ExpectWrite(
+      {EventEngineSlice::FromCopiedString("0"), Zeros(63)}, nullptr);
+  control_endpoint.ExpectWrite(
+      {SerializedFrameHeader(FrameType::kFragment, 4, 1, 0, 0, 0, 0)}, nullptr);
+  call.initiator.SpawnGuarded("test-send", [initiator =
+                                                call.initiator]() mutable {
+    return TrySeq(initiator.PushClientInitialMetadata(TestInitialMetadata()),
+                  SendClientToServerMessages(initiator, 1));
+  });
+  call.initiator.SpawnInfallible(
+      "test-read", [&on_done, initiator = call.initiator]() mutable {
+        return Seq(
+            initiator.PullServerInitialMetadata(),
+            [](ValueOrFailure<ServerMetadataHandle> md) {
+              EXPECT_TRUE(md.ok());
+              EXPECT_EQ(
+                  md.value()->get_pointer(HttpPathMetadata())->as_string_view(),
+                  "/demo.Service/Step");
+              return Empty{};
+            },
+            initiator.PullMessage(),
+            [](NextResult<MessageHandle> msg) {
+              EXPECT_TRUE(msg.has_value());
+              EXPECT_EQ(msg.value()->payload()->JoinIntoString(), "12345678");
+              return Empty{};
+            },
+            initiator.PullMessage(),
+            [](NextResult<MessageHandle> msg) {
+              EXPECT_FALSE(msg.has_value());
+              return Empty{};
+            },
+            initiator.PullServerTrailingMetadata(),
+            [&on_done](ServerMetadataHandle md) {
+              EXPECT_EQ(md->get(GrpcStatusMetadata()).value(), GRPC_STATUS_OK);
+              on_done.Call();
+              return Empty{};
+            });
+      });
   // Wait until ClientTransport's internal activities to finish.
-  event_engine_->TickUntilIdle();
-  event_engine_->UnsetGlobalHooks();
+  event_engine()->TickUntilIdle();
+  event_engine()->UnsetGlobalHooks();
 }
 
-TEST_F(ClientTransportTest, AddMultipleStreamsMultipleMessages) {
-  InitialClientTransport(2);
-  ClientMetadataHandle first_stream_md;
-  ClientMetadataHandle second_stream_md;
-  auto first_stream_args =
-      CallArgs{std::move(first_stream_md),
-               ClientInitialMetadataOutstandingToken::Empty(),
-               nullptr,
-               &pipe_server_intial_metadata_.sender,
-               &pipe_client_to_server_messages_.receiver,
-               &pipe_server_to_client_messages_.sender};
-  auto second_stream_args =
-      CallArgs{std::move(second_stream_md),
-               ClientInitialMetadataOutstandingToken::Empty(),
-               nullptr,
-               &pipe_server_intial_metadata_second_.sender,
-               &pipe_client_to_server_messages_second_.receiver,
-               &pipe_server_to_client_messages_second_.sender};
-  StrictMock<MockFunction<void(absl::Status)>> on_done;
-  EXPECT_CALL(on_done, Call(absl::OkStatus()));
-  EXPECT_CALL(control_endpoint_, Write).Times(6).WillRepeatedly(Return(true));
-  EXPECT_CALL(data_endpoint_, Write).Times(6).WillRepeatedly(Return(true));
-  auto activity = MakeActivity(
-      Seq(
-          // Concurrently: write and read messages from client transport.
-          Join(
-              // Add first stream with call_args into client transport.
-              AddStream(std::move(first_stream_args), GRPC_STATUS_OK),
-              // Start read from control endpoints.
-              StartRead(absl::OkStatus()),
-              // Send messages to first stream's
-              // call_args.client_to_server_messages pipe, which will be
-              // eventually sent to control/data endpoints.
-              SendClientToServerMessages(pipe_client_to_server_messages_, 3),
-              // Receive first stream's messages from control/data endpoints.
-              ReceiveServerToClientMessages(pipe_server_intial_metadata_,
-                                            pipe_server_to_client_messages_)),
-          Join(
-              // Add second stream with call_args into client transport.
-              AddStream(std::move(second_stream_args), GRPC_STATUS_OK),
-              // Send messages to second stream's
-              // call_args.client_to_server_messages pipe, which will be
-              // eventually sent to control/data endpoints.
-              SendClientToServerMessages(pipe_client_to_server_messages_second_,
-                                         3),
-              // Receive second stream's messages from control/data endpoints.
-              ReceiveServerToClientMessages(
-                  pipe_server_intial_metadata_second_,
-                  pipe_server_to_client_messages_second_)),
-          // Once complete, verify successful sending and the received value.
-          [](const std::tuple<grpc_status_code, absl::Status, absl::Status>&
-                 ret) {
-            EXPECT_EQ(std::get<0>(ret), GRPC_STATUS_OK);
-            EXPECT_TRUE(std::get<1>(ret).ok());
-            EXPECT_TRUE(std::get<2>(ret).ok());
-            return absl::OkStatus();
-          }),
-      EventEngineWakeupScheduler(event_engine_),
-      [&on_done](absl::Status status) { on_done.Call(std::move(status)); });
+TEST_F(TransportTest, AddOneStreamMultipleMessages) {
+  MockPromiseEndpoint control_endpoint;
+  MockPromiseEndpoint data_endpoint;
+  control_endpoint.ExpectRead(
+      {SerializedFrameHeader(FrameType::kFragment, 3, 1, 26, 8, 56, 0),
+       EventEngineSlice::FromCopiedBuffer(kPathDemoServiceStep,
+                                          sizeof(kPathDemoServiceStep))},
+      event_engine().get());
+  control_endpoint.ExpectRead(
+      {SerializedFrameHeader(FrameType::kFragment, 6, 1, 0, 8, 56, 15),
+       EventEngineSlice::FromCopiedBuffer(kGrpcStatus0, sizeof(kGrpcStatus0))},
+      event_engine().get());
+  data_endpoint.ExpectRead(
+      {EventEngineSlice::FromCopiedString("12345678"), Zeros(56)}, nullptr);
+  data_endpoint.ExpectRead(
+      {EventEngineSlice::FromCopiedString("87654321"), Zeros(56)}, nullptr);
+  EXPECT_CALL(*control_endpoint.endpoint, Read)
+      .InSequence(control_endpoint.read_sequence)
+      .WillOnce(Return(false));
+  auto transport = MakeOrphanable<ChaoticGoodClientTransport>(
+      std::move(control_endpoint.promise_endpoint),
+      std::move(data_endpoint.promise_endpoint), event_engine());
+  auto call =
+      MakeCall(event_engine().get(), Arena::Create(8192, memory_allocator()));
+  transport->StartCall(std::move(call.handler));
+  StrictMock<MockFunction<void()>> on_done;
+  EXPECT_CALL(on_done, Call());
+  control_endpoint.ExpectWrite(
+      {SerializedFrameHeader(FrameType::kFragment, 1, 1,
+                             sizeof(kPathDemoServiceStep), 0, 0, 0),
+       EventEngineSlice::FromCopiedBuffer(kPathDemoServiceStep,
+                                          sizeof(kPathDemoServiceStep))},
+      nullptr);
+  control_endpoint.ExpectWrite(
+      {SerializedFrameHeader(FrameType::kFragment, 2, 1, 0, 1, 63, 0)},
+      nullptr);
+  data_endpoint.ExpectWrite(
+      {EventEngineSlice::FromCopiedString("0"), Zeros(63)}, nullptr);
+  control_endpoint.ExpectWrite(
+      {SerializedFrameHeader(FrameType::kFragment, 2, 1, 0, 1, 63, 0)},
+      nullptr);
+  data_endpoint.ExpectWrite(
+      {EventEngineSlice::FromCopiedString("1"), Zeros(63)}, nullptr);
+  control_endpoint.ExpectWrite(
+      {SerializedFrameHeader(FrameType::kFragment, 4, 1, 0, 0, 0, 0)}, nullptr);
+  call.initiator.SpawnGuarded("test-send", [initiator =
+                                                call.initiator]() mutable {
+    return TrySeq(initiator.PushClientInitialMetadata(TestInitialMetadata()),
+                  SendClientToServerMessages(initiator, 2));
+  });
+  call.initiator.SpawnInfallible(
+      "test-read", [&on_done, initiator = call.initiator]() mutable {
+        return Seq(
+            initiator.PullServerInitialMetadata(),
+            [](ValueOrFailure<ServerMetadataHandle> md) {
+              EXPECT_TRUE(md.ok());
+              EXPECT_EQ(
+                  md.value()->get_pointer(HttpPathMetadata())->as_string_view(),
+                  "/demo.Service/Step");
+              return Empty{};
+            },
+            initiator.PullMessage(),
+            [](NextResult<MessageHandle> msg) {
+              EXPECT_TRUE(msg.has_value());
+              EXPECT_EQ(msg.value()->payload()->JoinIntoString(), "12345678");
+              return Empty{};
+            },
+            initiator.PullMessage(),
+            [](NextResult<MessageHandle> msg) {
+              EXPECT_TRUE(msg.has_value());
+              EXPECT_EQ(msg.value()->payload()->JoinIntoString(), "87654321");
+              return Empty{};
+            },
+            initiator.PullMessage(),
+            [](NextResult<MessageHandle> msg) {
+              EXPECT_FALSE(msg.has_value());
+              return Empty{};
+            },
+            initiator.PullServerTrailingMetadata(),
+            [&on_done](ServerMetadataHandle md) {
+              EXPECT_EQ(md->get(GrpcStatusMetadata()).value(), GRPC_STATUS_OK);
+              on_done.Call();
+              return Empty{};
+            });
+      });
   // Wait until ClientTransport's internal activities to finish.
-  event_engine_->TickUntilIdle();
-  event_engine_->UnsetGlobalHooks();
+  event_engine()->TickUntilIdle();
+  event_engine()->UnsetGlobalHooks();
 }
 
 }  // namespace testing
diff --git a/test/core/transport/chaotic_good/frame_fuzzer.cc b/test/core/transport/chaotic_good/frame_fuzzer.cc
index 57180ce1c20..03481560771 100644
--- a/test/core/transport/chaotic_good/frame_fuzzer.cc
+++ b/test/core/transport/chaotic_good/frame_fuzzer.cc
@@ -35,7 +35,9 @@
 #include "src/core/lib/resource_quota/resource_quota.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_buffer.h"
+#include "src/libfuzzer/libfuzzer_macro.h"
 #include "test/core/promise/test_context.h"
+#include "test/core/transport/chaotic_good/frame_fuzzer.pb.h"
 
 bool squelch = false;
 
@@ -51,10 +53,10 @@ template <typename T>
 void AssertRoundTrips(const T& input, FrameType expected_frame_type) {
   HPackCompressor hpack_compressor;
   auto serialized = input.Serialize(&hpack_compressor);
-  GPR_ASSERT(serialized.Length() >=
+  GPR_ASSERT(serialized.control.Length() >=
              24);  // Initial output buffer size is 64 byte.
   uint8_t header_bytes[24];
-  serialized.MoveFirstNBytesIntoBuffer(24, header_bytes);
+  serialized.control.MoveFirstNBytesIntoBuffer(24, header_bytes);
   auto header = FrameHeader::Parse(header_bytes);
   if (!header.ok()) {
     if (!squelch) {
@@ -67,66 +69,69 @@ void AssertRoundTrips(const T& input, FrameType expected_frame_type) {
   T output;
   HPackParser hpack_parser;
   DeterministicBitGen bitgen;
-  auto deser = output.Deserialize(&hpack_parser, header.value(),
-                                  absl::BitGenRef(bitgen), serialized);
+  auto deser =
+      output.Deserialize(&hpack_parser, header.value(), absl::BitGenRef(bitgen),
+                         GetContext<Arena>(), std::move(serialized));
   GPR_ASSERT(deser.ok());
   GPR_ASSERT(output == input);
 }
 
 template <typename T>
-void FinishParseAndChecks(const FrameHeader& header, const uint8_t* data,
-                          size_t size) {
+void FinishParseAndChecks(const FrameHeader& header, BufferPair buffers) {
   T parsed;
   ExecCtx exec_ctx;  // Initialized to get this_cpu() info in global_stat().
   HPackParser hpack_parser;
-  SliceBuffer serialized;
-  serialized.Append(Slice::FromCopiedBuffer(data, size));
   DeterministicBitGen bitgen;
-  auto deser = parsed.Deserialize(&hpack_parser, header,
-                                  absl::BitGenRef(bitgen), serialized);
+  auto deser =
+      parsed.Deserialize(&hpack_parser, header, absl::BitGenRef(bitgen),
+                         GetContext<Arena>(), std::move(buffers));
   if (!deser.ok()) return;
   gpr_log(GPR_INFO, "Read frame: %s", parsed.ToString().c_str());
   AssertRoundTrips(parsed, header.type);
 }
 
-int Run(const uint8_t* data, size_t size) {
-  if (size < 1) return 0;
-  const bool is_server = (data[0] & 1) != 0;
-  size--;
-  data++;
-  if (size < 24) return 0;
-  auto r = FrameHeader::Parse(data);
-  if (!r.ok()) return 0;
+void Run(const frame_fuzzer::Test& test) {
+  const uint8_t* control_data =
+      reinterpret_cast<const uint8_t*>(test.control().data());
+  size_t control_size = test.control().size();
+  if (test.control().size() < 24) return;
+  auto r = FrameHeader::Parse(control_data);
+  if (!r.ok()) return;
+  if (test.data().size() != r->message_length) return;
   gpr_log(GPR_INFO, "Read frame header: %s", r->ToString().c_str());
-  size -= 24;
-  data += 24;
+  control_data += 24;
+  control_size -= 24;
   MemoryAllocator memory_allocator = MemoryAllocator(
       ResourceQuota::Default()->memory_quota()->CreateMemoryAllocator("test"));
   auto arena = MakeScopedArena(1024, &memory_allocator);
   TestContext<Arena> ctx(arena.get());
+  BufferPair buffers{
+      SliceBuffer(Slice::FromCopiedBuffer(control_data, control_size)),
+      SliceBuffer(
+          Slice::FromCopiedBuffer(test.data().data(), test.data().size())),
+  };
   switch (r->type) {
     default:
-      return 0;  // We don't know how to parse this frame type.
+      return;  // We don't know how to parse this frame type.
     case FrameType::kSettings:
-      FinishParseAndChecks<SettingsFrame>(*r, data, size);
+      FinishParseAndChecks<SettingsFrame>(*r, std::move(buffers));
       break;
     case FrameType::kFragment:
-      if (is_server) {
-        FinishParseAndChecks<ServerFragmentFrame>(*r, data, size);
+      if (test.is_server()) {
+        FinishParseAndChecks<ServerFragmentFrame>(*r, std::move(buffers));
       } else {
-        FinishParseAndChecks<ClientFragmentFrame>(*r, data, size);
+        FinishParseAndChecks<ClientFragmentFrame>(*r, std::move(buffers));
       }
       break;
     case FrameType::kCancel:
-      FinishParseAndChecks<CancelFrame>(*r, data, size);
+      FinishParseAndChecks<CancelFrame>(*r, std::move(buffers));
       break;
   }
-  return 0;
 }
 
 }  // namespace chaotic_good
 }  // namespace grpc_core
 
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
-  return grpc_core::chaotic_good::Run(data, size);
+DEFINE_PROTO_FUZZER(const frame_fuzzer::Test& test) {
+  grpc_core::chaotic_good::Run(test);
 }
diff --git a/test/core/transport/chaotic_good/frame_fuzzer.proto b/test/core/transport/chaotic_good/frame_fuzzer.proto
new file mode 100644
index 00000000000..4ae8657e588
--- /dev/null
+++ b/test/core/transport/chaotic_good/frame_fuzzer.proto
@@ -0,0 +1,23 @@
+// Copyright 2021 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package frame_fuzzer;
+
+message Test {
+    bool is_server = 1;
+    bytes control = 2;
+    bytes data = 3;
+}
diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/5072496117219328 b/test/core/transport/chaotic_good/frame_fuzzer_corpus/5072496117219328
deleted file mode 100644
index 16d6e2f4fde..00000000000
Binary files a/test/core/transport/chaotic_good/frame_fuzzer_corpus/5072496117219328 and /dev/null differ
diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/5691448031772672 b/test/core/transport/chaotic_good/frame_fuzzer_corpus/5691448031772672
deleted file mode 100644
index 98e8a28385d..00000000000
Binary files a/test/core/transport/chaotic_good/frame_fuzzer_corpus/5691448031772672 and /dev/null differ
diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-05c704327d21af2cc914de40e9d90d06f16ca0eb b/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-05c704327d21af2cc914de40e9d90d06f16ca0eb
deleted file mode 100644
index 0340f7dee01..00000000000
Binary files a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-05c704327d21af2cc914de40e9d90d06f16ca0eb and /dev/null differ
diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-5015de8c7cafb0b0ebbbfd28c29aedd5dbfdc03a b/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-5015de8c7cafb0b0ebbbfd28c29aedd5dbfdc03a
deleted file mode 100644
index 366c5302596..00000000000
Binary files a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-5015de8c7cafb0b0ebbbfd28c29aedd5dbfdc03a and /dev/null differ
diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-5a34978de8de6889ce913947a77f43f7cdea854c b/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-5a34978de8de6889ce913947a77f43f7cdea854c
deleted file mode 100644
index 74cb18c8e93..00000000000
Binary files a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-5a34978de8de6889ce913947a77f43f7cdea854c and /dev/null differ
diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-608f798a51077a8cdc45b11f335c079a81339fbe b/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-608f798a51077a8cdc45b11f335c079a81339fbe
deleted file mode 100644
index 2190f6bc185..00000000000
Binary files a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-608f798a51077a8cdc45b11f335c079a81339fbe and /dev/null differ
diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-6a002cb46eac21af4ab6fd74b61ff3ce26d96dff b/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-6a002cb46eac21af4ab6fd74b61ff3ce26d96dff
deleted file mode 100644
index 90739c72580..00000000000
Binary files a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-6a002cb46eac21af4ab6fd74b61ff3ce26d96dff and /dev/null differ
diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-7732ddd35a4deb8b7c9e462aaf8680986755e540 b/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-7732ddd35a4deb8b7c9e462aaf8680986755e540
deleted file mode 100644
index 4d14b159ba6..00000000000
Binary files a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-7732ddd35a4deb8b7c9e462aaf8680986755e540 and /dev/null differ
diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-c171e98ebfe8b6485f9a4bea0b9cdfe683776675 b/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-c171e98ebfe8b6485f9a4bea0b9cdfe683776675
deleted file mode 100644
index 8fa12bd3aea..00000000000
Binary files a/test/core/transport/chaotic_good/frame_fuzzer_corpus/crash-c171e98ebfe8b6485f9a4bea0b9cdfe683776675 and /dev/null differ
diff --git a/test/core/transport/chaotic_good/frame_fuzzer_corpus/empty b/test/core/transport/chaotic_good/frame_fuzzer_corpus/empty
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/test/core/transport/chaotic_good/frame_fuzzer_corpus/empty
@@ -0,0 +1 @@
+
diff --git a/test/core/transport/chaotic_good/frame_header_test.cc b/test/core/transport/chaotic_good/frame_header_test.cc
index a382315fa14..929a74b1df2 100644
--- a/test/core/transport/chaotic_good/frame_header_test.cc
+++ b/test/core/transport/chaotic_good/frame_header_test.cc
@@ -36,7 +36,7 @@ absl::StatusOr<FrameHeader> Deserialize(std::vector<uint8_t> data) {
 }
 
 TEST(FrameHeaderTest, SimpleSerialize) {
-  EXPECT_EQ(Serialize(FrameHeader{FrameType::kCancel, BitSet<2>::FromInt(0),
+  EXPECT_EQ(Serialize(FrameHeader{FrameType::kCancel, BitSet<3>::FromInt(0),
                                   0x01020304, 0x05060708, 0x090a0b0c,
                                   0x00000034, 0x0d0e0f10}),
             std::vector<uint8_t>({
@@ -59,7 +59,7 @@ TEST(FrameHeaderTest, SimpleDeserialize) {
                 0x10, 0x0f, 0x0e, 0x0d   // trailer_length
             })),
             absl::StatusOr<FrameHeader>(FrameHeader{
-                FrameType::kCancel, BitSet<2>::FromInt(0), 0x01020304,
+                FrameType::kCancel, BitSet<3>::FromInt(0), 0x01020304,
                 0x05060708, 0x090a0b0c, 0x00000034, 0x0d0e0f10}));
   EXPECT_EQ(Deserialize(std::vector<uint8_t>({
                             0x81, 88,   88,   88,    // type, flags
@@ -75,19 +75,19 @@ TEST(FrameHeaderTest, SimpleDeserialize) {
 
 TEST(FrameHeaderTest, GetFrameLength) {
   EXPECT_EQ(
-      (FrameHeader{FrameType::kFragment, BitSet<2>::FromInt(3), 1, 0, 0, 0, 0})
+      (FrameHeader{FrameType::kFragment, BitSet<3>::FromInt(5), 1, 0, 0, 0, 0})
           .GetFrameLength(),
       0);
   EXPECT_EQ(
-      (FrameHeader{FrameType::kFragment, BitSet<2>::FromInt(3), 1, 14, 0, 0, 0})
+      (FrameHeader{FrameType::kFragment, BitSet<3>::FromInt(5), 1, 14, 0, 0, 0})
           .GetFrameLength(),
       14);
-  EXPECT_EQ((FrameHeader{FrameType::kFragment, BitSet<2>::FromInt(3), 1, 0, 14,
+  EXPECT_EQ((FrameHeader{FrameType::kFragment, BitSet<3>::FromInt(5), 1, 0, 14,
                          50, 0})
                 .GetFrameLength(),
             0);
   EXPECT_EQ(
-      (FrameHeader{FrameType::kFragment, BitSet<2>::FromInt(3), 1, 0, 0, 0, 14})
+      (FrameHeader{FrameType::kFragment, BitSet<3>::FromInt(5), 1, 0, 0, 0, 14})
           .GetFrameLength(),
       14);
 }
diff --git a/test/core/transport/chaotic_good/frame_test.cc b/test/core/transport/chaotic_good/frame_test.cc
index 00908f75a6e..15153a09b8d 100644
--- a/test/core/transport/chaotic_good/frame_test.cc
+++ b/test/core/transport/chaotic_good/frame_test.cc
@@ -21,27 +21,38 @@
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
 
+#include "src/core/lib/resource_quota/memory_quota.h"
+#include "src/core/lib/resource_quota/resource_quota.h"
+
 namespace grpc_core {
 namespace chaotic_good {
 namespace {
 
 template <typename T>
-void AssertRoundTrips(const T input, FrameType expected_frame_type) {
+void AssertRoundTrips(const T& input, FrameType expected_frame_type) {
   HPackCompressor hpack_compressor;
-  absl::BitGen bitgen;
   auto serialized = input.Serialize(&hpack_compressor);
-  EXPECT_GE(serialized.Length(), 24);
+  GPR_ASSERT(serialized.control.Length() >=
+             24);  // Initial output buffer size is 64 byte.
   uint8_t header_bytes[24];
-  serialized.MoveFirstNBytesIntoBuffer(24, header_bytes);
+  serialized.control.MoveFirstNBytesIntoBuffer(24, header_bytes);
   auto header = FrameHeader::Parse(header_bytes);
-  EXPECT_TRUE(header.ok()) << header.status();
-  EXPECT_EQ(header->type, expected_frame_type);
+  if (!header.ok()) {
+    Crash("Failed to parse header");
+  }
+  GPR_ASSERT(header->type == expected_frame_type);
   T output;
   HPackParser hpack_parser;
-  auto deser = output.Deserialize(&hpack_parser, header.value(),
-                                  absl::BitGenRef(bitgen), serialized);
-  EXPECT_TRUE(deser.ok()) << deser;
-  EXPECT_EQ(output, input);
+  absl::BitGen bitgen;
+  MemoryAllocator allocator = MakeResourceQuota("test-quota")
+                                  ->memory_quota()
+                                  ->CreateMemoryAllocator("test-allocator");
+  ScopedArenaPtr arena = MakeScopedArena(1024, &allocator);
+  auto deser =
+      output.Deserialize(&hpack_parser, header.value(), absl::BitGenRef(bitgen),
+                         arena.get(), std::move(serialized));
+  GPR_ASSERT(deser.ok());
+  GPR_ASSERT(output == input);
 }
 
 TEST(FrameTest, SettingsFrameRoundTrips) {
diff --git a/test/core/transport/chaotic_good/mock_promise_endpoint.cc b/test/core/transport/chaotic_good/mock_promise_endpoint.cc
new file mode 100644
index 00000000000..9ba96e75804
--- /dev/null
+++ b/test/core/transport/chaotic_good/mock_promise_endpoint.cc
@@ -0,0 +1,89 @@
+// Copyright 2023 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "test/core/transport/chaotic_good/mock_promise_endpoint.h"
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#include <grpc/event_engine/event_engine.h>
+
+using EventEngineSlice = grpc_event_engine::experimental::Slice;
+using grpc_event_engine::experimental::EventEngine;
+
+using testing::WithArgs;
+
+namespace grpc_core {
+namespace chaotic_good {
+namespace testing {
+
+void MockPromiseEndpoint::ExpectRead(
+    std::initializer_list<EventEngineSlice> slices_init,
+    EventEngine* schedule_on_event_engine) {
+  std::vector<EventEngineSlice> slices;
+  for (auto&& slice : slices_init) slices.emplace_back(slice.Copy());
+  EXPECT_CALL(*endpoint, Read)
+      .InSequence(read_sequence)
+      .WillOnce(WithArgs<0, 1>(
+          [slices = std::move(slices), schedule_on_event_engine](
+              absl::AnyInvocable<void(absl::Status)> on_read,
+              grpc_event_engine::experimental::SliceBuffer* buffer) mutable {
+            for (auto& slice : slices) {
+              buffer->Append(std::move(slice));
+            }
+            if (schedule_on_event_engine != nullptr) {
+              schedule_on_event_engine->Run(
+                  [on_read = std::move(on_read)]() mutable {
+                    on_read(absl::OkStatus());
+                  });
+              return false;
+            } else {
+              return true;
+            }
+          }));
+}
+
+void MockPromiseEndpoint::ExpectWrite(
+    std::initializer_list<EventEngineSlice> slices,
+    EventEngine* schedule_on_event_engine) {
+  SliceBuffer expect;
+  for (auto&& slice : slices) {
+    expect.Append(grpc_event_engine::experimental::internal::SliceCast<Slice>(
+        slice.Copy()));
+  }
+  EXPECT_CALL(*endpoint, Write)
+      .InSequence(write_sequence)
+      .WillOnce(WithArgs<0, 1>(
+          [expect = expect.JoinIntoString(), schedule_on_event_engine](
+              absl::AnyInvocable<void(absl::Status)> on_writable,
+              grpc_event_engine::experimental::SliceBuffer* buffer) mutable {
+            SliceBuffer tmp;
+            grpc_slice_buffer_swap(buffer->c_slice_buffer(),
+                                   tmp.c_slice_buffer());
+            EXPECT_EQ(tmp.JoinIntoString(), expect);
+            if (schedule_on_event_engine != nullptr) {
+              schedule_on_event_engine->Run(
+                  [on_writable = std::move(on_writable)]() mutable {
+                    on_writable(absl::OkStatus());
+                  });
+              return false;
+            } else {
+              return true;
+            }
+          }));
+}
+
+}  // namespace testing
+}  // namespace chaotic_good
+}  // namespace grpc_core
diff --git a/test/core/transport/chaotic_good/mock_promise_endpoint.h b/test/core/transport/chaotic_good/mock_promise_endpoint.h
new file mode 100644
index 00000000000..c1534efb605
--- /dev/null
+++ b/test/core/transport/chaotic_good/mock_promise_endpoint.h
@@ -0,0 +1,77 @@
+// Copyright 2023 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_MOCK_PROMISE_ENDPOINT_H
+#define GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_MOCK_PROMISE_ENDPOINT_H
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#include <grpc/event_engine/event_engine.h>
+
+#include "src/core/lib/transport/promise_endpoint.h"
+
+namespace grpc_core {
+namespace chaotic_good {
+namespace testing {
+
+class MockEndpoint
+    : public grpc_event_engine::experimental::EventEngine::Endpoint {
+ public:
+  MOCK_METHOD(
+      bool, Read,
+      (absl::AnyInvocable<void(absl::Status)> on_read,
+       grpc_event_engine::experimental::SliceBuffer* buffer,
+       const grpc_event_engine::experimental::EventEngine::Endpoint::ReadArgs*
+           args),
+      (override));
+
+  MOCK_METHOD(
+      bool, Write,
+      (absl::AnyInvocable<void(absl::Status)> on_writable,
+       grpc_event_engine::experimental::SliceBuffer* data,
+       const grpc_event_engine::experimental::EventEngine::Endpoint::WriteArgs*
+           args),
+      (override));
+
+  MOCK_METHOD(
+      const grpc_event_engine::experimental::EventEngine::ResolvedAddress&,
+      GetPeerAddress, (), (const, override));
+  MOCK_METHOD(
+      const grpc_event_engine::experimental::EventEngine::ResolvedAddress&,
+      GetLocalAddress, (), (const, override));
+};
+
+struct MockPromiseEndpoint {
+  ::testing::StrictMock<MockEndpoint>* endpoint =
+      new ::testing::StrictMock<MockEndpoint>();
+  std::unique_ptr<PromiseEndpoint> promise_endpoint =
+      std::make_unique<PromiseEndpoint>(
+          std::unique_ptr<::testing::StrictMock<MockEndpoint>>(endpoint),
+          SliceBuffer());
+  ::testing::Sequence read_sequence;
+  ::testing::Sequence write_sequence;
+  void ExpectRead(
+      std::initializer_list<grpc_event_engine::experimental::Slice> slices_init,
+      grpc_event_engine::experimental::EventEngine* schedule_on_event_engine);
+  void ExpectWrite(
+      std::initializer_list<grpc_event_engine::experimental::Slice> slices,
+      grpc_event_engine::experimental::EventEngine* schedule_on_event_engine);
+};
+
+}  // namespace testing
+}  // namespace chaotic_good
+}  // namespace grpc_core
+
+#endif  // GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_MOCK_PROMISE_ENDPOINT_H
diff --git a/test/core/transport/chaotic_good/server_transport_test.cc b/test/core/transport/chaotic_good/server_transport_test.cc
new file mode 100644
index 00000000000..05a32a21817
--- /dev/null
+++ b/test/core/transport/chaotic_good/server_transport_test.cc
@@ -0,0 +1,198 @@
+// Copyright 2023 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "src/core/ext/transport/chaotic_good/server_transport.h"
+
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "absl/functional/any_invocable.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_format.h"
+#include "absl/types/optional.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#include <grpc/event_engine/event_engine.h>
+#include <grpc/event_engine/memory_allocator.h>
+#include <grpc/event_engine/slice.h>
+#include <grpc/event_engine/slice_buffer.h>
+#include <grpc/grpc.h>
+#include <grpc/status.h>
+
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/iomgr/timer_manager.h"
+#include "src/core/lib/promise/seq.h"
+#include "src/core/lib/resource_quota/arena.h"
+#include "src/core/lib/resource_quota/memory_quota.h"
+#include "src/core/lib/resource_quota/resource_quota.h"
+#include "src/core/lib/slice/slice_buffer.h"
+#include "src/core/lib/slice/slice_internal.h"
+#include "src/core/lib/transport/metadata_batch.h"
+#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
+#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h"
+#include "test/core/transport/chaotic_good/mock_promise_endpoint.h"
+#include "test/core/transport/chaotic_good/transport_test.h"
+
+using testing::_;
+using testing::MockFunction;
+using testing::Return;
+using testing::StrictMock;
+using testing::WithArgs;
+
+using EventEngineSlice = grpc_event_engine::experimental::Slice;
+
+namespace grpc_core {
+namespace chaotic_good {
+namespace testing {
+
+// Encoded string of header ":path: /demo.Service/Step".
+const uint8_t kPathDemoServiceStep[] = {
+    0x40, 0x05, 0x3a, 0x70, 0x61, 0x74, 0x68, 0x12, 0x2f,
+    0x64, 0x65, 0x6d, 0x6f, 0x2e, 0x53, 0x65, 0x72, 0x76,
+    0x69, 0x63, 0x65, 0x2f, 0x53, 0x74, 0x65, 0x70};
+
+// Encoded string of trailer "grpc-status: 0".
+const uint8_t kGrpcStatus0[] = {0x40, 0x0b, 0x67, 0x72, 0x70, 0x63, 0x2d, 0x73,
+                                0x74, 0x61, 0x74, 0x75, 0x73, 0x01, 0x30};
+
+ServerMetadataHandle TestInitialMetadata() {
+  auto md =
+      GetContext<Arena>()->MakePooled<ServerMetadata>(GetContext<Arena>());
+  md->Set(HttpPathMetadata(), Slice::FromStaticString("/demo.Service/Step"));
+  return md;
+}
+
+ServerMetadataHandle TestTrailingMetadata() {
+  auto md =
+      GetContext<Arena>()->MakePooled<ServerMetadata>(GetContext<Arena>());
+  md->Set(GrpcStatusMetadata(), GRPC_STATUS_OK);
+  return md;
+}
+
+class MockAcceptor : public ServerTransport::Acceptor {
+ public:
+  virtual ~MockAcceptor() = default;
+  MOCK_METHOD(Arena*, CreateArena, (), (override));
+  MOCK_METHOD(absl::StatusOr<CallInitiator>, CreateCall,
+              (ClientMetadata & client_initial_metadata, Arena* arena),
+              (override));
+};
+
+TEST_F(TransportTest, ReadAndWriteOneMessage) {
+  MockPromiseEndpoint control_endpoint;
+  MockPromiseEndpoint data_endpoint;
+  StrictMock<MockAcceptor> acceptor;
+  auto transport = MakeOrphanable<ChaoticGoodServerTransport>(
+      CoreConfiguration::Get()
+          .channel_args_preconditioning()
+          .PreconditionChannelArgs(nullptr),
+      std::move(control_endpoint.promise_endpoint),
+      std::move(data_endpoint.promise_endpoint), event_engine());
+  // Once we set the acceptor, expect to read some frames.
+  // We'll return a new request with a payload of "12345678".
+  control_endpoint.ExpectRead(
+      {SerializedFrameHeader(FrameType::kFragment, 7, 1, 26, 8, 56, 0),
+       EventEngineSlice::FromCopiedBuffer(kPathDemoServiceStep,
+                                          sizeof(kPathDemoServiceStep))},
+      event_engine().get());
+  data_endpoint.ExpectRead(
+      {EventEngineSlice::FromCopiedString("12345678"), Zeros(56)}, nullptr);
+  // Once that's read we'll create a new call
+  auto* call_arena = Arena::Create(1024, memory_allocator());
+  CallInitiatorAndHandler call = MakeCall(event_engine().get(), call_arena);
+  EXPECT_CALL(acceptor, CreateArena).WillOnce(Return(call_arena));
+  EXPECT_CALL(acceptor, CreateCall(_, call_arena))
+      .WillOnce(WithArgs<0>([call_initiator = std::move(call.initiator)](
+                                ClientMetadata& client_initial_metadata) {
+        EXPECT_EQ(client_initial_metadata.get_pointer(HttpPathMetadata())
+                      ->as_string_view(),
+                  "/demo.Service/Step");
+        return call_initiator;
+      }));
+  transport->SetAcceptor(&acceptor);
+  StrictMock<MockFunction<void()>> on_done;
+  EXPECT_CALL(on_done, Call());
+  EXPECT_CALL(*control_endpoint.endpoint, Read)
+      .InSequence(control_endpoint.read_sequence)
+      .WillOnce(Return(false));
+  control_endpoint.ExpectWrite(
+      {SerializedFrameHeader(FrameType::kFragment, 1, 1,
+                             sizeof(kPathDemoServiceStep), 0, 0, 0),
+       EventEngineSlice::FromCopiedBuffer(kPathDemoServiceStep,
+                                          sizeof(kPathDemoServiceStep))},
+      nullptr);
+  control_endpoint.ExpectWrite(
+      {SerializedFrameHeader(FrameType::kFragment, 2, 1, 0, 8, 56, 0)},
+      nullptr);
+  data_endpoint.ExpectWrite(
+      {EventEngineSlice::FromCopiedString("87654321"), Zeros(56)}, nullptr);
+  control_endpoint.ExpectWrite(
+      {SerializedFrameHeader(FrameType::kFragment, 4, 1, 0, 0, 0,
+                             sizeof(kGrpcStatus0)),
+       EventEngineSlice::FromCopiedBuffer(kGrpcStatus0, sizeof(kGrpcStatus0))},
+      nullptr);
+  call.handler.SpawnInfallible(
+      "test-io", [&on_done, handler = call.handler]() mutable {
+        return Seq(
+            handler.PullClientInitialMetadata(),
+            [](ValueOrFailure<ServerMetadataHandle> md) {
+              EXPECT_TRUE(md.ok());
+              EXPECT_EQ(
+                  md.value()->get_pointer(HttpPathMetadata())->as_string_view(),
+                  "/demo.Service/Step");
+              return Empty{};
+            },
+            handler.PullMessage(),
+            [](NextResult<MessageHandle> msg) {
+              EXPECT_TRUE(msg.has_value());
+              EXPECT_EQ(msg.value()->payload()->JoinIntoString(), "12345678");
+              return Empty{};
+            },
+            handler.PullMessage(),
+            [](NextResult<MessageHandle> msg) {
+              EXPECT_FALSE(msg.has_value());
+              return Empty{};
+            },
+            handler.PushServerInitialMetadata(TestInitialMetadata()),
+            handler.PushMessage(Arena::MakePooled<Message>(
+                SliceBuffer(Slice::FromCopiedString("87654321")), 0)),
+            [handler]() mutable {
+              return handler.PushServerTrailingMetadata(TestTrailingMetadata());
+            },
+            [&on_done]() mutable {
+              on_done.Call();
+              return Empty{};
+            });
+      });
+  // Wait until ClientTransport's internal activities to finish.
+  event_engine()->TickUntilIdle();
+  event_engine()->UnsetGlobalHooks();
+}
+
+}  // namespace testing
+}  // namespace chaotic_good
+}  // namespace grpc_core
+
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  // Must call to create default EventEngine.
+  grpc_init();
+  int ret = RUN_ALL_TESTS();
+  grpc_shutdown();
+  return ret;
+}
diff --git a/test/core/transport/chaotic_good/transport_test.cc b/test/core/transport/chaotic_good/transport_test.cc
new file mode 100644
index 00000000000..b43098fa7c7
--- /dev/null
+++ b/test/core/transport/chaotic_good/transport_test.cc
@@ -0,0 +1,60 @@
+// Copyright 2023 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "test/core/transport/chaotic_good/transport_test.h"
+
+namespace grpc_core {
+namespace chaotic_good {
+namespace testing {
+
+grpc_event_engine::experimental::Slice SerializedFrameHeader(
+    FrameType type, uint8_t flags, uint32_t stream_id, uint32_t header_length,
+    uint32_t message_length, uint32_t message_padding,
+    uint32_t trailer_length) {
+  uint8_t buffer[24] = {static_cast<uint8_t>(type),
+                        flags,
+                        0,
+                        0,
+                        static_cast<uint8_t>(stream_id),
+                        static_cast<uint8_t>(stream_id >> 8),
+                        static_cast<uint8_t>(stream_id >> 16),
+                        static_cast<uint8_t>(stream_id >> 24),
+                        static_cast<uint8_t>(header_length),
+                        static_cast<uint8_t>(header_length >> 8),
+                        static_cast<uint8_t>(header_length >> 16),
+                        static_cast<uint8_t>(header_length >> 24),
+                        static_cast<uint8_t>(message_length),
+                        static_cast<uint8_t>(message_length >> 8),
+                        static_cast<uint8_t>(message_length >> 16),
+                        static_cast<uint8_t>(message_length >> 24),
+                        static_cast<uint8_t>(message_padding),
+                        static_cast<uint8_t>(message_padding >> 8),
+                        static_cast<uint8_t>(message_padding >> 16),
+                        static_cast<uint8_t>(message_padding >> 24),
+                        static_cast<uint8_t>(trailer_length),
+                        static_cast<uint8_t>(trailer_length >> 8),
+                        static_cast<uint8_t>(trailer_length >> 16),
+                        static_cast<uint8_t>(trailer_length >> 24)};
+  return grpc_event_engine::experimental::Slice::FromCopiedBuffer(buffer, 24);
+}
+
+grpc_event_engine::experimental::Slice Zeros(uint32_t length) {
+  std::string zeros(length, 0);
+  return grpc_event_engine::experimental::Slice::FromCopiedBuffer(zeros.data(),
+                                                                  length);
+}
+
+}  // namespace testing
+}  // namespace chaotic_good
+}  // namespace grpc_core
diff --git a/test/core/transport/chaotic_good/transport_test.h b/test/core/transport/chaotic_good/transport_test.h
new file mode 100644
index 00000000000..e70158bb8cf
--- /dev/null
+++ b/test/core/transport/chaotic_good/transport_test.h
@@ -0,0 +1,67 @@
+// Copyright 2023 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_TRANSPORT_TEST_H
+#define GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_TRANSPORT_TEST_H
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#include "src/core/ext/transport/chaotic_good/frame.h"
+#include "src/core/lib/iomgr/timer_manager.h"
+#include "src/core/lib/resource_quota/memory_quota.h"
+#include "src/core/lib/resource_quota/resource_quota.h"
+#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h"
+#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h"
+
+namespace grpc_core {
+namespace chaotic_good {
+namespace testing {
+
+class TransportTest : public ::testing::Test {
+ protected:
+  const std::shared_ptr<grpc_event_engine::experimental::FuzzingEventEngine>&
+  event_engine() {
+    return event_engine_;
+  }
+
+  MemoryAllocator* memory_allocator() { return &allocator_; }
+
+ private:
+  std::shared_ptr<grpc_event_engine::experimental::FuzzingEventEngine>
+      event_engine_{
+          std::make_shared<grpc_event_engine::experimental::FuzzingEventEngine>(
+              []() {
+                grpc_timer_manager_set_threading(false);
+                grpc_event_engine::experimental::FuzzingEventEngine::Options
+                    options;
+                return options;
+              }(),
+              fuzzing_event_engine::Actions())};
+  MemoryAllocator allocator_ = MakeResourceQuota("test-quota")
+                                   ->memory_quota()
+                                   ->CreateMemoryAllocator("test-allocator");
+};
+
+grpc_event_engine::experimental::Slice SerializedFrameHeader(
+    FrameType type, uint8_t flags, uint32_t stream_id, uint32_t header_length,
+    uint32_t message_length, uint32_t message_padding, uint32_t trailer_length);
+
+grpc_event_engine::experimental::Slice Zeros(uint32_t length);
+
+}  // namespace testing
+}  // namespace chaotic_good
+}  // namespace grpc_core
+
+#endif  // GRPC_TEST_CORE_TRANSPORT_CHAOTIC_GOOD_TRANSPORT_TEST_H
diff --git a/test/core/transport/pid_controller_test.cc b/test/core/transport/pid_controller_test.cc
deleted file mode 100644
index 1d7cedcb8db..00000000000
--- a/test/core/transport/pid_controller_test.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-//
-// Copyright 2016 gRPC authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-
-#include "src/core/lib/transport/pid_controller.h"
-
-#include <math.h>
-
-#include <memory>
-#include <ostream>
-
-#include "gtest/gtest.h"
-
-#include "test/core/util/test_config.h"
-
-namespace grpc_core {
-namespace testing {
-
-TEST(PidController, NoOp) {
-  PidController pid(PidController::Args()
-                        .set_gain_p(1)
-                        .set_gain_i(1)
-                        .set_gain_d(1)
-                        .set_initial_control_value(1));
-}
-
-struct SimpleConvergenceTestArgs {
-  double gain_p;
-  double gain_i;
-  double gain_d;
-  double dt;
-  double set_point;
-  double start;
-};
-
-std::ostream& operator<<(std::ostream& out, SimpleConvergenceTestArgs args) {
-  return out << "gain_p:" << args.gain_p << " gain_i:" << args.gain_i
-             << " gain_d:" << args.gain_d << " dt:" << args.dt
-             << " set_point:" << args.set_point << " start:" << args.start;
-}
-
-class SimpleConvergenceTest
-    : public ::testing::TestWithParam<SimpleConvergenceTestArgs> {};
-
-TEST_P(SimpleConvergenceTest, Converges) {
-  PidController pid(PidController::Args()
-                        .set_gain_p(GetParam().gain_p)
-                        .set_gain_i(GetParam().gain_i)
-                        .set_gain_d(GetParam().gain_d)
-                        .set_initial_control_value(GetParam().start));
-
-  for (int i = 0; i < 100000; i++) {
-    pid.Update(GetParam().set_point - pid.last_control_value(), GetParam().dt);
-  }
-
-  EXPECT_LT(fabs(GetParam().set_point - pid.last_control_value()), 0.1);
-  if (GetParam().gain_i > 0) {
-    EXPECT_LT(fabs(pid.error_integral()), 0.1);
-  }
-}
-
-INSTANTIATE_TEST_SUITE_P(
-    X, SimpleConvergenceTest,
-    ::testing::Values(SimpleConvergenceTestArgs{0.2, 0, 0, 1, 100, 0},
-                      SimpleConvergenceTestArgs{0.2, 0.1, 0, 1, 100, 0},
-                      SimpleConvergenceTestArgs{0.2, 0.1, 0.1, 1, 100, 0}));
-
-}  // namespace testing
-}  // namespace grpc_core
-
-int main(int argc, char** argv) {
-  grpc::testing::TestEnvironment env(&argc, argv);
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
diff --git a/test/core/transport/promise_endpoint_test.cc b/test/core/transport/promise_endpoint_test.cc
index 760a2add6c7..e6ad3dd2713 100644
--- a/test/core/transport/promise_endpoint_test.cc
+++ b/test/core/transport/promise_endpoint_test.cc
@@ -524,6 +524,19 @@ TEST_F(PromiseEndpointTest, OneWriteSuccessful) {
   activity.Activate();
   EXPECT_CALL(activity, WakeupRequested).Times(0);
   EXPECT_CALL(mock_endpoint_, Write).WillOnce(Return(true));
+  auto promise = promise_endpoint_->Write(
+      SliceBuffer(Slice::FromCopiedString("hello world")));
+  auto poll = promise();
+  ASSERT_TRUE(poll.ready());
+  EXPECT_EQ(absl::OkStatus(), poll.value());
+  activity.Deactivate();
+}
+
+TEST_F(PromiseEndpointTest, EmptyWriteIsNoOp) {
+  MockActivity activity;
+  activity.Activate();
+  EXPECT_CALL(activity, WakeupRequested).Times(0);
+  EXPECT_CALL(mock_endpoint_, Write).Times(0);
   auto promise = promise_endpoint_->Write(SliceBuffer());
   auto poll = promise();
   ASSERT_TRUE(poll.ready());
@@ -541,7 +554,8 @@ TEST_F(PromiseEndpointTest, OneWriteFailed) {
             on_write(this->kDummyErrorStatus);
             return false;
           }));
-  auto promise = promise_endpoint_->Write(SliceBuffer());
+  auto promise = promise_endpoint_->Write(
+      SliceBuffer(Slice::FromCopiedString("hello world")));
   auto poll = promise();
   ASSERT_TRUE(poll.ready());
   EXPECT_EQ(kDummyErrorStatus, poll.value());
@@ -564,7 +578,8 @@ TEST_F(PromiseEndpointTest, OnePendingWriteSuccessful) {
             // Return false to mock EventEngine write pending..
             return false;
           }));
-  auto promise = promise_endpoint_->Write(SliceBuffer());
+  auto promise = promise_endpoint_->Write(
+      SliceBuffer(Slice::FromCopiedString("hello world")));
   EXPECT_TRUE(promise().pending());
   // Mock EventEngine write succeeds, and promise resolves.
   write_callback(absl::OkStatus());
@@ -586,7 +601,8 @@ TEST_F(PromiseEndpointTest, OnePendingWriteFailed) {
             // Return false to mock EventEngine write pending..
             return false;
           }));
-  auto promise = promise_endpoint_->Write(SliceBuffer());
+  auto promise = promise_endpoint_->Write(
+      SliceBuffer(Slice::FromCopiedString("hello world")));
   EXPECT_TRUE(promise().pending());
   write_callback(kDummyErrorStatus);
   auto poll = promise();
@@ -807,8 +823,10 @@ TEST_F(MultiplePromiseEndpointTest, JoinWritesSuccessful) {
   EXPECT_CALL(on_done, Call(absl::OkStatus()));
   auto activity = MakeActivity(
       [this] {
-        return Seq(Join(this->first_promise_endpoint_.Write(SliceBuffer()),
-                        this->second_promise_endpoint_.Write(SliceBuffer())),
+        return Seq(Join(this->first_promise_endpoint_.Write(SliceBuffer(
+                            Slice::FromCopiedString("hello world"))),
+                        this->second_promise_endpoint_.Write(SliceBuffer(
+                            Slice::FromCopiedString("hello world")))),
                    [](std::tuple<absl::Status, absl::Status> ret) {
                      // Both writes finish with `absl::OkStatus`.
                      EXPECT_TRUE(std::get<0>(ret).ok());
@@ -832,8 +850,10 @@ TEST_F(MultiplePromiseEndpointTest, JoinOneWriteSuccessfulOneWriteFailed) {
   EXPECT_CALL(on_done, Call(kDummyErrorStatus));
   auto activity = MakeActivity(
       [this] {
-        return Seq(Join(this->first_promise_endpoint_.Write(SliceBuffer()),
-                        this->second_promise_endpoint_.Write(SliceBuffer())),
+        return Seq(Join(this->first_promise_endpoint_.Write(SliceBuffer(
+                            Slice::FromCopiedString("hello world"))),
+                        this->second_promise_endpoint_.Write(SliceBuffer(
+                            Slice::FromCopiedString("hello world")))),
                    [this](std::tuple<absl::Status, absl::Status> ret) {
                      // One write finish with `absl::OkStatus` and the other
                      // write fails.
@@ -864,8 +884,10 @@ TEST_F(MultiplePromiseEndpointTest, JoinWritesFailed) {
   EXPECT_CALL(on_done, Call(kDummyErrorStatus));
   auto activity = MakeActivity(
       [this] {
-        return Seq(Join(this->first_promise_endpoint_.Write(SliceBuffer()),
-                        this->second_promise_endpoint_.Write(SliceBuffer())),
+        return Seq(Join(this->first_promise_endpoint_.Write(SliceBuffer(
+                            Slice::FromCopiedString("hello world"))),
+                        this->second_promise_endpoint_.Write(SliceBuffer(
+                            Slice::FromCopiedString("hello world")))),
                    [this](std::tuple<absl::Status, absl::Status> ret) {
                      // Both writes fail with errors.
                      EXPECT_FALSE(std::get<0>(ret).ok());
diff --git a/test/core/tsi/ssl_transport_security_test.cc b/test/core/tsi/ssl_transport_security_test.cc
index dae69e58c75..98b1d739d64 100644
--- a/test/core/tsi/ssl_transport_security_test.cc
+++ b/test/core/tsi/ssl_transport_security_test.cc
@@ -1278,7 +1278,6 @@ TEST(SslTransportSecurityTest, MainTest) {
       ssl_tsi_test_do_handshake_small_handshake_buffer();
       ssl_tsi_test_do_handshake();
       ssl_tsi_test_do_handshake_with_root_store();
-      ssl_tsi_test_do_handshake_skipping_server_certificate_verification();
       ssl_tsi_test_do_handshake_with_large_server_handshake_messages(
           trust_bundle);
       ssl_tsi_test_do_handshake_with_client_authentication();
@@ -1289,6 +1288,11 @@ TEST(SslTransportSecurityTest, MainTest) {
       ssl_tsi_test_do_handshake_with_wrong_server_name_indication();
       ssl_tsi_test_do_handshake_with_bad_server_cert();
       ssl_tsi_test_do_handshake_with_bad_client_cert();
+// TODO(gregorycooke) - failing with OpenSSL1.0.2
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
+      ssl_tsi_test_do_handshake_skipping_server_certificate_verification();
+#endif  // OPENSSL_VERSION_NUMBER >= 0x10100000
+
 #ifdef OPENSSL_IS_BORINGSSL
       // BoringSSL and OpenSSL have different behaviors on mismatched ALPN.
       ssl_tsi_test_do_handshake_alpn_client_no_server();
diff --git a/test/cpp/end2end/crl_provider_test.cc b/test/cpp/end2end/crl_provider_test.cc
index 180da59eb0e..6902fd7443e 100644
--- a/test/cpp/end2end/crl_provider_test.cc
+++ b/test/cpp/end2end/crl_provider_test.cc
@@ -49,6 +49,8 @@
 #include "test/core/util/tls_utils.h"
 #include "test/cpp/end2end/test_service_impl.h"
 
+// CRL Providers not supported for <1.1
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
 namespace grpc {
 namespace testing {
 namespace {
@@ -280,6 +282,8 @@ TEST_F(CrlProviderTest, CrlProviderValidReloaderProvider) {
 }  // namespace testing
 }  // namespace grpc
 
+#endif  // OPENSSL_VERSION_NUMBER >= 0x10100000
+
 int main(int argc, char** argv) {
   grpc::testing::TestEnvironment env(&argc, argv);
   ::testing::InitGoogleTest(&argc, argv);
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc
index 7fc2d33132a..40964abe03f 100644
--- a/test/cpp/end2end/end2end_test.cc
+++ b/test/cpp/end2end/end2end_test.cc
@@ -862,12 +862,10 @@ TEST_P(End2endTest, ManyStubs) {
   ResetStub();
   ChannelTestPeer peer(channel_.get());
   int registered_calls_pre = peer.registered_calls();
-  int registration_attempts_pre = peer.registration_attempts();
   for (int i = 0; i < 1000; ++i) {
     grpc::testing::EchoTestService::NewStub(channel_);
   }
   EXPECT_EQ(peer.registered_calls(), registered_calls_pre);
-  EXPECT_GT(peer.registration_attempts(), registration_attempts_pre);
 }
 
 TEST_P(End2endTest, EmptyBinaryMetadata) {
diff --git a/test/cpp/end2end/tls_credentials_test.cc b/test/cpp/end2end/tls_credentials_test.cc
index a0a78e684be..1c3fd837082 100644
--- a/test/cpp/end2end/tls_credentials_test.cc
+++ b/test/cpp/end2end/tls_credentials_test.cc
@@ -107,6 +107,7 @@ class TlsCredentialsTest : public ::testing::Test {
   std::string server_addr_;
 };
 
+// NOLINTNEXTLINE(clang-diagnostic-unused-function)
 void DoRpc(const std::string& server_addr,
            const TlsChannelCredentialsOptions& tls_options) {
   std::shared_ptr<Channel> channel =
@@ -128,6 +129,8 @@ void DoRpc(const std::string& server_addr,
   EXPECT_EQ(response.message(), kMessage);
 }
 
+// TODO(gregorycooke) - failing with OpenSSL1.0.2
+#if OPENSSL_VERSION_NUMBER >= 0x10100000
 // How do we test that skipping server certificate verification works as
 // expected? Give the server credentials that chain up to a custom CA (that does
 // not belong to the default or OS trust store), do not configure the client to
@@ -148,6 +151,7 @@ TEST_F(TlsCredentialsTest, SkipServerCertificateVerification) {
 
   DoRpc(server_addr_, tls_options);
 }
+#endif  // OPENSSL_VERSION_NUMBER >= 0x10100000
 
 }  // namespace
 }  // namespace testing
diff --git a/test/cpp/ext/csm/BUILD b/test/cpp/ext/csm/BUILD
index ed511175d5f..3d505e093b8 100644
--- a/test/cpp/ext/csm/BUILD
+++ b/test/cpp/ext/csm/BUILD
@@ -36,6 +36,8 @@ grpc_cc_test(
     ],
     deps = [
         "//:grpc++",
+        "//:grpcpp_csm_observability",
+        "//:grpcpp_otel_plugin",
         "//src/cpp/ext/csm:csm_observability",
         "//src/cpp/ext/otel:otel_plugin",
         "//test/core/util:grpc_test_util",
diff --git a/test/cpp/ext/csm/csm_observability_test.cc b/test/cpp/ext/csm/csm_observability_test.cc
index 54e3e5c66cf..c6825c82846 100644
--- a/test/cpp/ext/csm/csm_observability_test.cc
+++ b/test/cpp/ext/csm/csm_observability_test.cc
@@ -22,6 +22,7 @@
 #include "gtest/gtest.h"
 
 #include <grpcpp/ext/csm_observability.h>
+#include <grpcpp/ext/otel_plugin.h>
 
 #include "src/core/lib/gprpp/env.h"
 #include "test/core/util/test_config.h"
@@ -62,6 +63,12 @@ TEST(CsmChannelTargetSelectorTest, XdsTargetsWithTDAuthority) {
       "xds://traffic-director-global.xds.googleapis.com/foo"));
 }
 
+TEST(CsmPluginOptionTest, Basic) {
+  experimental::OpenTelemetryPluginBuilder()
+      .AddPluginOption(experimental::MakeCsmOpenTelemetryPluginOption())
+      .BuildAndRegisterGlobal();
+}
+
 }  // namespace
 }  // namespace testing
 }  // namespace grpc
diff --git a/test/cpp/ext/otel/otel_plugin_test.cc b/test/cpp/ext/otel/otel_plugin_test.cc
index e763cd7cad0..994ed6ce9d6 100644
--- a/test/cpp/ext/otel/otel_plugin_test.cc
+++ b/test/cpp/ext/otel/otel_plugin_test.cc
@@ -653,6 +653,282 @@ TEST_F(OpenTelemetryPluginEnd2EndTest,
   EXPECT_EQ(*status_value, "UNIMPLEMENTED");
 }
 
+using OpenTelemetryPluginOptionEnd2EndTest = OpenTelemetryPluginEnd2EndTest;
+
+class SimpleLabelIterable : public grpc::internal::LabelsIterable {
+ public:
+  explicit SimpleLabelIterable(
+      std::pair<absl::string_view, absl::string_view> label)
+      : label_(label) {}
+
+  absl::optional<std::pair<absl::string_view, absl::string_view>> Next()
+      override {
+    if (iterated_) {
+      return absl::nullopt;
+    }
+    iterated_ = true;
+    return label_;
+  }
+
+  size_t Size() const override { return 1; }
+
+  void ResetIteratorPosition() override { iterated_ = false; }
+
+ private:
+  bool iterated_ = false;
+  std::pair<absl::string_view, absl::string_view> label_;
+};
+
+class CustomLabelInjector : public grpc::internal::LabelsInjector {
+ public:
+  explicit CustomLabelInjector(std::pair<std::string, std::string> label)
+      : label_(std::move(label)) {}
+  ~CustomLabelInjector() override {}
+
+  std::unique_ptr<grpc::internal::LabelsIterable> GetLabels(
+      grpc_metadata_batch* /*incoming_initial_metadata*/) const override {
+    return std::make_unique<SimpleLabelIterable>(label_);
+  }
+
+  void AddLabels(
+      grpc_metadata_batch* /*outgoing_initial_metadata*/,
+      grpc::internal::LabelsIterable* /*labels_from_incoming_metadata*/)
+      const override {}
+
+ private:
+  std::pair<std::string, std::string> label_;
+};
+
+class CustomPluginOption
+    : public grpc::internal::InternalOpenTelemetryPluginOption {
+ public:
+  CustomPluginOption(bool enabled_on_client, bool enabled_on_server,
+                     std::pair<std::string, std::string> label)
+      : enabled_on_client_(enabled_on_client),
+        enabled_on_server_(enabled_on_server),
+        label_injector_(
+            std::make_unique<CustomLabelInjector>(std::move(label))) {}
+
+  ~CustomPluginOption() override {}
+
+  bool IsActiveOnClientChannel(absl::string_view /*target*/) const override {
+    return enabled_on_client_;
+  }
+
+  bool IsActiveOnServer(const grpc_core::ChannelArgs& /*args*/) const override {
+    return enabled_on_server_;
+  }
+
+  const grpc::internal::LabelsInjector* labels_injector() const override {
+    return label_injector_.get();
+  }
+
+ private:
+  bool enabled_on_client_;
+  bool enabled_on_server_;
+  std::unique_ptr<CustomLabelInjector> label_injector_;
+};
+
+TEST_F(OpenTelemetryPluginOptionEnd2EndTest, Basic) {
+  std::vector<
+      std::unique_ptr<grpc::internal::InternalOpenTelemetryPluginOption>>
+      plugin_option_list;
+  plugin_option_list.emplace_back(std::make_unique<CustomPluginOption>(
+      /*enabled_on_client*/ true, /*enabled_on_server*/ true,
+      std::make_pair("key", "value")));
+  Init({grpc::experimental::OpenTelemetryPluginBuilder::
+            kClientAttemptDurationInstrumentName,
+        grpc::experimental::OpenTelemetryPluginBuilder::
+            kServerCallDurationInstrumentName},
+       /*resource=*/opentelemetry::sdk::resource::Resource::Create({}),
+       /*labels_injector=*/nullptr,
+       /*test_no_meter_provider=*/false,
+       /*target_selector=*/absl::AnyInvocable<bool(absl::string_view) const>(),
+       /*target_attribute_filter=*/
+       absl::AnyInvocable<bool(absl::string_view) const>(),
+       /*generic_method_attribute_filter=*/
+       absl::AnyInvocable<bool(absl::string_view /*generic_method*/) const>(),
+       /*plugin_options=*/std::move(plugin_option_list));
+  SendRPC();
+  auto data = ReadCurrentMetricsData(
+      [&](const absl::flat_hash_map<
+          std::string,
+          std::vector<opentelemetry::sdk::metrics::PointDataAttributes>>&
+              data) {
+        return !data.contains("grpc.client.attempt.duration") ||
+               !data.contains("grpc.server.call.duration");
+      });
+  // Verify client side metric
+  ASSERT_EQ(data["grpc.client.attempt.duration"].size(), 1);
+  const auto& client_attributes =
+      data["grpc.client.attempt.duration"][0].attributes.GetAttributes();
+  EXPECT_EQ(client_attributes.size(), 4);
+  EXPECT_EQ(absl::get<std::string>(client_attributes.at("key")), "value");
+  // Verify server side metric
+  ASSERT_EQ(data["grpc.server.call.duration"].size(), 1);
+  const auto& server_attributes =
+      data["grpc.server.call.duration"][0].attributes.GetAttributes();
+  EXPECT_EQ(server_attributes.size(), 3);
+  EXPECT_EQ(absl::get<std::string>(server_attributes.at("key")), "value");
+}
+
+TEST_F(OpenTelemetryPluginOptionEnd2EndTest, ClientOnlyPluginOption) {
+  std::vector<
+      std::unique_ptr<grpc::internal::InternalOpenTelemetryPluginOption>>
+      plugin_option_list;
+  plugin_option_list.emplace_back(std::make_unique<CustomPluginOption>(
+      /*enabled_on_client*/ true, /*enabled_on_server*/ false,
+      std::make_pair("key", "value")));
+  Init({grpc::experimental::OpenTelemetryPluginBuilder::
+            kClientAttemptDurationInstrumentName,
+        grpc::experimental::OpenTelemetryPluginBuilder::
+            kServerCallDurationInstrumentName},
+       /*resource=*/opentelemetry::sdk::resource::Resource::Create({}),
+       /*labels_injector=*/nullptr,
+       /*test_no_meter_provider=*/false,
+       /*target_selector=*/absl::AnyInvocable<bool(absl::string_view) const>(),
+       /*target_attribute_filter=*/
+       absl::AnyInvocable<bool(absl::string_view) const>(),
+       /*generic_method_attribute_filter=*/
+       absl::AnyInvocable<bool(absl::string_view /*generic_method*/) const>(),
+       /*plugin_options=*/std::move(plugin_option_list));
+  SendRPC();
+  auto data = ReadCurrentMetricsData(
+      [&](const absl::flat_hash_map<
+          std::string,
+          std::vector<opentelemetry::sdk::metrics::PointDataAttributes>>&
+              data) {
+        return !data.contains("grpc.client.attempt.duration") ||
+               !data.contains("grpc.server.call.duration");
+      });
+  // Verify client side metric
+  ASSERT_EQ(data["grpc.client.attempt.duration"].size(), 1);
+  const auto& client_attributes =
+      data["grpc.client.attempt.duration"][0].attributes.GetAttributes();
+  EXPECT_EQ(client_attributes.size(), 4);
+  EXPECT_EQ(absl::get<std::string>(client_attributes.at("key")), "value");
+  // Verify server side metric
+  ASSERT_EQ(data["grpc.server.call.duration"].size(), 1);
+  const auto& server_attributes =
+      data["grpc.server.call.duration"][0].attributes.GetAttributes();
+  EXPECT_EQ(server_attributes.size(), 2);
+  EXPECT_THAT(server_attributes,
+              ::testing::Not(::testing::Contains(::testing::Key("key"))));
+}
+
+TEST_F(OpenTelemetryPluginOptionEnd2EndTest, ServerOnlyPluginOption) {
+  std::vector<
+      std::unique_ptr<grpc::internal::InternalOpenTelemetryPluginOption>>
+      plugin_option_list;
+  plugin_option_list.emplace_back(std::make_unique<CustomPluginOption>(
+      /*enabled_on_client*/ false, /*enabled_on_server*/ true,
+      std::make_pair("key", "value")));
+  Init({grpc::experimental::OpenTelemetryPluginBuilder::
+            kClientAttemptDurationInstrumentName,
+        grpc::experimental::OpenTelemetryPluginBuilder::
+            kServerCallDurationInstrumentName},
+       /*resource=*/opentelemetry::sdk::resource::Resource::Create({}),
+       /*labels_injector=*/nullptr,
+       /*test_no_meter_provider=*/false,
+       /*target_selector=*/absl::AnyInvocable<bool(absl::string_view) const>(),
+       /*target_attribute_filter=*/
+       absl::AnyInvocable<bool(absl::string_view) const>(),
+       /*generic_method_attribute_filter=*/
+       absl::AnyInvocable<bool(absl::string_view /*generic_method*/) const>(),
+       /*plugin_options=*/std::move(plugin_option_list));
+  SendRPC();
+  auto data = ReadCurrentMetricsData(
+      [&](const absl::flat_hash_map<
+          std::string,
+          std::vector<opentelemetry::sdk::metrics::PointDataAttributes>>&
+              data) {
+        return !data.contains("grpc.client.attempt.duration") ||
+               !data.contains("grpc.server.call.duration");
+      });
+  // Verify client side metric
+  ASSERT_EQ(data["grpc.client.attempt.duration"].size(), 1);
+  const auto& attributes =
+      data["grpc.client.attempt.duration"][0].attributes.GetAttributes();
+  EXPECT_EQ(attributes.size(), 3);
+  EXPECT_THAT(attributes,
+              ::testing::Not(::testing::Contains(::testing::Key("key"))));
+  // Verify server side metric
+  ASSERT_EQ(data["grpc.server.call.duration"].size(), 1);
+  const auto& server_attributes =
+      data["grpc.server.call.duration"][0].attributes.GetAttributes();
+  EXPECT_EQ(server_attributes.size(), 3);
+  EXPECT_EQ(absl::get<std::string>(server_attributes.at("key")), "value");
+}
+
+TEST_F(OpenTelemetryPluginOptionEnd2EndTest,
+       MultipleEnabledAndDisabledPluginOptions) {
+  std::vector<
+      std::unique_ptr<grpc::internal::InternalOpenTelemetryPluginOption>>
+      plugin_option_list;
+  plugin_option_list.reserve(5);
+  plugin_option_list.emplace_back(std::make_unique<CustomPluginOption>(
+      /*enabled_on_client*/ true, /*enabled_on_server*/ true,
+      std::make_pair("key1", "value1")));
+  plugin_option_list.emplace_back(std::make_unique<CustomPluginOption>(
+      /*enabled_on_client*/ true, /*enabled_on_server*/ false,
+      std::make_pair("key2", "value2")));
+  plugin_option_list.emplace_back(std::make_unique<CustomPluginOption>(
+      /*enabled_on_client*/ true, /*enabled_on_server*/ false,
+      std::make_pair("key3", "value3")));
+  plugin_option_list.emplace_back(std::make_unique<CustomPluginOption>(
+      /*enabled_on_client*/ false, /*enabled_on_server*/ true,
+      std::make_pair("key4", "value4")));
+  plugin_option_list.emplace_back(std::make_unique<CustomPluginOption>(
+      /*enabled_on_client*/ false, /*enabled_on_server*/ true,
+      std::make_pair("key5", "value5")));
+  Init({grpc::experimental::OpenTelemetryPluginBuilder::
+            kClientAttemptDurationInstrumentName,
+        grpc::experimental::OpenTelemetryPluginBuilder::
+            kServerCallDurationInstrumentName},
+       /*resource=*/opentelemetry::sdk::resource::Resource::Create({}),
+       /*labels_injector=*/nullptr,
+       /*test_no_meter_provider=*/false,
+       /*target_selector=*/absl::AnyInvocable<bool(absl::string_view) const>(),
+       /*target_attribute_filter=*/
+       absl::AnyInvocable<bool(absl::string_view) const>(),
+       /*generic_method_attribute_filter=*/
+       absl::AnyInvocable<bool(absl::string_view /*generic_method*/) const>(),
+       /*plugin_options=*/std::move(plugin_option_list));
+  SendRPC();
+  auto data = ReadCurrentMetricsData(
+      [&](const absl::flat_hash_map<
+          std::string,
+          std::vector<opentelemetry::sdk::metrics::PointDataAttributes>>&
+              data) {
+        return !data.contains("grpc.client.attempt.duration") ||
+               !data.contains("grpc.server.call.duration");
+      });
+  // Verify client side metric
+  ASSERT_EQ(data["grpc.client.attempt.duration"].size(), 1);
+  const auto& client_attributes =
+      data["grpc.client.attempt.duration"][0].attributes.GetAttributes();
+  EXPECT_EQ(client_attributes.size(), 6);
+  EXPECT_EQ(absl::get<std::string>(client_attributes.at("key1")), "value1");
+  EXPECT_EQ(absl::get<std::string>(client_attributes.at("key2")), "value2");
+  EXPECT_EQ(absl::get<std::string>(client_attributes.at("key3")), "value3");
+  EXPECT_THAT(client_attributes,
+              ::testing::Not(::testing::Contains(::testing::Key("key4"))));
+  EXPECT_THAT(client_attributes,
+              ::testing::Not(::testing::Contains(::testing::Key("key5"))));
+  // Verify server side metric
+  ASSERT_EQ(data["grpc.server.call.duration"].size(), 1);
+  const auto& server_attributes =
+      data["grpc.server.call.duration"][0].attributes.GetAttributes();
+  EXPECT_EQ(server_attributes.size(), 5);
+  EXPECT_EQ(absl::get<std::string>(server_attributes.at("key1")), "value1");
+  EXPECT_THAT(server_attributes,
+              ::testing::Not(::testing::Contains(::testing::Key("key2"))));
+  EXPECT_THAT(server_attributes,
+              ::testing::Not(::testing::Contains(::testing::Key("key3"))));
+  EXPECT_EQ(absl::get<std::string>(server_attributes.at("key4")), "value4");
+  EXPECT_EQ(absl::get<std::string>(server_attributes.at("key5")), "value5");
+}
+
 }  // namespace
 }  // namespace testing
 }  // namespace grpc
diff --git a/test/cpp/ext/otel/otel_test_library.cc b/test/cpp/ext/otel/otel_test_library.cc
index bf530017bf9..53aa350435f 100644
--- a/test/cpp/ext/otel/otel_test_library.cc
+++ b/test/cpp/ext/otel/otel_test_library.cc
@@ -48,7 +48,10 @@ void OpenTelemetryPluginEnd2EndTest::Init(
     absl::AnyInvocable<bool(absl::string_view /*target*/) const>
         target_attribute_filter,
     absl::AnyInvocable<bool(absl::string_view /*generic_method*/) const>
-        generic_method_attribute_filter) {
+        generic_method_attribute_filter,
+    std::vector<
+        std::unique_ptr<grpc::internal::InternalOpenTelemetryPluginOption>>
+        plugin_options) {
   // We are resetting the MeterProvider and OpenTelemetry plugin at the start
   // of each test to avoid test results from one test carrying over to another
   // test. (Some measurements can get arbitrarily delayed.)
@@ -76,6 +79,9 @@ void OpenTelemetryPluginEnd2EndTest::Init(
   ot_builder.SetTargetAttributeFilter(std::move(target_attribute_filter));
   ot_builder.SetGenericMethodAttributeFilter(
       std::move(generic_method_attribute_filter));
+  for (auto& option : plugin_options) {
+    ot_builder.AddPluginOption(std::move(option));
+  }
   ot_builder.BuildAndRegisterGlobal();
   grpc_init();
   grpc::ServerBuilder builder;
diff --git a/test/cpp/ext/otel/otel_test_library.h b/test/cpp/ext/otel/otel_test_library.h
index 1076d29d1b3..629d8c12762 100644
--- a/test/cpp/ext/otel/otel_test_library.h
+++ b/test/cpp/ext/otel/otel_test_library.h
@@ -70,7 +70,10 @@ class OpenTelemetryPluginEnd2EndTest : public ::testing::Test {
               absl::AnyInvocable<bool(absl::string_view) const>(),
       absl::AnyInvocable<bool(absl::string_view /*generic_method*/) const>
           generic_method_attribute_filter = absl::AnyInvocable<
-              bool(absl::string_view /*generic_method*/) const>());
+              bool(absl::string_view /*generic_method*/) const>(),
+      std::vector<
+          std::unique_ptr<grpc::internal::InternalOpenTelemetryPluginOption>>
+          plugin_options = {});
 
   void TearDown() override;
 
diff --git a/test/cpp/interop/BUILD b/test/cpp/interop/BUILD
index 8262b29ab27..6d5b80422c9 100644
--- a/test/cpp/interop/BUILD
+++ b/test/cpp/interop/BUILD
@@ -532,6 +532,22 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_test(
+    name = "backend_metrics_lb_policy_test",
+    srcs = [
+        "backend_metrics_lb_policy_test.cc",
+    ],
+    external_deps = ["gtest"],
+    deps = [
+        ":backend_metrics_lb_policy",
+        "//:grpc++",
+        "//:grpcpp_orca_service",
+        "//src/proto/grpc/testing:test_proto",
+        "//test/core/util:grpc_test_util",
+        "//test/cpp/util:test_config",
+    ],
+)
+
 grpc_cc_library(
     name = "rpc_behavior_lb_policy",
     srcs = [
diff --git a/test/cpp/interop/backend_metrics_lb_policy.cc b/test/cpp/interop/backend_metrics_lb_policy.cc
index a10bd4f63a5..30f3bb18943 100644
--- a/test/cpp/interop/backend_metrics_lb_policy.cc
+++ b/test/cpp/interop/backend_metrics_lb_policy.cc
@@ -86,6 +86,11 @@ class BackendMetricsLbPolicy : public LoadBalancingPolicy {
   }
 
   absl::Status UpdateLocked(UpdateArgs args) override {
+    auto config =
+        CoreConfiguration::Get().lb_policy_registry().ParseLoadBalancingConfig(
+            grpc_core::Json::FromArray({grpc_core::Json::FromObject(
+                {{"pick_first", grpc_core::Json::FromObject({})}})}));
+    args.config = std::move(config.value());
     return delegate_->UpdateLocked(std::move(args));
   }
 
@@ -249,14 +254,12 @@ LoadReportTracker::LoadReportEntry LoadReportTracker::WaitForOobLoadReport(
   grpc_core::MutexLock lock(&load_reports_mu_);
   // This condition will be called under lock
   for (size_t i = 0; i < max_attempts; i++) {
-    auto deadline = absl::Now() + poll_timeout;
-    // loop to handle spurious wakeups.
-    do {
-      if (absl::Now() >= deadline) {
+    if (oob_load_reports_.empty()) {
+      load_reports_cv_.WaitWithTimeout(&load_reports_mu_, poll_timeout);
+      if (oob_load_reports_.empty()) {
         return absl::nullopt;
       }
-      load_reports_cv_.WaitWithDeadline(&load_reports_mu_, deadline);
-    } while (oob_load_reports_.empty());
+    }
     auto report = std::move(oob_load_reports_.front());
     oob_load_reports_.pop_front();
     if (predicate(report)) {
diff --git a/test/cpp/interop/backend_metrics_lb_policy_test.cc b/test/cpp/interop/backend_metrics_lb_policy_test.cc
new file mode 100644
index 00000000000..8ceae112fa8
--- /dev/null
+++ b/test/cpp/interop/backend_metrics_lb_policy_test.cc
@@ -0,0 +1,159 @@
+//
+//
+// Copyright 2024 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+#include "test/cpp/interop/backend_metrics_lb_policy.h"
+
+#include <memory>
+#include <thread>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <grpc/grpc.h>
+#include <grpcpp/ext/call_metric_recorder.h>
+#include <grpcpp/ext/orca_service.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/support/status.h>
+
+#include "src/core/lib/config/config_vars.h"
+#include "src/core/lib/gprpp/sync.h"
+#include "src/proto/grpc/testing/messages.pb.h"
+#include "src/proto/grpc/testing/test.grpc.pb.h"
+#include "test/core/util/port.h"
+#include "test/core/util/test_config.h"
+
+namespace grpc {
+namespace testing {
+namespace {
+
+class EchoServiceImpl : public grpc::testing::TestService::CallbackService {
+ public:
+  grpc::ServerUnaryReactor* UnaryCall(
+      grpc::CallbackServerContext* context,
+      const grpc::testing::SimpleRequest* /* request */,
+      grpc::testing::SimpleResponse* /* response */) override {
+    auto reactor = context->DefaultReactor();
+    reactor->Finish(grpc::Status::OK);
+    return reactor;
+  }
+};
+
+class Server {
+ public:
+  Server() : port_(grpc_pick_unused_port_or_die()) {
+    server_thread_ = std::thread(ServerLoop, this);
+    grpc_core::MutexLock lock(&mu_);
+    cond_.WaitWithTimeout(&mu_, absl::Seconds(1));
+  }
+
+  ~Server() {
+    server_->Shutdown();
+    server_thread_.join();
+  }
+
+  std::string address() const { return absl::StrCat("localhost:", port_); }
+
+ private:
+  static void ServerLoop(Server* server) { server->Run(); }
+
+  void Run() {
+    ServerBuilder builder;
+    EchoServiceImpl service;
+    auto server_metric_recorder =
+        grpc::experimental::ServerMetricRecorder::Create();
+    server_metric_recorder->SetCpuUtilization(.5f);
+    grpc::experimental::OrcaService orca_service(
+        server_metric_recorder.get(),
+        grpc::experimental::OrcaService::Options().set_min_report_duration(
+            absl::Seconds(1)));
+    builder.RegisterService(&orca_service);
+    builder.RegisterService(&service);
+    builder.AddListeningPort(address(), InsecureServerCredentials());
+    auto grpc_server = builder.BuildAndStart();
+    server_ = grpc_server.get();
+    {
+      grpc_core::MutexLock lock(&mu_);
+      cond_.SignalAll();
+    }
+    grpc_server->Wait();
+  }
+
+  int port_;
+  grpc_core::Mutex mu_;
+  grpc_core::CondVar cond_;
+  std::thread server_thread_;
+  grpc::Server* server_;
+};
+
+TEST(BackendMetricsLbPolicyTest, TestOobMetricsReceipt) {
+  LoadReportTracker tracker;
+  grpc_core::CoreConfiguration::RegisterBuilder(RegisterBackendMetricsLbPolicy);
+  Server server;
+  ChannelArguments args = tracker.GetChannelArguments();
+  args.SetLoadBalancingPolicyName("test_backend_metrics_load_balancer");
+  auto channel = grpc::CreateCustomChannel(server.address(),
+                                           InsecureChannelCredentials(), args);
+  auto stub = grpc::testing::TestService::Stub(channel);
+  ClientContext ctx;
+  SimpleRequest req;
+  SimpleResponse res;
+  grpc_core::Mutex mu;
+  grpc_core::CondVar cond;
+  absl::optional<Status> status;
+
+  stub.async()->UnaryCall(&ctx, &req, &res, [&](auto s) {
+    grpc_core::MutexLock lock(&mu);
+    status = s;
+    cond.SignalAll();
+  });
+  // This report is sent on start, available immediately
+  auto report = tracker.WaitForOobLoadReport(
+      [](auto report) { return report.cpu_utilization() == 0.5; },
+      absl::Milliseconds(1500), 3);
+  ASSERT_TRUE(report.has_value());
+  EXPECT_EQ(report->cpu_utilization(), 0.5);
+  for (size_t i = 0; i < 3; i++) {
+    // Wait for slightly more than 1 min
+    report = tracker.WaitForOobLoadReport(
+        [](auto report) { return report.cpu_utilization() == 0.5; },
+        absl::Milliseconds(1500), 3);
+    ASSERT_TRUE(report.has_value());
+    EXPECT_EQ(report->cpu_utilization(), 0.5);
+  }
+  {
+    grpc_core::MutexLock lock(&mu);
+    if (!status.has_value()) {
+      cond.Wait(&mu);
+    }
+    ASSERT_TRUE(status.has_value());
+    EXPECT_EQ(status->error_code(), grpc::StatusCode::OK);
+  }
+}
+
+}  // namespace
+}  // namespace testing
+}  // namespace grpc
+
+int main(int argc, char** argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  grpc::testing::TestEnvironment env(&argc, argv);
+  grpc_init();
+  auto result = RUN_ALL_TESTS();
+  grpc_shutdown();
+  return result;
+}
diff --git a/test/cpp/interop/interop_client.cc b/test/cpp/interop/interop_client.cc
index 04bc8022d27..0185957408e 100644
--- a/test/cpp/interop/interop_client.cc
+++ b/test/cpp/interop/interop_client.cc
@@ -40,6 +40,7 @@
 #include <grpcpp/client_context.h>
 #include <grpcpp/security/credentials.h>
 
+#include "src/core/lib/config/config_vars.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/proto/grpc/testing/empty.pb.h"
@@ -1022,8 +1023,13 @@ bool InteropClient::DoOrcaPerRpc() {
 
 bool InteropClient::DoOrcaOob() {
   static constexpr auto kTimeout = absl::Seconds(10);
-  gpr_log(GPR_DEBUG, "testing orca oob");
+  gpr_log(GPR_INFO, "testing orca oob");
   load_report_tracker_.ResetCollectedLoadReports();
+  // Make the backup poller poll very frequently in order to pick up
+  // updates from all the subchannels's FDs.
+  grpc_core::ConfigVars::Overrides overrides;
+  overrides.client_channel_backup_poll_interval_ms = 250;
+  grpc_core::ConfigVars::SetOverrides(overrides);
   grpc_core::CoreConfiguration::RegisterBuilder(RegisterBackendMetricsLbPolicy);
   ClientContext context;
   std::unique_ptr<ClientReaderWriter<StreamingOutputCallRequest,
@@ -1088,7 +1094,7 @@ bool InteropClient::DoOrcaOob() {
                 kTimeout, 10)
             .has_value());
   }
-  gpr_log(GPR_DEBUG, "orca oob successfully finished");
+  gpr_log(GPR_INFO, "orca oob successfully finished");
   return true;
 }
 
diff --git a/test/cpp/interop/observability_client.cc b/test/cpp/interop/observability_client.cc
index a815f090946..259b47dd124 100644
--- a/test/cpp/interop/observability_client.cc
+++ b/test/cpp/interop/observability_client.cc
@@ -30,10 +30,10 @@
 #include <grpcpp/channel.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/ext/gcp_observability.h>
+#include <grpcpp/ext/otel_plugin.h>
 
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/crash.h"
-#include "src/cpp/ext/otel/otel_plugin.h"
 #include "test/core/util/test_config.h"
 #include "test/cpp/interop/client_helper.h"
 #include "test/cpp/interop/interop_client.h"
@@ -236,7 +236,7 @@ int main(int argc, char** argv) {
     auto meter_provider =
         std::make_shared<opentelemetry::sdk::metrics::MeterProvider>();
     meter_provider->AddMetricReader(std::move(prometheus_exporter));
-    grpc::internal::OpenTelemetryPluginBuilderImpl otel_builder;
+    grpc::experimental::OpenTelemetryPluginBuilder otel_builder;
     otel_builder.SetMeterProvider(std::move(meter_provider));
     otel_builder.BuildAndRegisterGlobal();
   }
diff --git a/tools/bazelify_tests/dockerimage_current_versions.bzl b/tools/bazelify_tests/dockerimage_current_versions.bzl
index ce34a70136f..b3b65e16c1f 100644
--- a/tools/bazelify_tests/dockerimage_current_versions.bzl
+++ b/tools/bazelify_tests/dockerimage_current_versions.bzl
@@ -47,20 +47,18 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
     "tools/dockerfile/distribtest/python_dev_buster_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_buster_x86@sha256:179146fd5d5cc15846c6bf0284c2e261f383caf944559d2d9f7a5af0e0f7152d",
     "tools/dockerfile/distribtest/python_dev_centos7_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_centos7_x64@sha256:e6e9a1b23a0a543050db91e17d621aa899bad04308adaf961c11fa88ba941a95",
     "tools/dockerfile/distribtest/python_dev_fedora36_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_fedora36_x64@sha256:d10ea0c54ecaa861b67942b4adc69178585cd071c9d0c8997fa274a362beea55",
-    "tools/dockerfile/distribtest/python_dev_ubuntu1804_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_ubuntu1804_x64@sha256:157a89cd6d0e69b89ac1975e0314aade556a35aafbaa5fe9f9890f90321d6c89",
     "tools/dockerfile/distribtest/python_dev_ubuntu2004_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_ubuntu2004_x64@sha256:91f0d88c43ec52ecd63f99acb424c88ff9a67fa046fae207a75e99bee37eef11",
     "tools/dockerfile/distribtest/python_dev_ubuntu2204_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_ubuntu2204_x64@sha256:9e6c9ddc738afcd73fcf2de27b22fdc22a74f1e90e214345838373d9c65ea215",
     "tools/dockerfile/distribtest/python_fedora36_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_fedora36_x64@sha256:85b2d2fbbcfc1b995ce3916dcf8240c29dbc72f91bd47f04187c2db008570ba4",
     "tools/dockerfile/distribtest/python_opensuse_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_opensuse_x64@sha256:da52566b078d10e537aa219e59641731a57e5dc7d17d6737f5e5a7d447acf5cc",
     "tools/dockerfile/distribtest/python_python38_buster_aarch64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_python38_buster_aarch64@sha256:487b9af2ad1459ee2630694e61074d4ac525d4f90b2bdb026dbf6f77fb3e9878",
-    "tools/dockerfile/distribtest/python_ubuntu1804_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_ubuntu1804_x64@sha256:edcd5f342d77ad9129cc0a0e6988b47b144815e7a93091d5b45e850111eefbcf",
     "tools/dockerfile/distribtest/python_ubuntu2004_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_ubuntu2004_x64@sha256:342e9dc23b674ad256b220745745be818708a1baa25a2690f0d4f777e28a22a3",
     "tools/dockerfile/distribtest/python_ubuntu2204_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/python_ubuntu2204_x64@sha256:b6ca497348741615406d1d571cf5042008da934c4f708877aa06a66b5dc3036c",
     "tools/dockerfile/distribtest/ruby_centos7_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_centos7_x64@sha256:4d529b984b78ca179086f7f9b416605e2d9a96ca0a28a71f4421bb5ffdc18f96",
     "tools/dockerfile/distribtest/ruby_debian10_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian10_x64@sha256:1298c39c950b2a48261555b6cff1ae66230a5020f100d3b381759285f0caf84e",
     "tools/dockerfile/distribtest/ruby_debian10_x64_ruby_2_7.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian10_x64_ruby_2_7@sha256:5ee26ad3abe2683c9a8ee03987ab0ae63f50793c3d3f5e4be6e6cbacb4556fcf",
     "tools/dockerfile/distribtest/ruby_debian10_x64_ruby_3_0.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_debian10_x64_ruby_3_0@sha256:9190da90a2a95eca1370cef64dcba7ddee9f59cc7487093da6711c1280a0b0f9",
-    "tools/dockerfile/distribtest/ruby_ubuntu1804_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_ubuntu1804_x64@sha256:d38b3dd34cffc027e9a1bf82bc7ace75b8a9829c2d04d5cf7cc8323655edd27a",
+    "tools/dockerfile/distribtest/ruby_ubuntu2004_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_ubuntu2004_x64@sha256:426cbf625df0c0e7451b9716041996dc6a35a3788c1a24d68891256f84733d8e",
     "tools/dockerfile/distribtest/ruby_ubuntu2204_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_ubuntu2204_x64@sha256:1c74c312f8a4ab37e629732a35daa3056e12136b90f37540cdf9fa11303c7eb8",
     "tools/dockerfile/grpc_artifact_centos6_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_centos6_x64@sha256:3285047265ea2b7c5d4df4c769b2d05f56288d947c75e16d27ae2dee693f791b",
     "tools/dockerfile/grpc_artifact_centos6_x86.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/grpc_artifact_centos6_x86@sha256:19783239da92208f0f39cf563529cd02e889920497ef81c60d20391fa998af62",
diff --git a/tools/buildgen/extract_metadata_from_bazel_xml.py b/tools/buildgen/extract_metadata_from_bazel_xml.py
index f8bd3595482..18471eb1d8b 100755
--- a/tools/buildgen/extract_metadata_from_bazel_xml.py
+++ b/tools/buildgen/extract_metadata_from_bazel_xml.py
@@ -895,6 +895,13 @@ def _exclude_unwanted_cc_tests(tests: List[str]) -> List[str]:
         if not test.startswith("test/cpp/util:channelz_sampler_test")
     ]
 
+    # chaotic good not supported outside bazel
+    tests = [
+        test
+        for test in tests
+        if not test.startswith("test/core/transport/chaotic_good")
+    ]
+
     # we don't need to generate fuzzers outside of bazel
     tests = [test for test in tests if not test.endswith("_fuzzer")]
 
diff --git a/tools/codegen/core/gen_seq.py b/tools/codegen/core/gen_seq.py
index fe3f949e7fd..1a105a460ef 100755
--- a/tools/codegen/core/gen_seq.py
+++ b/tools/codegen/core/gen_seq.py
@@ -289,6 +289,6 @@ copyright = [line[2:].rstrip() for line in copyright]
 with open("src/core/lib/promise/detail/seq_state.h", "w") as f:
     put_banner([f], copyright)
     print(front_matter, file=f)
-    for n in range(2, 10):
+    for n in range(2, 14):
         print(seq_state.render(n=n), file=f)
     print(end_matter, file=f)
diff --git a/tools/codegen/core/gen_switch.py b/tools/codegen/core/gen_switch.py
deleted file mode 100755
index 80e53c6416d..00000000000
--- a/tools/codegen/core/gen_switch.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright 2021 gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import sys
-
-
-# utility: print a big comment block into a set of files
-def put_banner(files, banner):
-    for f in files:
-        print("/*", file=f)
-        for line in banner:
-            print(" * %s" % line, file=f)
-        print(" */", file=f)
-        print("", file=f)
-
-
-with open("src/core/lib/promise/detail/switch.h", "w") as H:
-    # copy-paste copyright notice from this file
-    with open(sys.argv[0]) as my_source:
-        copyright = []
-        for line in my_source:
-            if line[0] != "#":
-                break
-        for line in my_source:
-            if line[0] == "#":
-                copyright.append(line)
-                break
-        for line in my_source:
-            if line[0] != "#":
-                break
-            copyright.append(line)
-        put_banner([H], [line[2:].rstrip() for line in copyright])
-
-    put_banner([H], ["Automatically generated by %s" % sys.argv[0]])
-
-    print("#ifndef GRPC_CORE_LIB_PROMISE_DETAIL_SWITCH_H", file=H)
-    print("#define GRPC_CORE_LIB_PROMISE_DETAIL_SWITCH_H", file=H)
-    print("", file=H)
-    print("#include <grpc/support/port_platform.h>", file=H)
-    print("", file=H)
-    print("#include <stdlib.h>", file=H)
-    print("", file=H)
-    print("namespace grpc_core {", file=H)
-
-    for n in range(1, 33):
-        print("", file=H)
-        print(
-            "template <typename R, %s> R Switch(char idx, %s) {"
-            % (
-                ", ".join("typename F%d" % i for i in range(0, n)),
-                ", ".join("F%d f%d" % (i, i) for i in range(0, n)),
-            ),
-            file=H,
-        )
-        print("  switch (idx) {", file=H)
-        for i in range(0, n):
-            print("   case %d: return f%d();" % (i, i), file=H)
-        print("  }", file=H)
-        print("  abort();", file=H)
-        print("}", file=H)
-
-    print("", file=H)
-    print("}", file=H)
-    print("", file=H)
-    print("#endif // GRPC_CORE_LIB_PROMISE_DETAIL_SWITCH_H", file=H)
diff --git a/tools/distrib/install_all_python_modules.sh b/tools/distrib/install_all_python_modules.sh
index e7ef5b00242..41fc5111197 100755
--- a/tools/distrib/install_all_python_modules.sh
+++ b/tools/distrib/install_all_python_modules.sh
@@ -28,22 +28,29 @@ set -e
 BASEDIR=$(dirname "$0")
 BASEDIR=$(realpath "$BASEDIR")/../..
 
-PACKAGES="grpcio_channelz  grpcio_csds  grpcio_admin grpcio_health_checking  grpcio_reflection  grpcio_status  grpcio_testing  grpcio_tests"
+PACKAGES="grpcio_channelz  grpcio_csds  grpcio_admin grpcio_health_checking  grpcio_reflection  grpcio_status  grpcio_testing grpcio_tests"
 
 (cd "$BASEDIR";
-  pip install --upgrade cython;
+  pip install --upgrade "cython<3.0.0rc1";
   python setup.py install;
   pushd tools/distrib/python/grpcio_tools;
     ../make_grpcio_tools.py
     GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install .
   popd;
+  pushd src/python/grpcio_observability;
+    ./make_grpcio_observability.py
+    GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install .
+  popd;
+  pushd tools/distrib/python/xds_protos;
+    GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install .
+  popd;
   pushd src/python;
     for PACKAGE in ${PACKAGES}; do
       pushd "${PACKAGE}";
         python setup.py clean;
         maybe_run_command preprocess
         maybe_run_command build_package_protos
-        python setup.py install;
+        python -m pip install .;
       popd;
     done
   popd;
diff --git a/tools/dockerfile/distribtest/python_dev_ubuntu1804_x64.current_version b/tools/dockerfile/distribtest/python_dev_ubuntu1804_x64.current_version
deleted file mode 100644
index b3968343514..00000000000
--- a/tools/dockerfile/distribtest/python_dev_ubuntu1804_x64.current_version
+++ /dev/null
@@ -1 +0,0 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/python_dev_ubuntu1804_x64:483ff054a378bc704ae38ff1e1713947472c60d6@sha256:157a89cd6d0e69b89ac1975e0314aade556a35aafbaa5fe9f9890f90321d6c89
\ No newline at end of file
diff --git a/tools/dockerfile/distribtest/python_dev_ubuntu1804_x64/Dockerfile b/tools/dockerfile/distribtest/python_dev_ubuntu1804_x64/Dockerfile
deleted file mode 100644
index 8b15fdce2ac..00000000000
--- a/tools/dockerfile/distribtest/python_dev_ubuntu1804_x64/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2020 the gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM ubuntu:18.04
-
-RUN apt-get update -y && apt-get install -y python3 python3-pip
-
-RUN apt-get install -y build-essential
-RUN apt-get install -y python3-dev
-
-RUN python3 -m pip install virtualenv
diff --git a/tools/dockerfile/distribtest/python_ubuntu1804_x64.current_version b/tools/dockerfile/distribtest/python_ubuntu1804_x64.current_version
deleted file mode 100644
index 3a0b031a69d..00000000000
--- a/tools/dockerfile/distribtest/python_ubuntu1804_x64.current_version
+++ /dev/null
@@ -1 +0,0 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/python_ubuntu1804_x64:ee3ea8950f46d21ef06d3848294ae518c68f144f@sha256:edcd5f342d77ad9129cc0a0e6988b47b144815e7a93091d5b45e850111eefbcf
\ No newline at end of file
diff --git a/tools/dockerfile/distribtest/python_ubuntu1804_x64/Dockerfile b/tools/dockerfile/distribtest/python_ubuntu1804_x64/Dockerfile
deleted file mode 100644
index 30337403d67..00000000000
--- a/tools/dockerfile/distribtest/python_ubuntu1804_x64/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2020 the gRPC authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM ubuntu:18.04
-
-RUN apt-get update -y && apt-get install -y python3 python3-pip
-
-RUN python3 -m pip install virtualenv
diff --git a/tools/dockerfile/distribtest/ruby_ubuntu1804_x64.current_version b/tools/dockerfile/distribtest/ruby_ubuntu1804_x64.current_version
deleted file mode 100644
index a5daff2b3b4..00000000000
--- a/tools/dockerfile/distribtest/ruby_ubuntu1804_x64.current_version
+++ /dev/null
@@ -1 +0,0 @@
-us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_ubuntu1804_x64:aca247e97f04a9cd5922a310337a4b5ee646fb9d@sha256:d38b3dd34cffc027e9a1bf82bc7ace75b8a9829c2d04d5cf7cc8323655edd27a
\ No newline at end of file
diff --git a/tools/dockerfile/distribtest/ruby_ubuntu2004_x64.current_version b/tools/dockerfile/distribtest/ruby_ubuntu2004_x64.current_version
new file mode 100644
index 00000000000..e0f20260357
--- /dev/null
+++ b/tools/dockerfile/distribtest/ruby_ubuntu2004_x64.current_version
@@ -0,0 +1 @@
+us-docker.pkg.dev/grpc-testing/testing-images-public/ruby_ubuntu2004_x64:41b5e3380e01ef6687e29071fedc6d9b90d96d09@sha256:426cbf625df0c0e7451b9716041996dc6a35a3788c1a24d68891256f84733d8e
\ No newline at end of file
diff --git a/tools/dockerfile/distribtest/ruby_ubuntu1804_x64/Dockerfile b/tools/dockerfile/distribtest/ruby_ubuntu2004_x64/Dockerfile
similarity index 87%
rename from tools/dockerfile/distribtest/ruby_ubuntu1804_x64/Dockerfile
rename to tools/dockerfile/distribtest/ruby_ubuntu2004_x64/Dockerfile
index fa359aa95c6..f491661a57b 100644
--- a/tools/dockerfile/distribtest/ruby_ubuntu1804_x64/Dockerfile
+++ b/tools/dockerfile/distribtest/ruby_ubuntu2004_x64/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 # Install Git and basic packages.
 RUN apt-get update -y && apt-get install -y \
@@ -30,4 +30,6 @@ RUN /bin/bash -l -c "rvm use --default ruby-2.7"
 RUN /bin/bash -l -c "echo 'gem: --no-document' > ~/.gemrc"
 RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
 RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.7' >> ~/.bashrc"
-RUN /bin/bash -l -c "gem install bundler --no-document"
+# TODO(apolcyn): Bundler v2.4.22 is the last to support ruby 2.7. Latest bundler
+# requires ruby 3.
+RUN /bin/bash -l -c "gem install bundler --no-document -v 2.4.22"
diff --git a/tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh
index eb6cb8b0c9b..703bdd92ceb 100755
--- a/tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh
+++ b/tools/dockerfile/interoptest/grpc_interop_ruby/build_interop.sh
@@ -30,4 +30,4 @@ cd /var/local/git/grpc
 rvm --default use ruby-2.7
 
 # build Ruby interop client and server
-(cd src/ruby && gem install bundler && bundle && bundle exec rake compile)
+(cd src/ruby && gem install bundler -v 2.4.22 && bundle && bundle exec rake compile)
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 20e496e2642..8d399e8d873 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -2294,8 +2294,8 @@ src/core/lib/event_engine/posix_engine/internal_errqueue.cc \
 src/core/lib/event_engine/posix_engine/internal_errqueue.h \
 src/core/lib/event_engine/posix_engine/lockfree_event.cc \
 src/core/lib/event_engine/posix_engine/lockfree_event.h \
-src/core/lib/event_engine/posix_engine/native_dns_resolver.cc \
-src/core/lib/event_engine/posix_engine/native_dns_resolver.h \
+src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc \
+src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h \
 src/core/lib/event_engine/posix_engine/posix_endpoint.cc \
 src/core/lib/event_engine/posix_engine/posix_endpoint.h \
 src/core/lib/event_engine/posix_engine/posix_engine.cc \
@@ -2351,6 +2351,8 @@ src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc \
 src/core/lib/event_engine/windows/grpc_polled_fd_windows.h \
 src/core/lib/event_engine/windows/iocp.cc \
 src/core/lib/event_engine/windows/iocp.h \
+src/core/lib/event_engine/windows/native_windows_dns_resolver.cc \
+src/core/lib/event_engine/windows/native_windows_dns_resolver.h \
 src/core/lib/event_engine/windows/win_socket.cc \
 src/core/lib/event_engine/windows/win_socket.h \
 src/core/lib/event_engine/windows/windows_endpoint.cc \
@@ -2904,8 +2906,6 @@ src/core/lib/transport/metadata_batch.h \
 src/core/lib/transport/metadata_compression_traits.h \
 src/core/lib/transport/parsed_metadata.cc \
 src/core/lib/transport/parsed_metadata.h \
-src/core/lib/transport/pid_controller.cc \
-src/core/lib/transport/pid_controller.h \
 src/core/lib/transport/simple_slice_based_metadata.h \
 src/core/lib/transport/status_conversion.cc \
 src/core/lib/transport/status_conversion.h \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index b921b9a7559..095b92ed667 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -2070,8 +2070,8 @@ src/core/lib/event_engine/posix_engine/internal_errqueue.cc \
 src/core/lib/event_engine/posix_engine/internal_errqueue.h \
 src/core/lib/event_engine/posix_engine/lockfree_event.cc \
 src/core/lib/event_engine/posix_engine/lockfree_event.h \
-src/core/lib/event_engine/posix_engine/native_dns_resolver.cc \
-src/core/lib/event_engine/posix_engine/native_dns_resolver.h \
+src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.cc \
+src/core/lib/event_engine/posix_engine/native_posix_dns_resolver.h \
 src/core/lib/event_engine/posix_engine/posix_endpoint.cc \
 src/core/lib/event_engine/posix_engine/posix_endpoint.h \
 src/core/lib/event_engine/posix_engine/posix_engine.cc \
@@ -2127,6 +2127,8 @@ src/core/lib/event_engine/windows/grpc_polled_fd_windows.cc \
 src/core/lib/event_engine/windows/grpc_polled_fd_windows.h \
 src/core/lib/event_engine/windows/iocp.cc \
 src/core/lib/event_engine/windows/iocp.h \
+src/core/lib/event_engine/windows/native_windows_dns_resolver.cc \
+src/core/lib/event_engine/windows/native_windows_dns_resolver.h \
 src/core/lib/event_engine/windows/win_socket.cc \
 src/core/lib/event_engine/windows/win_socket.h \
 src/core/lib/event_engine/windows/windows_endpoint.cc \
@@ -2685,8 +2687,6 @@ src/core/lib/transport/metadata_batch.h \
 src/core/lib/transport/metadata_compression_traits.h \
 src/core/lib/transport/parsed_metadata.cc \
 src/core/lib/transport/parsed_metadata.h \
-src/core/lib/transport/pid_controller.cc \
-src/core/lib/transport/pid_controller.h \
 src/core/lib/transport/simple_slice_based_metadata.h \
 src/core/lib/transport/status_conversion.cc \
 src/core/lib/transport/status_conversion.h \
diff --git a/tools/gce/create_linux_kokoro_performance_worker.sh b/tools/gce/create_linux_kokoro_performance_worker.sh
index 62e0fdf4ad7..34e82af4e21 100755
--- a/tools/gce/create_linux_kokoro_performance_worker.sh
+++ b/tools/gce/create_linux_kokoro_performance_worker.sh
@@ -37,7 +37,7 @@ gcloud compute instances create "$INSTANCE_NAME" \
     --zone "$ZONE" \
     --machine-type $MACHINE_TYPE \
     --image-project ubuntu-os-cloud \
-    --image-family ubuntu-1804-lts \
+    --image-family ubuntu-2004-lts \
     --boot-disk-size 300 \
     --scopes https://www.googleapis.com/auth/bigquery \
     --tags=allow-ssh
diff --git a/tools/gce/linux_kokoro_performance_worker_init.sh b/tools/gce/linux_kokoro_performance_worker_init.sh
index 14083a2c889..06a950dee71 100755
--- a/tools/gce/linux_kokoro_performance_worker_init.sh
+++ b/tools/gce/linux_kokoro_performance_worker_init.sh
@@ -117,7 +117,7 @@ sudo apt-get update
 sudo apt-get install -y mono-devel
 
 # C# .NET Core dependencies (https://www.microsoft.com/net/download)
-wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb
+wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb
 sudo dpkg -i packages-microsoft-prod.deb
 
 sudo apt-get install -y apt-transport-https
diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py
index 35a92f3bfe4..eafb17b1e8a 100644
--- a/tools/interop_matrix/client_matrix.py
+++ b/tools/interop_matrix/client_matrix.py
@@ -433,7 +433,7 @@ LANG_RELEASE_MATRIX = {
             ("v1.57.2", ReleaseInfo()),
             ("v1.58.0", ReleaseInfo()),
             ("v1.59.1", ReleaseInfo()),
-            ("v1.60.0", ReleaseInfo()),
+            ("v1.60.1", ReleaseInfo()),
         ]
     ),
     "python": OrderedDict(
diff --git a/tools/run_tests/artifacts/distribtest_targets.py b/tools/run_tests/artifacts/distribtest_targets.py
index c5d2c3059fa..b611a1560a8 100644
--- a/tools/run_tests/artifacts/distribtest_targets.py
+++ b/tools/run_tests/artifacts/distribtest_targets.py
@@ -361,14 +361,14 @@ class CppDistribTest(object):
                 "tools/dockerfile/distribtest/cpp_%s_%s"
                 % (self.docker_suffix, self.arch),
                 "test/distrib/cpp/run_distrib_test_%s.sh" % self.testcase,
-                timeout_seconds=45 * 60,
+                timeout_seconds=60 * 60,
             )
         elif self.platform == "windows":
             return create_jobspec(
                 self.name,
                 ["test\\distrib\\cpp\\run_distrib_test_%s.bat" % self.testcase],
                 environ={},
-                timeout_seconds=45 * 60,
+                timeout_seconds=60 * 60,
                 use_workspace=True,
             )
         else:
@@ -477,7 +477,7 @@ def targets():
             "linux", "x64", "debian10", ruby_version="ruby_3_0", presubmit=True
         ),
         RubyDistribTest("linux", "x64", "centos7"),
-        RubyDistribTest("linux", "x64", "ubuntu1804"),
+        RubyDistribTest("linux", "x64", "ubuntu2004"),
         RubyDistribTest("linux", "x64", "ubuntu2204", presubmit=True),
         # PHP7
         PHP7DistribTest("linux", "x64", "debian10", presubmit=True),
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 97e35cd758b..a8edaa5d45a 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -803,6 +803,30 @@
     ],
     "uses_polling": false
   },
+  {
+    "args": [],
+    "benchmark": false,
+    "ci_platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "cpu_cost": 1.0,
+    "exclude_configs": [],
+    "exclude_iomgrs": [],
+    "flaky": false,
+    "gtest": true,
+    "language": "c++",
+    "name": "backend_metrics_lb_policy_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": true
+  },
   {
     "args": [],
     "benchmark": false,
@@ -2229,54 +2253,6 @@
     ],
     "uses_polling": true
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "client_transport_error_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "client_transport_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
   {
     "args": [],
     "benchmark": false,
@@ -3816,14 +3792,14 @@
     "flaky": false,
     "gtest": true,
     "language": "c++",
-    "name": "frame_header_test",
+    "name": "frame_test",
     "platforms": [
       "linux",
       "mac",
       "posix",
       "windows"
     ],
-    "uses_polling": true
+    "uses_polling": false
   },
   {
     "args": [],
@@ -6601,30 +6577,6 @@
     ],
     "uses_polling": false
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "pid_controller_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": true
-  },
   {
     "args": [],
     "benchmark": false,
@@ -9925,6 +9877,30 @@
     ],
     "uses_polling": false
   },
+  {
+    "args": [],
+    "benchmark": false,
+    "ci_platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "cpu_cost": 1.0,
+    "exclude_configs": [],
+    "exclude_iomgrs": [],
+    "flaky": false,
+    "gtest": true,
+    "language": "c++",
+    "name": "switch_test",
+    "platforms": [
+      "linux",
+      "mac",
+      "posix",
+      "windows"
+    ],
+    "uses_polling": false
+  },
   {
     "args": [],
     "benchmark": false,
@@ -10443,54 +10419,6 @@
     ],
     "uses_polling": false
   },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "test_core_transport_chaotic_good_frame_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": true
-  },
-  {
-    "args": [],
-    "benchmark": false,
-    "ci_platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "cpu_cost": 1.0,
-    "exclude_configs": [],
-    "exclude_iomgrs": [],
-    "flaky": false,
-    "gtest": true,
-    "language": "c++",
-    "name": "test_core_transport_chttp2_frame_test",
-    "platforms": [
-      "linux",
-      "mac",
-      "posix",
-      "windows"
-    ],
-    "uses_polling": false
-  },
   {
     "args": [],
     "benchmark": false,
diff --git a/tools/run_tests/helper_scripts/build_python.sh b/tools/run_tests/helper_scripts/build_python.sh
index 61e05497870..bae87c496e2 100755
--- a/tools/run_tests/helper_scripts/build_python.sh
+++ b/tools/run_tests/helper_scripts/build_python.sh
@@ -124,9 +124,9 @@ if [[ "$(inside_venv)" ]]; then
 else
   # Instantiate the virtualenv from the Python version passed in.
   $PYTHON -m pip install --user virtualenv==20.25.0
-  # Use --no-seed to prevent virtualenv from installing seed packages.
-  # Otherwise it might not find cython module while building grpcio.
-  $PYTHON -m virtualenv --no-seed "$VENV"
+  # Skip wheel and setuptools and manually install later. Otherwise we might
+  # not find cython module while building grpcio.
+  $PYTHON -m virtualenv --no-wheel --no-setuptools "$VENV"
   VENV_PYTHON="$(pwd)/$VENV/$VENV_RELATIVE_PYTHON"
 fi
 
@@ -134,7 +134,7 @@ pip_install() {
   $VENV_PYTHON -m pip install "$@"
 }
 
-$VENV_PYTHON -m ensurepip --upgrade
+pip_install --upgrade pip
 pip_install --upgrade wheel
 pip_install --upgrade setuptools==66.1.0
 
diff --git a/tools/run_tests/performance/bq_upload_result.py b/tools/run_tests/performance/bq_upload_result.py
index 1e582a74f22..f413ec17810 100755
--- a/tools/run_tests/performance/bq_upload_result.py
+++ b/tools/run_tests/performance/bq_upload_result.py
@@ -29,10 +29,12 @@ gcp_utils_dir = os.path.abspath(
 sys.path.append(gcp_utils_dir)
 import big_query_utils
 
-_PROJECT_ID = "grpc-testing"
+_DEFAULT_PROJECT_ID = "grpc-testing"
 
 
-def _upload_netperf_latency_csv_to_bigquery(dataset_id, table_id, result_file):
+def _upload_netperf_latency_csv_to_bigquery(
+    project_id, dataset_id, table_id, result_file
+):
     with open(result_file, "r") as f:
         (col1, col2, col3) = f.read().split(",")
         latency50 = float(col1.strip()) * 1000
@@ -52,13 +54,14 @@ def _upload_netperf_latency_csv_to_bigquery(dataset_id, table_id, result_file):
     _create_results_table(bq, dataset_id, table_id)
 
     if not _insert_result(
-        bq, dataset_id, table_id, scenario_result, flatten=False
+        bq, project_id, dataset_id, table_id, scenario_result, flatten=False
     ):
         print("Error uploading result to bigquery.")
         sys.exit(1)
 
 
 def _upload_scenario_result_to_bigquery(
+    project_id,
     dataset_id,
     table_id,
     result_file,
@@ -74,6 +77,7 @@ def _upload_scenario_result_to_bigquery(
 
     if not _insert_scenario_result(
         bq,
+        project_id,
         dataset_id,
         table_id,
         scenario_result,
@@ -85,18 +89,21 @@ def _upload_scenario_result_to_bigquery(
         sys.exit(1)
 
 
-def _insert_result(bq, dataset_id, table_id, scenario_result, flatten=True):
+def _insert_result(
+    bq, project_id, dataset_id, table_id, scenario_result, flatten=True
+):
     if flatten:
         _flatten_result_inplace(scenario_result)
     _populate_metadata_inplace(scenario_result)
     row = big_query_utils.make_row(str(uuid.uuid4()), scenario_result)
     return big_query_utils.insert_rows(
-        bq, _PROJECT_ID, dataset_id, table_id, [row]
+        bq, project_id, dataset_id, table_id, [row]
     )
 
 
 def _insert_scenario_result(
     bq,
+    project_id,
     dataset_id,
     table_id,
     scenario_result,
@@ -114,18 +121,18 @@ def _insert_scenario_result(
     )
     row = big_query_utils.make_row(str(uuid.uuid4()), scenario_result)
     return big_query_utils.insert_rows(
-        bq, _PROJECT_ID, dataset_id, table_id, [row]
+        bq, project_id, dataset_id, table_id, [row]
     )
 
 
-def _create_results_table(bq, dataset_id, table_id):
+def _create_results_table(bq, project_id, dataset_id, table_id):
     with open(
         os.path.dirname(__file__) + "/scenario_result_schema.json", "r"
     ) as f:
         table_schema = json.loads(f.read())
     desc = "Results of performance benchmarks."
     return big_query_utils.create_table2(
-        bq, _PROJECT_ID, dataset_id, table_id, table_schema, desc
+        bq, project_id, dataset_id, table_id, table_schema, desc
     )
 
 
@@ -333,7 +340,7 @@ argp.add_argument(
     required=True,
     default=None,
     type=str,
-    help='Bigquery "dataset.table" to upload results to.',
+    help='Bigquery "dataset.table" or "project.dataset.table" to upload results to. The default project is "grpc-testing".',
 )
 argp.add_argument(
     "--file_to_upload",
@@ -368,14 +375,25 @@ argp.add_argument(
 
 args = argp.parse_args()
 
-dataset_id, table_id = args.bq_result_table.split(".", 2)
+bq_words = args.bq_result_table.split(".", 2)
+if len(bq_words) == 3:
+    project_id, dataset_id, table_id = bq_words
+elif len(bq_words) == 2:
+    project_id = _DEFAULT_PROJECT_ID
+    dataset_id, table_id = bq_words
+else:
+    print(
+        "BigQuery table must be in the format dataset.table or project.dataset.table."
+    )
+    sys.exit(1)
 
 if args.file_format == "netperf_latency_csv":
     _upload_netperf_latency_csv_to_bigquery(
-        dataset_id, table_id, args.file_to_upload
+        project_id, dataset_id, table_id, args.file_to_upload
     )
 else:
     _upload_scenario_result_to_bigquery(
+        project_id,
         dataset_id,
         table_id,
         args.file_to_upload,
diff --git a/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/gamma_server_runner.py b/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/gamma_server_runner.py
index b50c6aa487b..745c6b8c018 100644
--- a/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/gamma_server_runner.py
+++ b/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/gamma_server_runner.py
@@ -115,6 +115,7 @@ class GammaServerRunner(KubernetesServerRunner):
         log_to_stdout: bool = False,
         bootstrap_version: Optional[str] = None,
         route_template: str = "gamma/route_http.yaml",
+        enable_csm_observability: bool = False,
     ) -> List[XdsTestServer]:
         if not maintenance_port:
             maintenance_port = self._get_default_maintenance_port(secure_mode)
@@ -206,6 +207,7 @@ class GammaServerRunner(KubernetesServerRunner):
             bootstrap_version=bootstrap_version,
             termination_grace_period_seconds=self.termination_grace_period_seconds,
             pre_stop_hook=self.pre_stop_hook,
+            enable_csm_observability=enable_csm_observability,
         )
 
         servers = self._make_servers_for_deployment(
diff --git a/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/k8s_base_runner.py b/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/k8s_base_runner.py
index 3df9bd19a25..f4b2685455e 100644
--- a/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/k8s_base_runner.py
+++ b/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/k8s_base_runner.py
@@ -299,6 +299,34 @@ class KubernetesBaseRunner(base_runner.BaseRunner, metaclass=ABCMeta):
         logger.info("Reusing namespace: %s", self.k8s_namespace.name)
         return self.k8s_namespace.get()
 
+    def _create_pod_monitoring(self, template, **kwargs) -> None:
+        if not kwargs["namespace_name"]:
+            raise _RunnerError(
+                "namespace_name required to create PodMonitoring resource"
+            )
+        if not kwargs["deployment_id"]:
+            raise _RunnerError(
+                "deployment_id required to create PodMonitoring resource"
+            )
+        if not kwargs["pod_monitoring_name"]:
+            raise _RunnerError(
+                "pod_monitoring_name required to create PodMonitoring resource"
+            )
+        pod_monitoring = self._create_from_template(
+            template, custom_object=True, **kwargs
+        )
+        if pod_monitoring.metadata.namespace != kwargs["namespace_name"]:
+            raise _RunnerError(
+                "PodMonitoring resource created with unexpected namespace: "
+                f"{pod_monitoring.metadata.namespace}"
+            )
+        logger.debug(
+            "PodMonitoring %s created at %s",
+            pod_monitoring.metadata.name,
+            pod_monitoring.metadata.creation_timestamp,
+        )
+        return pod_monitoring
+
     def _create_namespace(self, template, **kwargs) -> k8s.V1Namespace:
         namespace = self._create_from_template(template, **kwargs)
         if not isinstance(namespace, k8s.V1Namespace):
diff --git a/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/k8s_xds_client_runner.py b/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/k8s_xds_client_runner.py
index 215795412a6..dd26166ee31 100644
--- a/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/k8s_xds_client_runner.py
+++ b/tools/run_tests/xds_k8s_test_driver/framework/test_app/runners/k8s/k8s_xds_client_runner.py
@@ -104,6 +104,7 @@ class KubernetesClientRunner(k8s_base_runner.KubernetesBaseRunner):
         generate_mesh_id=False,
         print_response=False,
         log_to_stdout: bool = False,
+        enable_csm_observability: bool = False,
     ) -> XdsTestClient:
         logger.info(
             (
@@ -158,8 +159,19 @@ class KubernetesClientRunner(k8s_base_runner.KubernetesBaseRunner):
             config_mesh=config_mesh,
             generate_mesh_id=generate_mesh_id,
             print_response=print_response,
+            enable_csm_observability=enable_csm_observability,
         )
 
+        # Create a PodMonitoring resource if CSM Observability is enabled
+        # This is GMP (Google Managed Prometheus)
+        if enable_csm_observability:
+            self._create_pod_monitoring(
+                "csm/pod-monitoring.yaml",
+                namespace_name=self.k8s_namespace.name,
+                deployment_id=self.deployment_id,
+                pod_monitoring_name="%s-gmp" % self.deployment_id,
+            )
+
         # Load test client pod. We need only one client at the moment
         pod_name = self._wait_deployment_pod_count(self.deployment)[0]
         pod: k8s.V1Pod = self._wait_pod_started(pod_name)
diff --git a/tools/run_tests/xds_k8s_test_driver/kubernetes-manifests/client.deployment.yaml b/tools/run_tests/xds_k8s_test_driver/kubernetes-manifests/client.deployment.yaml
index 2b52c2cbe0e..13fad0f8cd3 100644
--- a/tools/run_tests/xds_k8s_test_driver/kubernetes-manifests/client.deployment.yaml
+++ b/tools/run_tests/xds_k8s_test_driver/kubernetes-manifests/client.deployment.yaml
@@ -42,6 +42,9 @@ spec:
           - "--rpc=${rpc}"
           - "--metadata=${metadata}"
           - "--print_response=${print_response}"
+          % if enable_csm_observability:
+          - "--enable_csm_observability"
+          % endif
         ports:
           - containerPort: ${stats_port}
         env:
diff --git a/tools/run_tests/xds_k8s_test_driver/kubernetes-manifests/csm/pod-monitoring.yaml b/tools/run_tests/xds_k8s_test_driver/kubernetes-manifests/csm/pod-monitoring.yaml
index bc5e53b35fe..3204f0f9a34 100644
--- a/tools/run_tests/xds_k8s_test_driver/kubernetes-manifests/csm/pod-monitoring.yaml
+++ b/tools/run_tests/xds_k8s_test_driver/kubernetes-manifests/csm/pod-monitoring.yaml
@@ -3,7 +3,9 @@ apiVersion: monitoring.googleapis.com/v1
 kind: PodMonitoring
 metadata:
   namespace: ${namespace_name}
-  name: ${deployment_id}-gmp
+  name: ${pod_monitoring_name}
+  labels:
+    owner: xds-k8s-interop-test
 spec:
   selector:
     matchLabels:
diff --git a/tools/run_tests/xds_k8s_test_driver/kubernetes-manifests/server.deployment.yaml b/tools/run_tests/xds_k8s_test_driver/kubernetes-manifests/server.deployment.yaml
index c8ed4a6b796..de823cc6f53 100644
--- a/tools/run_tests/xds_k8s_test_driver/kubernetes-manifests/server.deployment.yaml
+++ b/tools/run_tests/xds_k8s_test_driver/kubernetes-manifests/server.deployment.yaml
@@ -40,6 +40,9 @@ spec:
           failureThreshold: 1000
         args:
           - "--port=${test_port}"
+          % if enable_csm_observability:
+          - "--enable_csm_observability"
+          % endif
         ports:
           - containerPort: ${test_port}
         env:
diff --git a/tools/run_tests/xds_k8s_test_driver/tests/gamma/csm_observability_test.py b/tools/run_tests/xds_k8s_test_driver/tests/gamma/csm_observability_test.py
new file mode 100644
index 00000000000..7f0c09a13bf
--- /dev/null
+++ b/tools/run_tests/xds_k8s_test_driver/tests/gamma/csm_observability_test.py
@@ -0,0 +1,48 @@
+# Copyright 2023 gRPC authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import logging
+
+from absl import flags
+from absl.testing import absltest
+
+from framework import xds_gamma_testcase
+from framework import xds_k8s_testcase
+
+logger = logging.getLogger(__name__)
+flags.adopt_module_key_flags(xds_k8s_testcase)
+
+_XdsTestServer = xds_k8s_testcase.XdsTestServer
+_XdsTestClient = xds_k8s_testcase.XdsTestClient
+
+
+class CsmObservabilityTest(xds_gamma_testcase.GammaXdsKubernetesTestCase):
+    def test_ping_pong(self):
+        # TODO(sergiitk): [GAMMA] Consider moving out custom gamma
+        #   resource creation out of self.startTestServers()
+        with self.subTest("1_run_test_server"):
+            test_server: _XdsTestServer = self.startTestServers(
+                enable_csm_observability=True
+            )[0]
+
+        with self.subTest("2_start_test_client"):
+            test_client: _XdsTestClient = self.startTestClient(
+                test_server, enable_csm_observability=True
+            )
+
+        with self.subTest("3_test_server_received_rpcs_from_test_client"):
+            self.assertSuccessfulRpcs(test_client)
+
+
+if __name__ == "__main__":
+    absltest.main()