diff --git a/BUILD b/BUILD
index 336789407957c0b0fdd660c31caf77793daec6e4..142c78bd17dcbed5b7205e8ca4efede2ee3e297d 100644
--- a/BUILD
+++ b/BUILD
@@ -303,6 +303,7 @@ cc_library(
     "src/core/ext/client_config/client_channel.c",
     "src/core/ext/client_config/client_channel_factory.c",
     "src/core/ext/client_config/client_config.c",
+    "src/core/ext/client_config/client_config_plugin.c",
     "src/core/ext/client_config/connector.c",
     "src/core/ext/client_config/default_initial_connect_string.c",
     "src/core/ext/client_config/initial_connect_string.c",
@@ -654,6 +655,7 @@ cc_library(
     "src/core/ext/client_config/client_channel.c",
     "src/core/ext/client_config/client_channel_factory.c",
     "src/core/ext/client_config/client_config.c",
+    "src/core/ext/client_config/client_config_plugin.c",
     "src/core/ext/client_config/connector.c",
     "src/core/ext/client_config/default_initial_connect_string.c",
     "src/core/ext/client_config/initial_connect_string.c",
@@ -1363,6 +1365,7 @@ objc_library(
     "src/core/ext/client_config/client_channel.c",
     "src/core/ext/client_config/client_channel_factory.c",
     "src/core/ext/client_config/client_config.c",
+    "src/core/ext/client_config/client_config_plugin.c",
     "src/core/ext/client_config/connector.c",
     "src/core/ext/client_config/default_initial_connect_string.c",
     "src/core/ext/client_config/initial_connect_string.c",
diff --git a/Makefile b/Makefile
index e7b3ca8a1e330ebdf32c46df983c92b2499bed39..001a4d8fa352f5d9913432342f695f9fe8e60f9f 100644
--- a/Makefile
+++ b/Makefile
@@ -2455,6 +2455,7 @@ LIBGRPC_SRC = \
     src/core/ext/client_config/client_channel.c \
     src/core/ext/client_config/client_channel_factory.c \
     src/core/ext/client_config/client_config.c \
+    src/core/ext/client_config/client_config_plugin.c \
     src/core/ext/client_config/connector.c \
     src/core/ext/client_config/default_initial_connect_string.c \
     src/core/ext/client_config/initial_connect_string.c \
@@ -2815,6 +2816,7 @@ LIBGRPC_UNSECURE_SRC = \
     src/core/ext/client_config/client_channel.c \
     src/core/ext/client_config/client_channel_factory.c \
     src/core/ext/client_config/client_config.c \
+    src/core/ext/client_config/client_config_plugin.c \
     src/core/ext/client_config/connector.c \
     src/core/ext/client_config/default_initial_connect_string.c \
     src/core/ext/client_config/initial_connect_string.c \
diff --git a/binding.gyp b/binding.gyp
index 508bf6bb5cb5b6e01a8b6b1d6caf7567d6329241..9349665e19a7d01226c7e269b140da334b4ad30f 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -571,6 +571,7 @@
         'src/core/ext/client_config/client_channel.c',
         'src/core/ext/client_config/client_channel_factory.c',
         'src/core/ext/client_config/client_config.c',
+        'src/core/ext/client_config/client_config_plugin.c',
         'src/core/ext/client_config/connector.c',
         'src/core/ext/client_config/default_initial_connect_string.c',
         'src/core/ext/client_config/initial_connect_string.c',
diff --git a/build.yaml b/build.yaml
index e33355ab1384812fa6d26d51e9c2dbd51ccfcdf1..8732967c8b44d554001d61ab1183c31e5ff4e511 100644
--- a/build.yaml
+++ b/build.yaml
@@ -446,6 +446,7 @@ filegroups:
   - src/core/ext/client_config/client_channel.c
   - src/core/ext/client_config/client_channel_factory.c
   - src/core/ext/client_config/client_config.c
+  - src/core/ext/client_config/client_config_plugin.c
   - src/core/ext/client_config/connector.c
   - src/core/ext/client_config/default_initial_connect_string.c
   - src/core/ext/client_config/initial_connect_string.c
diff --git a/config.m4 b/config.m4
index ecdc0f83cecda4feb79ac684b8ab3cb5f6522f34..6492999c16787898e953a4c12db717575288146d 100644
--- a/config.m4
+++ b/config.m4
@@ -93,6 +93,7 @@ if test "$PHP_GRPC" != "no"; then
     src/core/ext/client_config/client_channel.c \
     src/core/ext/client_config/client_channel_factory.c \
     src/core/ext/client_config/client_config.c \
+    src/core/ext/client_config/client_config_plugin.c \
     src/core/ext/client_config/connector.c \
     src/core/ext/client_config/default_initial_connect_string.c \
     src/core/ext/client_config/initial_connect_string.c \
diff --git a/gRPC.podspec b/gRPC.podspec
index 75c444caaad9c36b83007e07ed58a56eb3f52dcb..fb21b2dd5e2cc17e96f7e1d0affc9ecb97a1a75b 100644
--- a/gRPC.podspec
+++ b/gRPC.podspec
@@ -322,6 +322,7 @@ Pod::Spec.new do |s|
                       'src/core/ext/client_config/client_channel.c',
                       'src/core/ext/client_config/client_channel_factory.c',
                       'src/core/ext/client_config/client_config.c',
+                      'src/core/ext/client_config/client_config_plugin.c',
                       'src/core/ext/client_config/connector.c',
                       'src/core/ext/client_config/default_initial_connect_string.c',
                       'src/core/ext/client_config/initial_connect_string.c',
diff --git a/grpc.gemspec b/grpc.gemspec
index 7e30d791ad745b9f717e9b216e96eb3373b3bde1..e1dce54939a17cace016227b985dc8e00277f6ed 100755
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -305,6 +305,7 @@ Gem::Specification.new do |s|
   s.files += %w( src/core/ext/client_config/client_channel.c )
   s.files += %w( src/core/ext/client_config/client_channel_factory.c )
   s.files += %w( src/core/ext/client_config/client_config.c )
+  s.files += %w( src/core/ext/client_config/client_config_plugin.c )
   s.files += %w( src/core/ext/client_config/connector.c )
   s.files += %w( src/core/ext/client_config/default_initial_connect_string.c )
   s.files += %w( src/core/ext/client_config/initial_connect_string.c )
diff --git a/package.json b/package.json
index 4c05b673cf74670cafb9604663087df7ddf42ba5..f367935d028bca87e10762d27b6764b9ac4e7aff 100644
--- a/package.json
+++ b/package.json
@@ -248,6 +248,7 @@
     "src/core/ext/client_config/client_channel.c",
     "src/core/ext/client_config/client_channel_factory.c",
     "src/core/ext/client_config/client_config.c",
+    "src/core/ext/client_config/client_config_plugin.c",
     "src/core/ext/client_config/connector.c",
     "src/core/ext/client_config/default_initial_connect_string.c",
     "src/core/ext/client_config/initial_connect_string.c",
diff --git a/package.xml b/package.xml
index 5c1fb82d0e7c5b0e789269e3c19fe87b856bfbb4..5ac9c8d40211177d3d04c9565c7129563fb19cc3 100644
--- a/package.xml
+++ b/package.xml
@@ -309,6 +309,7 @@
     <file baseinstalldir="/" name="src/core/ext/client_config/client_channel.c" role="src" />
     <file baseinstalldir="/" name="src/core/ext/client_config/client_channel_factory.c" role="src" />
     <file baseinstalldir="/" name="src/core/ext/client_config/client_config.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/client_config/client_config_plugin.c" role="src" />
     <file baseinstalldir="/" name="src/core/ext/client_config/connector.c" role="src" />
     <file baseinstalldir="/" name="src/core/ext/client_config/default_initial_connect_string.c" role="src" />
     <file baseinstalldir="/" name="src/core/ext/client_config/initial_connect_string.c" role="src" />
diff --git a/src/core/ext/client_config/client_config_plugin.c b/src/core/ext/client_config/client_config_plugin.c
index 2ca72616d4006d5616d2685f5121fe0590d8a586..aac57b5e6ac099215ed15ff01093d0de5479c18d 100644
--- a/src/core/ext/client_config/client_config_plugin.c
+++ b/src/core/ext/client_config/client_config_plugin.c
@@ -32,10 +32,27 @@
  */
 
 #include <limits.h>
+#include <stdbool.h>
+#include <string.h>
+
+#include "src/core/ext/client_config/client_channel.h"
+#include "src/core/ext/client_config/lb_policy_registry.h"
+#include "src/core/ext/client_config/resolver_registry.h"
+#include "src/core/ext/client_config/subchannel_index.h"
+#include "src/core/lib/surface/channel_init.h"
+
+#ifndef GRPC_DEFAULT_NAME_PREFIX
+#define GRPC_DEFAULT_NAME_PREFIX "dns:///"
+#endif
+
+static bool append_filter(grpc_channel_stack_builder *builder, void *arg) {
+  return grpc_channel_stack_builder_append_filter(
+      builder, (const grpc_channel_filter *)arg, NULL, NULL);
+}
 
 static bool set_default_host_if_unset(grpc_channel_stack_builder *builder,
-                                      void *arg) {
-  grpc_channel_args *args =
+                                      void *unused) {
+  const grpc_channel_args *args =
       grpc_channel_stack_builder_get_channel_arguments(builder);
   for (size_t i = 0; i < args->num_args; i++) {
     if (0 == strcmp(args->args[i].key, GRPC_ARG_DEFAULT_AUTHORITY)) {
@@ -45,9 +62,11 @@ static bool set_default_host_if_unset(grpc_channel_stack_builder *builder,
   grpc_arg arg;
   arg.type = GRPC_ARG_STRING;
   arg.key = GRPC_ARG_DEFAULT_AUTHORITY;
-  arg.value.string = grpc_get_default_authority();
+  arg.value.string = grpc_get_default_authority(
+      grpc_channel_stack_builder_get_target(builder));
   grpc_channel_stack_builder_set_channel_arguments(
       builder, grpc_channel_args_copy_and_add(args, &arg, 1));
+  return true;
 }
 
 void grpc_client_config_init(void) {
diff --git a/src/core/lib/channel/channel_stack_builder.c b/src/core/lib/channel/channel_stack_builder.c
index f7544c9fbfa7bd6abe34f38c33a0cf1a9f06ed91..831736ad7a305c45857ad1f554fccb1324d58f65 100644
--- a/src/core/lib/channel/channel_stack_builder.c
+++ b/src/core/lib/channel/channel_stack_builder.c
@@ -84,6 +84,11 @@ void grpc_channel_stack_builder_set_target(grpc_channel_stack_builder *b,
   b->target = gpr_strdup(target);
 }
 
+const char *grpc_channel_stack_builder_get_target(
+    grpc_channel_stack_builder *b) {
+  return b->target;
+}
+
 static grpc_channel_stack_builder_iterator *create_iterator_at_filter_node(
     grpc_channel_stack_builder *builder, filter_node *node) {
   grpc_channel_stack_builder_iterator *it = gpr_malloc(sizeof(*it));
diff --git a/src/core/lib/channel/channel_stack_builder.h b/src/core/lib/channel/channel_stack_builder.h
index 752c65d57382a88f385c78fc76010e6206138f2f..0e6bfd9aa690e8ae8bc69a02c443eabb2f7898e3 100644
--- a/src/core/lib/channel/channel_stack_builder.h
+++ b/src/core/lib/channel/channel_stack_builder.h
@@ -55,6 +55,10 @@ void grpc_channel_stack_builder_set_name(grpc_channel_stack_builder *builder,
 /// Set the target uri
 void grpc_channel_stack_builder_set_target(grpc_channel_stack_builder *b,
                                            const char *target);
+
+const char *grpc_channel_stack_builder_get_target(
+    grpc_channel_stack_builder *b);
+
 /// Attach \a transport to the builder (does not take ownership)
 void grpc_channel_stack_builder_set_transport(
     grpc_channel_stack_builder *builder, grpc_transport *transport);
diff --git a/src/core/lib/surface/init.c b/src/core/lib/surface/init.c
index 9c0448d422de4d58e18395accbb98d03df557640..06c5dd4a3180f9a0f0fe41ec269dfc93d5bea9c2 100644
--- a/src/core/lib/surface/init.c
+++ b/src/core/lib/surface/init.c
@@ -59,10 +59,6 @@
 #include "src/core/lib/transport/connectivity_state.h"
 #include "src/core/lib/transport/transport_impl.h"
 
-#ifndef GRPC_DEFAULT_NAME_PREFIX
-#define GRPC_DEFAULT_NAME_PREFIX "dns:///"
-#endif
-
 /* (generated) built in registry of plugins */
 extern void grpc_register_built_in_plugins(void);
 
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index ee5c34c8498cfdff67ccf38a1f2abaaee3cd4245..62a0f463e264ba5123dde828b1f7e97b671becf7 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -87,6 +87,7 @@ CORE_SOURCE_FILES = [
   'src/core/ext/client_config/client_channel.c',
   'src/core/ext/client_config/client_channel_factory.c',
   'src/core/ext/client_config/client_config.c',
+  'src/core/ext/client_config/client_config_plugin.c',
   'src/core/ext/client_config/connector.c',
   'src/core/ext/client_config/default_initial_connect_string.c',
   'src/core/ext/client_config/initial_connect_string.c',
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 859a3500fd975c934aee225902d9b24de4d9bd74..14d8b6d9e2f3aaf61efd1affef147c7bad1ec001 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -921,6 +921,7 @@ src/core/ext/client_config/channel_connectivity.c \
 src/core/ext/client_config/client_channel.c \
 src/core/ext/client_config/client_channel_factory.c \
 src/core/ext/client_config/client_config.c \
+src/core/ext/client_config/client_config_plugin.c \
 src/core/ext/client_config/connector.c \
 src/core/ext/client_config/default_initial_connect_string.c \
 src/core/ext/client_config/initial_connect_string.c \
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index dfd0815cdb8af2540ff010e1868d650ba4c856b0..0291445a2f423e439c3acb0b46aecbed644e2f4c 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -5824,6 +5824,7 @@
       "src/core/ext/client_config/client_channel_factory.h", 
       "src/core/ext/client_config/client_config.c", 
       "src/core/ext/client_config/client_config.h", 
+      "src/core/ext/client_config/client_config_plugin.c", 
       "src/core/ext/client_config/connector.c", 
       "src/core/ext/client_config/connector.h", 
       "src/core/ext/client_config/default_initial_connect_string.c", 
diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj b/vsprojects/vcxproj/grpc/grpc.vcxproj
index f276bb8ca12415f8d27c3b6a42d134fac8b70f72..9cecf4118b0f8fe7c8b6c6f9ba1eaed02b19b28f 100644
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj
@@ -445,6 +445,8 @@
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c">
     </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config_plugin.c">
+    </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\connector.c">
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\default_initial_connect_string.c">
diff --git a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
index 124180c06115f0e547dcd7c85445e041bdd4c416..b1d000b914fb8a4d0d910788bbf276df4c6919d5 100644
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
@@ -40,6 +40,9 @@
     <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config_plugin.c">
+      <Filter>src\core\ext\client_config</Filter>
+    </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\connector.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
index a63f5e1911958eb9dd712026b518ed44b4fef768..1a9a6c12f49ad2a2b18530ac27673f77e465f131 100644
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
@@ -421,6 +421,8 @@
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c">
     </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config_plugin.c">
+    </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\connector.c">
     </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\default_initial_connect_string.c">
diff --git a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
index 1f65ebb511c62e2ba6cf756273fc940afc31df42..bab9e4dcfb0fa47fab5b04ad03f0ed1ea944e827 100644
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
@@ -40,6 +40,9 @@
     <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\client_config_plugin.c">
+      <Filter>src\core\ext\client_config</Filter>
+    </ClCompile>
     <ClCompile Include="$(SolutionDir)\..\src\core\ext\client_config\connector.c">
       <Filter>src\core\ext\client_config</Filter>
     </ClCompile>