diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 40399d85b742b080bf35012534fa733024a6b956..06f5518e474327d022f6fe1a2023957c22a75ffc 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -2650,6 +2650,8 @@ int tscBuildConnectMsg(SSqlObj *pSql) {
   db = (db == NULL) ? pObj->db : db + 1;
   strcpy(pConnect->db, db);
 
+  strcpy(pConnect->clientVersion, version);
+
   pMsg += sizeof(SConnectMsg);
 
   msgLen = pMsg - pStart;
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index a5aa304852722af63c846bae72aecb3c449eab57..25d94c6eafd942bb7b97140a660f1bab611d4b90 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -165,38 +165,12 @@ TAOS *taos_connect(const char *ip, const char *user, const char *pass, const cha
     STscObj *pObj = (STscObj *)taos;
 
     // version compare only requires the first 3 segments of the version string
-    int32_t comparedSegments = 3;
-    char    client_version[64] = {0};
-    char    server_version[64] = {0};
-    int     clientVersionNumber[4] = {0};
-    int     serverVersionNumber[4] = {0};
-
-    strcpy(client_version, version);
-    strcpy(server_version, taos_get_server_info(taos));
-
-    if (!taosGetVersionNumber(client_version, clientVersionNumber)) {
-      tscError("taos:%p, invalid client version:%s", taos, client_version);
-      pObj->pSql->res.code = TSDB_CODE_INVALID_CLIENT_VERSION;
+    int code = taosCheckVersion(version, taos_get_server_info(taos), 3);
+    if (code != 0) {
+      pObj->pSql->res.code = code;
       taos_close(taos);
       return NULL;
     }
-
-    if (!taosGetVersionNumber(server_version, serverVersionNumber)) {
-      tscError("taos:%p, invalid server version:%s", taos, server_version);
-      pObj->pSql->res.code = TSDB_CODE_INVALID_CLIENT_VERSION;
-      taos_close(taos);
-      return NULL;
-    }
-
-    for (int32_t i = 0; i < comparedSegments; ++i) {
-      if (clientVersionNumber[i] != serverVersionNumber[i]) {
-        tscError("taos:%p, the %d-th number of server version:%s not matched with client version:%s, close connection",
-                 taos, i, server_version, version);
-        pObj->pSql->res.code = TSDB_CODE_INVALID_CLIENT_VERSION;
-        taos_close(taos);
-        return NULL;
-      }
-    }
   }
 
   return taos;
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index 895cf23cf864cdd9de998ff4c6bce1e967d0538b..7f9f6420c5cc9da08d9e65649fc037248e218e15 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -222,6 +222,7 @@ typedef struct {
 
   // internal part
   uint32_t destId;
+  uint32_t destIp;
   char     meterId[TSDB_UNI_LEN];
   uint16_t port;  // for UDP only
   char     empty[1];
@@ -350,6 +351,7 @@ typedef struct {
 } SAlterTableMsg;
 
 typedef struct {
+  char clientVersion[TSDB_VERSION_LEN];
   char db[TSDB_METER_ID_LEN];
 } SConnectMsg;
 
@@ -662,6 +664,7 @@ typedef struct {
 // internal message
 typedef struct {
   uint32_t destId;
+  uint32_t destIp;
   char     meterId[TSDB_UNI_LEN];
   char     empty[3];
   uint8_t  msgType;
diff --git a/src/inc/tglobalcfg.h b/src/inc/tglobalcfg.h
index def7fb9a67650127f92daa4655ff91a4dbcee2b2..37e8e20681c2b75762f5e7ffaba764652374f9d1 100644
--- a/src/inc/tglobalcfg.h
+++ b/src/inc/tglobalcfg.h
@@ -74,13 +74,13 @@ extern int tsMetricMetaKeepTimer;
 extern float tsNumOfThreadsPerCore;
 extern float tsRatioOfQueryThreads;
 extern char  tsPublicIp[];
-extern char  tsInternalIp[];
 extern char  tsPrivateIp[];
 extern char  tsServerIpStr[];
 extern short tsNumOfVnodesPerCore;
 extern short tsNumOfTotalVnodes;
 extern short tsCheckHeaderFile;
 extern uint32_t tsServerIp;
+extern uint32_t tsPublicIpInt;
 
 extern int tsSessionsPerVnode;
 extern int tsAverageCacheBlocks;
@@ -151,6 +151,8 @@ extern int   tsTelegrafUseFieldNum;
 extern int   tsAdminRowLimit;
 
 extern int   tsTscEnableRecordSql;
+extern int   tsAnyIp;
+extern int   tsIsCluster;
 
 extern char tsMonitorDbName[];
 extern char tsInternalPass[];
diff --git a/src/inc/tutil.h b/src/inc/tutil.h
index d978e76360c0fa9375522b4c46c4243d8fc680b1..f3576790a93ad7c056aa7073b8ab55cbcc5da217 100644
--- a/src/inc/tutil.h
+++ b/src/inc/tutil.h
@@ -187,6 +187,8 @@ static FORCE_INLINE void taosEncryptPass(uint8_t *inBuf, unsigned int inLen, cha
   memcpy(target, context.digest, TSDB_KEY_LEN);
 }
 
+int taosCheckVersion(char *input_client_version, char *input_server_version, int compared_segments);
+
 char *taosIpStr(uint32_t ipInt);
 
 uint32_t ip2uint(const char *const ip_addr);
diff --git a/src/modules/monitor/src/monitorSystem.c b/src/modules/monitor/src/monitorSystem.c
index f89f2596886c5a94e1c6b80f7168f337e94192cb..54f4009a22ed51b78af25baa5cf8c0c9a6c7a0af 100644
--- a/src/modules/monitor/src/monitorSystem.c
+++ b/src/modules/monitor/src/monitorSystem.c
@@ -114,11 +114,7 @@ void monitorInitConn(void *para, void *unused) {
   monitor->state = MONITOR_STATE_INITIALIZING;
 
   if (monitor->privateIpStr[0] == 0) {
-#ifdef CLUSTER
     strcpy(monitor->privateIpStr, tsPrivateIp);
-#else
-    strcpy(monitor->privateIpStr, tsInternalIp);
-#endif
     for (int i = 0; i < TSDB_IPv4ADDR_LEN; ++i) {
       if (monitor->privateIpStr[i] == '.') {
         monitor->privateIpStr[i] = '_';
@@ -168,11 +164,7 @@ void dnodeBuildMonitorSql(char *sql, int cmd) {
              tsMonitorDbName, IP_LEN_STR + 1);
   } else if (cmd == MONITOR_CMD_CREATE_TB_DN) {
     snprintf(sql, SQL_LENGTH, "create table if not exists %s.dn_%s using %s.dn tags('%s')", tsMonitorDbName,
-#ifdef CLUSTER
              monitor->privateIpStr, tsMonitorDbName, tsPrivateIp);
-#else
-             monitor->privateIpStr, tsMonitorDbName, tsInternalIp);
-#endif
   } else if (cmd == MONITOR_CMD_CREATE_MT_ACCT) {
     snprintf(sql, SQL_LENGTH,
              "create table if not exists %s.acct(ts timestamp "
@@ -227,10 +219,8 @@ void monitorInitDatabaseCb(void *param, TAOS_RES *result, int code) {
       taosLogSqlFp = monitorExecuteSQL;
 #ifdef CLUSTER
       taosLogAcctFp = monitorSaveAcctLog;
-      monitorLPrint("dnode:%s is started", tsPrivateIp);
-#else
-      monitorLPrint("dnode:%s is started", tsInternalIp);
 #endif
+      monitorLPrint("dnode:%s is started", tsPrivateIp);
     }
     monitor->cmdIndex++;
     monitorInitDatabase();
@@ -246,11 +236,7 @@ void monitorStopSystem() {
     return;
   }
 
-#ifdef CLUSTER
   monitorLPrint("dnode:%s monitor module is stopped", tsPrivateIp);
-#else
-  monitorLPrint("dnode:%s monitor module is stopped", tsInternalIp);
-#endif
   monitor->state = MONITOR_STATE_STOPPED;
   taosLogFp = NULL;
   if (monitor->initTimer != NULL) {
@@ -440,11 +426,7 @@ void monitorSaveLog(int level, const char *const format, ...) {
   va_end(argpointer);
   if (len > max_length) len = max_length;
 
-#ifdef CLUSTER
   len += sprintf(sql + len, "', '%s')", tsPrivateIp);
-#else
-  len += sprintf(sql + len, "', '%s')", tsInternalIp);
-#endif
   sql[len++] = 0;
 
   monitorTrace("monitor:%p, save log, sql: %s", monitor->conn, sql);
diff --git a/src/os/linux/src/tsystem.c b/src/os/linux/src/tsystem.c
index 611ede73b56e58a6712e0b5d6160892f990e3777..055a67e0772f1a9595fa2825514358e9ef16083c 100644
--- a/src/os/linux/src/tsystem.c
+++ b/src/os/linux/src/tsystem.c
@@ -381,8 +381,8 @@ bool taosGetCardName(char *ip, char *name) {
 bool taosGetCardInfo(int64_t *bytes) {
   static char tsPublicCard[1000] = {0};
   if (tsPublicCard[0] == 0) {
-    if (!taosGetCardName(tsInternalIp, tsPublicCard)) {
-      pError("can't get card name from ip:%s", tsInternalIp);
+    if (!taosGetCardName(tsPrivateIp, tsPublicCard)) {
+      pError("can't get card name from ip:%s", tsPrivateIp);
       return false;
     }
     int cardNameLen = (int)strlen(tsPublicCard);
diff --git a/src/rpc/src/trpc.c b/src/rpc/src/trpc.c
index 04ef809b8e6c4d74cb1f915a47c8595fe71e1acb..5071376bcd22c2afe29411b4a1ba096f520ef948 100755
--- a/src/rpc/src/trpc.c
+++ b/src/rpc/src/trpc.c
@@ -1222,6 +1222,7 @@ int taosSendMsgToPeerH(void *thandle, char *pCont, int contLen, void *ahandle) {
   pServer = pConn->pServer;
   pChann = pServer->channList + pConn->chann;
   pHeader = (STaosHeader *)(pCont - sizeof(STaosHeader));
+  pHeader->destIp = pConn->peerIp;
   msg = (char *)pHeader;
 
   if ((pHeader->msgType & 1U) == 0 && pConn->localPort) pHeader->port = pConn->localPort;
diff --git a/src/system/detail/inc/mgmt.h b/src/system/detail/inc/mgmt.h
index c75422e23ee7a69323bef151a8dbb4544a4a1a76..f837f7242404f3fd5e03abcd3bf7eb43396459f3 100644
--- a/src/system/detail/inc/mgmt.h
+++ b/src/system/detail/inc/mgmt.h
@@ -222,6 +222,8 @@ typedef struct _connObj {
   char             superAuth : 1;       // super user flag
   char             writeAuth : 1;       // write flag
   char             killConnection : 1;  // kill the connection flag
+  uint8_t          usePublicIp : 1;     // if the connection request is publicIp
+  uint8_t          reserved : 4;
   uint32_t         queryId;             // query ID to be killed
   uint32_t         streamId;            // stream ID to be killed
   uint32_t         ip;                  // shell IP
@@ -343,7 +345,7 @@ void mgmtCleanUpVgroups();
 int      mgmtInitMeters();
 STabObj *mgmtGetMeter(char *meterId);
 STabObj *mgmtGetMeterInfo(char *src, char *tags[]);
-int mgmtRetrieveMetricMeta(void *thandle, char **pStart, SMetricMetaMsg *pInfo);
+int mgmtRetrieveMetricMeta(SConnObj *pConn, char **pStart, SMetricMetaMsg *pInfo);
 int mgmtCreateMeter(SDbObj *pDb, SCreateTableMsg *pCreate);
 int mgmtDropMeter(SDbObj *pDb, char *meterId, int ignore);
 int mgmtAlterMeter(SDbObj *pDb, SAlterTableMsg *pAlter);
diff --git a/src/system/detail/src/dnodeService.c b/src/system/detail/src/dnodeService.c
index 2de60bda91f2fb172c2741cac6d15932b93e7d55..742efb7b6a72856095759d7bf8262f50103185f8 100644
--- a/src/system/detail/src/dnodeService.c
+++ b/src/system/detail/src/dnodeService.c
@@ -55,12 +55,8 @@ int main(int argc, char *argv[]) {
         exit(EXIT_FAILURE);
       }
     } else if (strcmp(argv[i], "-V") == 0) {
-      #ifdef CLUSTER
-        printf("enterprise version: %s compatible_version: %s\n", version, compatible_version);
-      #else
-        printf("community version: %s compatible_version: %s\n", version, compatible_version);
-      #endif
-      
+      char *versionStr = tsIsCluster ? "enterprise" : "community";
+      printf("%s version: %s compatible_version: %s\n", versionStr, version, compatible_version);
       printf("gitinfo: %s\n", gitinfo);
       printf("gitinfoI: %s\n", gitinfoOfInternal);
       printf("buildinfo: %s\n", buildinfo);
diff --git a/src/system/detail/src/dnodeSystem.c b/src/system/detail/src/dnodeSystem.c
index 1ebeeec06169a10f6cc379e7288a61597d48b9f4..49e9a37590996921b1784c56e5edca4246fd2bd0 100644
--- a/src/system/detail/src/dnodeSystem.c
+++ b/src/system/detail/src/dnodeSystem.c
@@ -136,7 +136,7 @@ int dnodeInitSystem() {
   vnodeInitMgmtIp();
 
   tsPrintGlobalConfig();
-  dPrint("Server IP address is:%s", tsInternalIp);
+  dPrint("Server IP address is:%s", tsPrivateIp);
 
   taosSetCoreDump();
 
diff --git a/src/system/detail/src/mgmtMeter.c b/src/system/detail/src/mgmtMeter.c
index be141f278ddb6cac0c2bc98abee4c350d1974667..0f60efadc6ac825b183234996bfcca29fcc2cce2 100644
--- a/src/system/detail/src/mgmtMeter.c
+++ b/src/system/detail/src/mgmtMeter.c
@@ -987,7 +987,7 @@ SSchema *mgmtGetMeterSchema(STabObj *pMeter) {
 /*
  * serialize SVnodeSidList to byte array
  */
-static char *mgmtBuildMetricMetaMsg(STabObj *pMeter, int32_t *ovgId, SVnodeSidList **pList, SMetricMeta *pMeta,
+static char *mgmtBuildMetricMetaMsg(SConnObj *pConn, STabObj *pMeter, int32_t *ovgId, SVnodeSidList **pList, SMetricMeta *pMeta,
                                     int32_t tagLen, int16_t numOfTags, int16_t *tagsId, int32_t maxNumOfMeters,
                                     char *pMsg) {
   if (pMeter->gid.vgId != *ovgId || ((*pList) != NULL && (*pList)->numOfSids >= maxNumOfMeters)) {
@@ -1004,8 +1004,13 @@ static char *mgmtBuildMetricMetaMsg(STabObj *pMeter, int32_t *ovgId, SVnodeSidLi
 
     SVgObj *pVgroup = mgmtGetVgroup(pMeter->gid.vgId);
     for (int i = 0; i < TSDB_VNODES_SUPPORT; ++i) {
-      (*pList)->vpeerDesc[i].ip = pVgroup->vnodeGid[i].publicIp;
-      (*pList)->vpeerDesc[i].vnode = pVgroup->vnodeGid[i].vnode;
+      if (pConn->usePublicIp) {
+        (*pList)->vpeerDesc[i].ip = pVgroup->vnodeGid[i].publicIp;
+        (*pList)->vpeerDesc[i].vnode = pVgroup->vnodeGid[i].vnode;
+      } else {
+        (*pList)->vpeerDesc[i].ip = pVgroup->vnodeGid[i].ip;
+        (*pList)->vpeerDesc[i].vnode = pVgroup->vnodeGid[i].vnode;
+      }
     }
 
     pMsg += sizeof(SVnodeSidList);
@@ -1105,10 +1110,10 @@ static SMetricMetaElemMsg *doConvertMetricMetaMsg(SMetricMetaMsg *pMetricMetaMsg
   return pElem;
 }
 
-static int32_t mgmtBuildMetricMetaRspMsg(void *thandle, SMetricMetaMsg *pMetricMetaMsg, tQueryResultset *pResult,
+static int32_t mgmtBuildMetricMetaRspMsg(SConnObj *pConn, SMetricMetaMsg *pMetricMetaMsg, tQueryResultset *pResult,
                                          char **pStart, int32_t *tagLen, int32_t rspMsgSize, int32_t maxTablePerVnode,
                                          int32_t code) {
-  *pStart = taosBuildRspMsgWithSize(thandle, TSDB_MSG_TYPE_METRIC_META_RSP, rspMsgSize);
+  *pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_METRIC_META_RSP, rspMsgSize);
   if (*pStart == NULL) {
     return 0;
   }
@@ -1146,7 +1151,7 @@ static int32_t mgmtBuildMetricMetaRspMsg(void *thandle, SMetricMetaMsg *pMetricM
 
     for (int32_t i = 0; i < pResult[j].num; ++i) {
       STabObj *pMeter = pResult[j].pRes[i];
-      pMsg = mgmtBuildMetricMetaMsg(pMeter, &ovgId, &pList, pMeta, tagLen[j], pElem->numOfTags, pElem->tagCols,
+      pMsg = mgmtBuildMetricMetaMsg(pConn, pMeter, &ovgId, &pList, pMeta, tagLen[j], pElem->numOfTags, pElem->tagCols,
                                     maxTablePerVnode, pMsg);
     }
 
@@ -1162,7 +1167,7 @@ static int32_t mgmtBuildMetricMetaRspMsg(void *thandle, SMetricMetaMsg *pMetricM
   return msgLen;
 }
 
-int mgmtRetrieveMetricMeta(void *thandle, char **pStart, SMetricMetaMsg *pMetricMetaMsg) {
+int mgmtRetrieveMetricMeta(SConnObj *pConn, char **pStart, SMetricMetaMsg *pMetricMetaMsg) {
   /*
    * naive method: Do not limit the maximum number of meters in each
    * vnode(subquery), split the result according to vnodes
@@ -1236,8 +1241,7 @@ int mgmtRetrieveMetricMeta(void *thandle, char **pStart, SMetricMetaMsg *pMetric
     msgLen = 512;
   }
 
-  msgLen = mgmtBuildMetricMetaRspMsg(thandle, pMetricMetaMsg, result, pStart, tagLen, msgLen, maxMetersPerVNodeForQuery,
-                                     ret);
+  msgLen = mgmtBuildMetricMetaRspMsg(pConn, pMetricMetaMsg, result, pStart, tagLen, msgLen, maxMetersPerVNodeForQuery, ret);
 
   for (int32_t i = 0; i < pMetricMetaMsg->numOfMeters; ++i) {
     tQueryResultClean(&result[i]);
diff --git a/src/system/detail/src/mgmtShell.c b/src/system/detail/src/mgmtShell.c
index f6b2d7ba9b321d70e6e9240005607421ebc67917..f382abb6021e01a6713f66a715565db8257f7399 100644
--- a/src/system/detail/src/mgmtShell.c
+++ b/src/system/detail/src/mgmtShell.c
@@ -73,11 +73,8 @@ int mgmtInitShell() {
   if (numOfThreads < 1) numOfThreads = 1;
 
   memset(&rpcInit, 0, sizeof(rpcInit));
-#ifdef CLUSTER
-  rpcInit.localIp = tsInternalIp;
-#else
-  rpcInit.localIp = "0.0.0.0";
-#endif
+
+  rpcInit.localIp = tsAnyIp ? "0.0.0.0" : tsPrivateIp;;
   rpcInit.localPort = tsMgmtShellPort;
   rpcInit.label = "MND-shell";
   rpcInit.numOfThreads = numOfThreads;
@@ -311,8 +308,13 @@ int mgmtProcessMeterMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) {
         goto _exit_code;
       }
       for (int i = 0; i < TSDB_VNODES_SUPPORT; ++i) {
-        pMeta->vpeerDesc[i].ip = pVgroup->vnodeGid[i].publicIp;
-        pMeta->vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
+        if (pConn->usePublicIp) {
+          pMeta->vpeerDesc[i].ip = pVgroup->vnodeGid[i].publicIp;
+          pMeta->vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
+        } else {
+          pMeta->vpeerDesc[i].ip = pVgroup->vnodeGid[i].ip;
+          pMeta->vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
+        }
       }
     }
   }
@@ -450,8 +452,13 @@ int mgmtProcessMultiMeterMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) {
         }
 
         for (int i = 0; i < TSDB_VNODES_SUPPORT; ++i) {
-          pMeta->meta.vpeerDesc[i].ip = pVgroup->vnodeGid[i].publicIp;
-          pMeta->meta.vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
+          if (pConn->usePublicIp) {
+            pMeta->meta.vpeerDesc[i].ip = pVgroup->vnodeGid[i].publicIp;
+            pMeta->meta.vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
+          } else {
+            pMeta->meta.vpeerDesc[i].ip = pVgroup->vnodeGid[i].ip;
+            pMeta->meta.vpeerDesc[i].vnode = htonl(pVgroup->vnodeGid[i].vnode);
+          }
         }
       }
     }
@@ -523,7 +530,7 @@ int mgmtProcessMetricMetaMsg(char *pMsg, int msgLen, SConnObj *pConn) {
 
     msgLen = pMsg - pStart;
   } else {
-    msgLen = mgmtRetrieveMetricMeta(pConn->thandle, &pStart, pMetricMetaMsg);
+    msgLen = mgmtRetrieveMetricMeta(pConn, &pStart, pMetricMetaMsg);
     if (msgLen <= 0) {
       taosSendSimpleRsp(pConn->thandle, TSDB_MSG_TYPE_METRIC_META_RSP, TSDB_CODE_SERV_OUT_OF_MEMORY);
       return 0;
@@ -1103,10 +1110,17 @@ int mgmtProcessHeartBeatMsg(char *cont, int contLen, SConnObj *pConn) {
   pHBRsp->killConnection = pConn->killConnection;
 
 #ifdef CLUSTER
-  int size = pSdbPublicIpList->numOfIps * 4;
-  pHBRsp->ipList.numOfIps = pSdbPublicIpList->numOfIps;
-  memcpy(pHBRsp->ipList.ip, pSdbPublicIpList->ip, size);
-  pMsg += sizeof(SHeartBeatRsp) + size;
+  if (pConn->usePublicIp) {
+    int size = pSdbPublicIpList->numOfIps * 4;
+    pHBRsp->ipList.numOfIps = pSdbPublicIpList->numOfIps;
+    memcpy(pHBRsp->ipList.ip, pSdbPublicIpList->ip, size);
+    pMsg += sizeof(SHeartBeatRsp) + size;
+  } else {
+    int size = pSdbIpList->numOfIps * 4;
+    pHBRsp->ipList.numOfIps = pSdbIpList->numOfIps;
+    memcpy(pHBRsp->ipList.ip, pSdbIpList->ip, size);
+    pMsg += sizeof(SHeartBeatRsp) + size;
+  }
 #else
   pMsg += sizeof(SHeartBeatRsp);
 #endif
@@ -1183,6 +1197,12 @@ int mgmtProcessConnectMsg(char *pMsg, int msgLen, SConnObj *pConn) {
 
   pAcct = mgmtGetAcct(pUser->acct);
 
+  code = taosCheckVersion(pConnectMsg->clientVersion, version, 3);
+  if (code != 0) {
+    mError("invalid client version:%s", pConnectMsg->clientVersion);
+    goto _rsp;
+  }
+
   if (pConnectMsg->db[0]) {
     sprintf(dbName, "%x%s%s", pAcct->acctId, TS_PATH_DELIMITER, pConnectMsg->db);
     pDb = mgmtGetDb(dbName);
@@ -1203,7 +1223,7 @@ int mgmtProcessConnectMsg(char *pMsg, int msgLen, SConnObj *pConn) {
   pConn->pDb = pDb;
   pConn->pUser = pUser;
   mgmtEstablishConn(pConn);
-
+  
 _rsp:
   pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_CONNECT_RSP, 128);
   if (pStart == NULL) return 0;
@@ -1223,7 +1243,11 @@ _rsp:
 
 #ifdef CLUSTER
     int size = pSdbPublicIpList->numOfIps * 4 + sizeof(SIpList);
-    memcpy(pMsg, pSdbPublicIpList, size);
+    if (pConn->usePublicIp) {
+      memcpy(pMsg, pSdbPublicIpList, size);
+    } else {
+      memcpy(pMsg, pSdbIpList, size);
+    }
     pMsg += size;
 #endif
 
@@ -1273,6 +1297,9 @@ void *mgmtProcessMsgFromShell(char *msg, void *ahandle, void *thandle) {
     pConn = connList + pMsg->destId;
     pConn->thandle = thandle;
     strcpy(pConn->user, pMsg->meterId);
+    pConn->usePublicIp = (pMsg->destIp == tsPublicIpInt ? 1 : 0);
+    mTrace("pConn:%p is rebuild, destIp:%s publicIp:%s usePublicIp:%u",
+            pConn, taosIpStr(pMsg->destIp), taosIpStr(tsPublicIpInt), pConn->usePublicIp);
   }
 
   if (pMsg->msgType == TSDB_MSG_TYPE_CONNECT) {
diff --git a/src/system/detail/src/mgmtVgroup.c b/src/system/detail/src/mgmtVgroup.c
index b2273ea87afe075641b958def93fb855c761181d..3e676c3951724482da24b8a0b2d36839e81f0fcf 100644
--- a/src/system/detail/src/mgmtVgroup.c
+++ b/src/system/detail/src/mgmtVgroup.c
@@ -102,13 +102,17 @@ int mgmtInitVgroups() {
     }
     
     taosIdPoolReinit(pVgroup->idPool);
-#ifdef CLUSTER
-    if (pVgroup->vnodeGid[0].publicIp == 0) {
-      pVgroup->vnodeGid[0].publicIp = inet_addr(tsPublicIp);
-      pVgroup->vnodeGid[0].ip = inet_addr(tsPrivateIp);
-      sdbUpdateRow(vgSdb, pVgroup, tsVgUpdateSize, 1);
+
+    if (tsIsCluster) {
+      /*
+       * Upgrade from open source version to cluster version for the first time
+       */
+      if (pVgroup->vnodeGid[0].publicIp == 0) {
+        pVgroup->vnodeGid[0].publicIp = inet_addr(tsPublicIp);
+        pVgroup->vnodeGid[0].ip = inet_addr(tsPrivateIp);
+        sdbUpdateRow(vgSdb, pVgroup, tsVgUpdateSize, 1);
+      }
     }
-#endif
 
     mgmtSetDnodeVgid(pVgroup->vnodeGid, pVgroup->numOfVnodes, pVgroup->vgId);
   }
diff --git a/src/system/detail/src/vnodeShell.c b/src/system/detail/src/vnodeShell.c
index 5efbb41014bb6e039ea4a1a581e8a3a121b37cc6..02d223ff6baa75fee03905f4c47dab28ca3dcc91 100644
--- a/src/system/detail/src/vnodeShell.c
+++ b/src/system/detail/src/vnodeShell.c
@@ -142,11 +142,9 @@ int vnodeInitShell() {
   if (numOfThreads < 1) numOfThreads = 1;
 
   memset(&rpcInit, 0, sizeof(rpcInit));
-#ifdef CLUSTER  
-  rpcInit.localIp = tsInternalIp;
-#else
-  rpcInit.localIp = "0.0.0.0";
-#endif
+
+  rpcInit.localIp = tsAnyIp ? "0.0.0.0" : tsPrivateIp;
+
   rpcInit.localPort = tsVnodeShellPort;
   rpcInit.label = "DND-shell";
   rpcInit.numOfThreads = numOfThreads;
diff --git a/src/system/lite/src/mgmtDnode.spec.c b/src/system/lite/src/mgmtDnode.spec.c
index dc7dd7d4725e8176daf358feefc14a4467791606..170683a998cc8e8ba2ec4de36d0a724e70990a59 100644
--- a/src/system/lite/src/mgmtDnode.spec.c
+++ b/src/system/lite/src/mgmtDnode.spec.c
@@ -27,7 +27,7 @@ int mgmtUpdateDnode(SDnodeObj *pDnode) { return 0; }
 void mgmtCleanUpDnodes() {}
 
 int mgmtInitDnodes() {
-  dnodeObj.privateIp = inet_addr(tsInternalIp);;
+  dnodeObj.privateIp = inet_addr(tsPrivateIp);;
   dnodeObj.createdTime = (int64_t)tsRebootTime * 1000;
   dnodeObj.lastReboot = tsRebootTime;
   dnodeObj.numOfCores = (uint16_t)tsNumOfCores;
diff --git a/src/util/src/tglobalcfg.c b/src/util/src/tglobalcfg.c
index a3b2ba151d1f5fd5bef36d850479c57292ed10c3..4d4bace68136d0cfd487c1e7f24f372eec50ab1d 100644
--- a/src/util/src/tglobalcfg.c
+++ b/src/util/src/tglobalcfg.c
@@ -75,7 +75,6 @@ int tsMetricMetaKeepTimer = 600;  // second
 float tsNumOfThreadsPerCore = 1.0;
 float tsRatioOfQueryThreads = 0.5;
 char  tsPublicIp[TSDB_IPv4ADDR_LEN] = {0};
-char  tsInternalIp[TSDB_IPv4ADDR_LEN] = {0};
 char  tsPrivateIp[TSDB_IPv4ADDR_LEN] = {0};
 char  tsServerIpStr[TSDB_IPv4ADDR_LEN] = "127.0.0.1";
 short tsNumOfVnodesPerCore = 8;
@@ -165,6 +164,14 @@ int tsAdminRowLimit = 10240;
 
 int   tsTscEnableRecordSql = 0;
 int   tsEnableCoreFile = 0;
+int   tsAnyIp = 1;
+uint32_t tsPublicIpInt = 0;
+
+#ifdef CLUSTER
+int   tsIsCluster = 1;
+#else
+int   tsIsCluster = 0;
+#endif
 
 int tsRpcTimer = 300;
 int tsRpcMaxTime = 600;      // seconds;
@@ -449,9 +456,6 @@ static void doInitGlobalConfig() {
   tsInitConfigOption(cfg++, "privateIp", tsPrivateIp, TSDB_CFG_VTYPE_IPSTR,
                      TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLUSTER,
                      0, 0, TSDB_IPv4ADDR_LEN, TSDB_CFG_UTYPE_NONE);
-  tsInitConfigOption(cfg++, "internalIp", tsInternalIp, TSDB_CFG_VTYPE_IPSTR,
-                     TSDB_CFG_CTYPE_B_CONFIG,
-                     0, 0, TSDB_IPv4ADDR_LEN, TSDB_CFG_UTYPE_NONE);
   tsInitConfigOption(cfg++, "localIp", tsLocalIp, TSDB_CFG_VTYPE_IPSTR,
                      TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT,
                      0, 0, TSDB_IPv4ADDR_LEN, TSDB_CFG_UTYPE_NONE);
@@ -714,7 +718,7 @@ static void doInitGlobalConfig() {
                      1, 100000, 0, TSDB_CFG_UTYPE_NONE);
   tsInitConfigOption(cfg++, "httpEnableRecordSql", &tsHttpEnableRecordSql, TSDB_CFG_VTYPE_INT,
                      TSDB_CFG_CTYPE_B_CONFIG,
-                     1, 100000, 0, TSDB_CFG_UTYPE_NONE);
+                     0, 1, 0, TSDB_CFG_UTYPE_NONE);
   tsInitConfigOption(cfg++, "telegrafUseFieldNum", &tsTelegrafUseFieldNum, TSDB_CFG_VTYPE_INT,
                      TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW,
                      0, 1, 1, TSDB_CFG_UTYPE_NONE);
@@ -778,12 +782,18 @@ static void doInitGlobalConfig() {
 
   tsInitConfigOption(cfg++, "tscEnableRecordSql", &tsTscEnableRecordSql, TSDB_CFG_VTYPE_INT,
                      TSDB_CFG_CTYPE_B_CONFIG,
-                     1, 100000, 0, TSDB_CFG_UTYPE_NONE);
+                     0, 1, 0, TSDB_CFG_UTYPE_NONE);
 
   tsInitConfigOption(cfg++, "enableCoreFile", &tsEnableCoreFile, TSDB_CFG_VTYPE_INT,
                      TSDB_CFG_CTYPE_B_CONFIG,
-                     1, 100000, 0, TSDB_CFG_UTYPE_NONE);
-                     
+                     0, 1, 0, TSDB_CFG_UTYPE_NONE);
+
+#ifdef CLUSTER
+  tsInitConfigOption(cfg++, "anyIp", &tsAnyIp, TSDB_CFG_VTYPE_INT,
+                     TSDB_CFG_CTYPE_B_CONFIG,
+                     0, 1, 0, TSDB_CFG_UTYPE_NONE);
+#endif
+
   // version info
   tsInitConfigOption(cfg++, "gitinfo", gitinfo, TSDB_CFG_VTYPE_STRING,
                      TSDB_CFG_CTYPE_B_SHOW | TSDB_CFG_CTYPE_B_CLIENT,
@@ -911,10 +921,7 @@ bool tsReadGlobalConfig() {
   if (tsPublicIp[0] == 0) {
     strcpy(tsPublicIp, tsPrivateIp);
   }
-
-  if (tsInternalIp[0] == 0) {
-    strcpy(tsInternalIp, tsPrivateIp);
-  }
+  tsPublicIpInt = inet_addr(tsPublicIp);
 
   if (tsLocalIp[0] == 0) {
     strcpy(tsLocalIp, tsPrivateIp);
diff --git a/src/util/src/tutil.c b/src/util/src/tutil.c
index a10bf8bf8c2c3cf83906392aa69a78bcba180ace..12932f055340b1120e7d2b0ba487378b0a08b942 100644
--- a/src/util/src/tutil.c
+++ b/src/util/src/tutil.c
@@ -24,6 +24,8 @@
 #include "ttime.h"
 #include "ttypes.h"
 #include "tutil.h"
+#include "tlog.h"
+#include "taoserror.h"
 
 int32_t strdequote(char *z) {
   if (z == NULL) {
@@ -451,10 +453,8 @@ bool taosValidateEncodec(const char *encodec) {
     return false;
   }
   iconv_close(cd);
-  return true;
-#else
-  return true;
 #endif
+  return true;
 }
 
 bool taosGetVersionNumber(char *versionStr, int *versionNubmer) {
@@ -486,6 +486,36 @@ bool taosGetVersionNumber(char *versionStr, int *versionNubmer) {
   return true;
 }
 
+int taosCheckVersion(char *input_client_version, char *input_server_version, int comparedSegments) {
+  char client_version[64] = {0};
+  char server_version[64] = {0};
+  int clientVersionNumber[4] = {0};
+  int serverVersionNumber[4] = {0};
+
+  strcpy(client_version, input_client_version);
+  strcpy(server_version, input_server_version);
+
+  if (!taosGetVersionNumber(client_version, clientVersionNumber)) {
+    pError("invalid client version:%s", client_version);
+    return TSDB_CODE_INVALID_CLIENT_VERSION;
+  }
+
+  if (!taosGetVersionNumber(server_version, serverVersionNumber)) {
+    pError("invalid server version:%s", server_version);
+    return TSDB_CODE_INVALID_CLIENT_VERSION;
+    return NULL;
+  }
+
+  for(int32_t i = 0; i < comparedSegments; ++i) {
+    if (clientVersionNumber[i] != serverVersionNumber[i]) {
+      tscError("the %d-th number of server version:%s not matched with client version:%s", i, server_version, version);
+      return TSDB_CODE_INVALID_CLIENT_VERSION;
+    }
+  }
+
+  return 0;
+}
+
 char *taosIpStr(uint32_t ipInt) {
   static char ipStrArray[3][30];
   static int ipStrIndex = 0;