diff --git a/rdsn b/rdsn
index a53199d2b237388852298b230cededb2100f7029..4d6561d3885042548177e5d7d71e15b5cbefa99f 160000
--- a/rdsn
+++ b/rdsn
@@ -1 +1 @@
-Subproject commit a53199d2b237388852298b230cededb2100f7029
+Subproject commit 4d6561d3885042548177e5d7d71e15b5cbefa99f
diff --git a/src/client_lib/CMakeLists.txt b/src/client_lib/CMakeLists.txt
index 37d022fc568fec1574d37a7400ea507a96a0cd4e..2c47dd61f59388908f11c5710b197fb0a28d0faa 100644
--- a/src/client_lib/CMakeLists.txt
+++ b/src/client_lib/CMakeLists.txt
@@ -13,7 +13,7 @@ target_include_directories(pegasus_client_impl_objects PUBLIC $<TARGET_PROPERTY:
 set(pegasus_client_static_lib ${CMAKE_CURRENT_BINARY_DIR}/libpegasus_client_static.a)
 add_custom_target(combine_lib
     COMMAND ar -x ${DSN_ROOT}/lib/libdsn_runtime.a
-    COMMAND ar -x ${DSN_ROOT}/lib/libdsn_replication_client.a
+    COMMAND ar -x ${DSN_ROOT}/lib/libdsn_client.a
     COMMAND ar -x ${DSN_ROOT}/lib/libdsn_replication_common.a
     COMMAND ar -x ${DSN_THIRDPARTY_ROOT}/lib/libthrift.a
     COMMAND ar -x ${CMAKE_BINARY_DIR}/base/libpegasus_base.a
@@ -36,7 +36,7 @@ add_library(pegasus_client_shared SHARED $<TARGET_OBJECTS:pegasus_client_impl_ob
 target_link_libraries(pegasus_client_shared PRIVATE
     pegasus_base
     dsn_runtime
-    dsn_replication_client
+    dsn_client
     dsn_replication_common
     thrift)
 install(TARGETS pegasus_client_shared DESTINATION "lib")
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 3af9fe4aaede7a011e837feb9694311394fc2556..319538ae139cd785399a61f4568e900b6c2f79ed 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -13,12 +13,11 @@ set(MY_PROJ_LIBS
     dsn_replica_server
     dsn_meta_server
     dsn_replication_common
-    dsn.replication.ddlclient
+    dsn_client
     dsn.block_service.local
     dsn.block_service.fds
     dsn.block_service
     dsn.failure_detector
-    dsn.failure_detector.multimaster
     dsn.replication.zookeeper_provider
     RocksDB::rocksdb
     pegasus_reporter
diff --git a/src/server/test/CMakeLists.txt b/src/server/test/CMakeLists.txt
index e305c248464db4eec8f2d7ed076608b2a3acc098..5912876512fc0353af4d4cfce38dc18e73b7f02c 100644
--- a/src/server/test/CMakeLists.txt
+++ b/src/server/test/CMakeLists.txt
@@ -18,12 +18,11 @@ set(MY_PROJ_LIBS
         dsn_replica_server
         dsn_meta_server
         dsn_replication_common
-        dsn.replication.ddlclient
+        dsn_client
         dsn.block_service.local
         dsn.block_service.fds
         dsn.block_service
         dsn.failure_detector
-        dsn.failure_detector.multimaster
         dsn.replication.zookeeper_provider
         pegasus_reporter
         RocksDB::rocksdb
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index 856b0b7f8a5f5b91d244a0ce84791a6be0648486..11305a6ea08c60fc03e1868546a29f017664221f 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@@ -15,12 +15,11 @@ set(MY_PROJ_LIBS
     dsn.replication.tool
     dsn_replica_server
     dsn_replication_common
-    dsn.replication.ddlclient
+    dsn_client
     dsn.block_service.local
     dsn.block_service.fds
     dsn.block_service
     dsn.failure_detector
-    dsn.failure_detector.multimaster
     pegasus_client_static
     galaxy-fds-sdk-cpp
     PocoNet
diff --git a/src/test/function_test/CMakeLists.txt b/src/test/function_test/CMakeLists.txt
index c5700a9b9078a0f95265cc9b4bdf39a53cfda756..0ad0aad7be3ac3f7bf77d1e6a58fc050cfce8171 100644
--- a/src/test/function_test/CMakeLists.txt
+++ b/src/test/function_test/CMakeLists.txt
@@ -11,7 +11,7 @@ set(MY_PROJ_SRC "")
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
-    dsn.replication.ddlclient
+    dsn_client
     dsn_replication_common
     pegasus_client_static
     gtest
diff --git a/src/test/function_test/global_env.cpp b/src/test/function_test/global_env.cpp
index ad7f4740058aef363f140410137fd670fa2b0dad..f546dae2f9fec1842a1e7af1eb0fde85b01916e1 100644
--- a/src/test/function_test/global_env.cpp
+++ b/src/test/function_test/global_env.cpp
@@ -14,7 +14,6 @@
 #include <arpa/inet.h>
 
 #include "global_env.h"
-global_env global_env::inst;
 
 global_env::global_env()
 {
diff --git a/src/test/function_test/global_env.h b/src/test/function_test/global_env.h
index 543c907034fb748d8f1f6f9a8e6079be4eca5832..41ed13ea369c8d9c65701252790587dd9f0293ec 100644
--- a/src/test/function_test/global_env.h
+++ b/src/test/function_test/global_env.h
@@ -7,15 +7,13 @@
 #include <string>
 #include <sstream>
 
-class global_env
+class global_env : public dsn::utils::singleton<global_env>
 {
 public:
     std::string _pegasus_root;
     std::string _working_dir;
     std::string _host_ip;
 
-    static global_env &instance() { return inst; }
-
 private:
     global_env();
     global_env(const global_env &other) = delete;
@@ -23,5 +21,6 @@ private:
 
     void get_hostip();
     void get_dirs();
-    static global_env inst;
+
+    friend dsn::utils::singleton<global_env>;
 };
diff --git a/src/test/kill_test/CMakeLists.txt b/src/test/kill_test/CMakeLists.txt
index 6246d209e21965950d54cc580740ed3a1223b84a..2706310237fa87dbd634ca715c9b1dea93311cda 100644
--- a/src/test/kill_test/CMakeLists.txt
+++ b/src/test/kill_test/CMakeLists.txt
@@ -13,7 +13,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS
     pegasus_base
     pegasus_client_static
-    dsn.replication.ddlclient
+    dsn_client
     dsn_replication_common
     dsn_dist_cmd
     dsn_runtime
diff --git a/src/test/upgrade_test/CMakeLists.txt b/src/test/upgrade_test/CMakeLists.txt
index e84b9e9e48cf59e89ec1dda7a2e6fb0673218129..e1e7ea408faf2a0a4b2eaa13a5d3e506c5bf086c 100644
--- a/src/test/upgrade_test/CMakeLists.txt
+++ b/src/test/upgrade_test/CMakeLists.txt
@@ -13,7 +13,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS
     pegasus_base
     pegasus_client_static
-    dsn.replication.ddlclient
+    dsn_client
     dsn_replication_common
     dsn_runtime
     )