diff --git a/BUILD.gn b/BUILD.gn
index 83cc1ec4bda..1ae9ebe14fc 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1126,6 +1126,7 @@ config("grpc_config") {
         "include/grpcpp/security/credentials_impl.h",
         "include/grpcpp/security/server_credentials.h",
         "include/grpcpp/security/server_credentials_impl.h",
+        "include/grpcpp/security/tls_credentials_options.h",
         "include/grpcpp/server.h",
         "include/grpcpp/server_builder.h",
         "include/grpcpp/server_builder_impl.h",
@@ -1362,6 +1363,7 @@ config("grpc_config") {
         "src/cpp/common/secure_auth_context.h",
         "src/cpp/common/secure_channel_arguments.cc",
         "src/cpp/common/secure_create_auth_context.cc",
+        "src/cpp/common/tls_credentials_options.cc",
         "src/cpp/common/validate_service_config.cc",
         "src/cpp/common/version_cc.cc",
         "src/cpp/server/async_generic_service.cc",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e0aab56815..fb863dc8416 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3065,6 +3065,7 @@ add_library(grpc++
   src/cpp/common/secure_auth_context.cc
   src/cpp/common/secure_channel_arguments.cc
   src/cpp/common/secure_create_auth_context.cc
+  src/cpp/common/tls_credentials_options.cc
   src/cpp/server/insecure_server_credentials.cc
   src/cpp/server/secure_server_credentials.cc
   src/cpp/client/channel_cc.cc
@@ -3231,6 +3232,7 @@ foreach(_hdr
   include/grpcpp/security/credentials_impl.h
   include/grpcpp/security/server_credentials.h
   include/grpcpp/security/server_credentials_impl.h
+  include/grpcpp/security/tls_credentials_options.h
   include/grpcpp/server.h
   include/grpcpp/server_builder.h
   include/grpcpp/server_builder_impl.h
@@ -4309,6 +4311,7 @@ foreach(_hdr
   include/grpcpp/security/credentials_impl.h
   include/grpcpp/security/server_credentials.h
   include/grpcpp/security/server_credentials_impl.h
+  include/grpcpp/security/tls_credentials_options.h
   include/grpcpp/server.h
   include/grpcpp/server_builder.h
   include/grpcpp/server_builder_impl.h
diff --git a/Makefile b/Makefile
index 896287bb22e..e4eb3c51f60 100644
--- a/Makefile
+++ b/Makefile
@@ -5463,6 +5463,7 @@ LIBGRPC++_SRC = \
     src/cpp/common/secure_auth_context.cc \
     src/cpp/common/secure_channel_arguments.cc \
     src/cpp/common/secure_create_auth_context.cc \
+    src/cpp/common/tls_credentials_options.cc \
     src/cpp/server/insecure_server_credentials.cc \
     src/cpp/server/secure_server_credentials.cc \
     src/cpp/client/channel_cc.cc \
@@ -5594,6 +5595,7 @@ PUBLIC_HEADERS_CXX += \
     include/grpcpp/security/credentials_impl.h \
     include/grpcpp/security/server_credentials.h \
     include/grpcpp/security/server_credentials_impl.h \
+    include/grpcpp/security/tls_credentials_options.h \
     include/grpcpp/server.h \
     include/grpcpp/server_builder.h \
     include/grpcpp/server_builder_impl.h \
@@ -6619,6 +6621,7 @@ PUBLIC_HEADERS_CXX += \
     include/grpcpp/security/credentials_impl.h \
     include/grpcpp/security/server_credentials.h \
     include/grpcpp/security/server_credentials_impl.h \
+    include/grpcpp/security/tls_credentials_options.h \
     include/grpcpp/server.h \
     include/grpcpp/server_builder.h \
     include/grpcpp/server_builder_impl.h \
@@ -22402,6 +22405,7 @@ src/cpp/common/auth_property_iterator.cc: $(OPENSSL_DEP)
 src/cpp/common/secure_auth_context.cc: $(OPENSSL_DEP)
 src/cpp/common/secure_channel_arguments.cc: $(OPENSSL_DEP)
 src/cpp/common/secure_create_auth_context.cc: $(OPENSSL_DEP)
+src/cpp/common/tls_credentials_options.cc: $(OPENSSL_DEP)
 src/cpp/ext/proto_server_reflection.cc: $(OPENSSL_DEP)
 src/cpp/ext/proto_server_reflection_plugin.cc: $(OPENSSL_DEP)
 src/cpp/server/channelz/channelz_service.cc: $(OPENSSL_DEP)
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 56d6f5b3edb..7ff51fa08c9 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -121,6 +121,7 @@ Pod::Spec.new do |s|
                       'include/grpcpp/security/credentials_impl.h',
                       'include/grpcpp/security/server_credentials.h',
                       'include/grpcpp/security/server_credentials_impl.h',
+                      'include/grpcpp/security/tls_credentials_options.h',
                       'include/grpcpp/server.h',
                       'include/grpcpp/server_builder.h',
                       'include/grpcpp/server_builder_impl.h',
@@ -233,6 +234,7 @@ Pod::Spec.new do |s|
                       'src/cpp/common/secure_auth_context.cc',
                       'src/cpp/common/secure_channel_arguments.cc',
                       'src/cpp/common/secure_create_auth_context.cc',
+                      'src/cpp/common/tls_credentials_options.cc',
                       'src/cpp/server/insecure_server_credentials.cc',
                       'src/cpp/server/secure_server_credentials.cc',
                       'src/cpp/client/channel_cc.cc',
diff --git a/grpc.gyp b/grpc.gyp
index 2f6eb8fbd40..b9a30012fed 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -1456,6 +1456,7 @@
         'src/cpp/common/secure_auth_context.cc',
         'src/cpp/common/secure_channel_arguments.cc',
         'src/cpp/common/secure_create_auth_context.cc',
+        'src/cpp/common/tls_credentials_options.cc',
         'src/cpp/server/insecure_server_credentials.cc',
         'src/cpp/server/secure_server_credentials.cc',
         'src/cpp/client/channel_cc.cc',
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++
index e85ae495546..114d5147eef 100644
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@@ -1022,6 +1022,7 @@ include/grpcpp/security/credentials.h \
 include/grpcpp/security/credentials_impl.h \
 include/grpcpp/security/server_credentials.h \
 include/grpcpp/security/server_credentials_impl.h \
+include/grpcpp/security/tls_credentials_options.h \
 include/grpcpp/server.h \
 include/grpcpp/server_builder.h \
 include/grpcpp/server_builder_impl.h \
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 96da09eefc6..0e99b88a4db 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -1024,6 +1024,7 @@ include/grpcpp/security/credentials.h \
 include/grpcpp/security/credentials_impl.h \
 include/grpcpp/security/server_credentials.h \
 include/grpcpp/security/server_credentials_impl.h \
+include/grpcpp/security/tls_credentials_options.h \
 include/grpcpp/server.h \
 include/grpcpp/server_builder.h \
 include/grpcpp/server_builder_impl.h \
@@ -1263,6 +1264,7 @@ src/cpp/common/secure_auth_context.cc \
 src/cpp/common/secure_auth_context.h \
 src/cpp/common/secure_channel_arguments.cc \
 src/cpp/common/secure_create_auth_context.cc \
+src/cpp/common/tls_credentials_options.cc \
 src/cpp/common/validate_service_config.cc \
 src/cpp/common/version_cc.cc \
 src/cpp/server/async_generic_service.cc \
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 7cc164693e2..15f8d90b792 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -6914,6 +6914,7 @@
       "src/cpp/common/secure_auth_context.h", 
       "src/cpp/common/secure_channel_arguments.cc", 
       "src/cpp/common/secure_create_auth_context.cc", 
+      "src/cpp/common/tls_credentials_options.cc", 
       "src/cpp/server/insecure_server_credentials.cc", 
       "src/cpp/server/secure_server_credentials.cc", 
       "src/cpp/server/secure_server_credentials.h"
@@ -10630,6 +10631,7 @@
       "include/grpcpp/security/credentials_impl.h", 
       "include/grpcpp/security/server_credentials.h", 
       "include/grpcpp/security/server_credentials_impl.h", 
+      "include/grpcpp/security/tls_credentials_options.h", 
       "include/grpcpp/server.h", 
       "include/grpcpp/server_builder.h", 
       "include/grpcpp/server_builder_impl.h", 
@@ -10763,6 +10765,7 @@
       "include/grpcpp/security/credentials_impl.h", 
       "include/grpcpp/security/server_credentials.h", 
       "include/grpcpp/security/server_credentials_impl.h", 
+      "include/grpcpp/security/tls_credentials_options.h", 
       "include/grpcpp/server.h", 
       "include/grpcpp/server_builder.h", 
       "include/grpcpp/server_builder_impl.h",