diff --git a/.drone.yml b/.drone.yml
index f7ee4e976f..3f6c622598 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,6 +23,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 ---
 kind: pipeline
 name: test_arm64
@@ -48,6 +49,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 ---
 kind: pipeline
 name: test_arm
@@ -73,6 +75,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 
 ---
 kind: pipeline
@@ -100,6 +103,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 ---
 kind: pipeline
 name: build_xenial
@@ -125,6 +129,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 
 ---
 kind: pipeline
@@ -150,6 +155,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 ---
 kind: pipeline
 name: build_centos7
@@ -173,6 +179,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 
 ---
 kind: pipeline
@@ -191,6 +198,7 @@ steps:
     branch:
     - develop
     - master
+    - 2.0
 
 
 depends_on:
diff --git a/Jenkinsfile b/Jenkinsfile
index e6e8a1df32..c1d44c1f54 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -52,12 +52,18 @@ def pre_test(){
         git checkout master
         '''
         }
-      else {
+      else if(env.CHANGE_TARGET == '2.0'){
+        sh '''
+        cd ${WKC}
+        git checkout 2.0
+        '''
+      } 
+      else{
         sh '''
         cd ${WKC}
         git checkout develop
         '''
-      } 
+      }
     }
     sh'''
     cd ${WKC}
@@ -75,7 +81,13 @@ def pre_test(){
         git checkout master
         '''
         }
-      else {
+      else if(env.CHANGE_TARGET == '2.0'){
+        sh '''
+        cd ${WK}
+        git checkout 2.0
+        '''
+      } 
+      else{
         sh '''
         cd ${WK}
         git checkout develop
diff --git a/packaging/docker/dockerManifest.sh b/packaging/docker/dockerManifest.sh
index 9c5a618f34..98abe4e099 100755
--- a/packaging/docker/dockerManifest.sh
+++ b/packaging/docker/dockerManifest.sh
@@ -44,7 +44,8 @@ echo "version=${version}"
 #docker manifest rm tdengine/tdengine
 #docker manifest rm tdengine/tdengine:${version}
 if [ "$verType" == "beta" ]; then
-  docker manifest rm tdengine/tdengine:latest
+  docker manifest inspect  tdengine/tdengine-beta:latest
+  docker manifest rm tdengine/tdengine-beta:latest
   docker manifest create -a tdengine/tdengine-beta:${version} tdengine/tdengine-amd64-beta:${version} tdengine/tdengine-aarch64-beta:${version} tdengine/tdengine-aarch32-beta:${version}
   docker manifest create -a tdengine/tdengine-beta:latest tdengine/tdengine-amd64-beta:latest tdengine/tdengine-aarch64-beta:latest tdengine/tdengine-aarch32-beta:latest
   docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
@@ -52,6 +53,7 @@ if [ "$verType" == "beta" ]; then
   docker manifest push tdengine/tdengine-beta:${version}
 
 elif [ "$verType" == "stable" ]; then
+  docker manifest inspect  tdengine/tdengine:latest 
   docker manifest rm tdengine/tdengine:latest
   docker manifest create -a tdengine/tdengine:${version} tdengine/tdengine-amd64:${version} tdengine/tdengine-aarch64:${version} tdengine/tdengine-aarch32:${version}
   docker manifest create -a tdengine/tdengine:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index aef706311d..c04fa3298b 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: tdengine
 base: core18
-version: '2.1.5.0'
+version: '2.1.6.0'
 icon: snap/gui/t-dengine.svg
 summary: an open-source big data platform designed and optimized for IoT. 
 description: |
@@ -72,7 +72,7 @@ parts:
       - usr/bin/taosd
       - usr/bin/taos
       - usr/bin/taosdemo
-      - usr/lib/libtaos.so.2.1.5.0
+      - usr/lib/libtaos.so.2.1.6.0
       - usr/lib/libtaos.so.1
       - usr/lib/libtaos.so
 
diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 2f3f51849c..f327a8a585 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -6319,7 +6319,7 @@ static void printStatPerThread(threadInfo *pThreadInfo)
             pThreadInfo->totalInsertRows,
             pThreadInfo->totalAffectedRows,
             (pThreadInfo->totalDelay)?
-            (double)(pThreadInfo->totalAffectedRows/(pThreadInfo->totalDelay/1000000.0)):
+            (double)(pThreadInfo->totalAffectedRows/((double)pThreadInfo->totalDelay/1000000.0)):
             FLT_MAX);
 }
 
@@ -6539,7 +6539,7 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
         verbosePrint("[%d] %s() LN%d, buffer=%s\n",
                 pThreadInfo->threadID, __func__, __LINE__, pThreadInfo->buffer);
 
-        startTs = taosGetTimestampMs();
+        startTs = taosGetTimestampUs();
 
         if (recOfBatch == 0) {
             errorPrint("[%d] %s() LN%d Failed to insert records of batch %d\n",
@@ -6555,10 +6555,10 @@ static void* syncWriteInterlace(threadInfo *pThreadInfo) {
         }
         int64_t affectedRows = execInsert(pThreadInfo, recOfBatch);
 
-        endTs = taosGetTimestampMs();
+        endTs = taosGetTimestampUs();
         uint64_t delay = endTs - startTs;
-        performancePrint("%s() LN%d, insert execution time is %"PRIu64"ms\n",
-                __func__, __LINE__, delay);
+        performancePrint("%s() LN%d, insert execution time is %10.2f ms\n",
+                __func__, __LINE__, delay / 1000.0);
         verbosePrint("[%d] %s() LN%d affectedRows=%"PRId64"\n",
                 pThreadInfo->threadID,
                 __func__, __LINE__, affectedRows);
@@ -6721,8 +6721,8 @@ static void* syncWriteProgressive(threadInfo *pThreadInfo) {
 
             endTs = taosGetTimestampUs();
             uint64_t delay = endTs - startTs;
-            performancePrint("%s() LN%d, insert execution time is %"PRId64"ms\n",
-                    __func__, __LINE__, delay);
+            performancePrint("%s() LN%d, insert execution time is %10.f ms\n",
+                    __func__, __LINE__, delay/1000.0);
             verbosePrint("[%d] %s() LN%d affectedRows=%d\n",
                     pThreadInfo->threadID,
                     __func__, __LINE__, affectedRows);