diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 0000000000000..68b3f1e6d603e
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,43 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+github:
+  description: "Apache Pulsar - distributed pub-sub messaging system"
+  homepage: https://pulsar.apache.org/
+  labels:
+    - pulsar
+    - pubsub
+    - messaging
+    - streaming
+    - queuing
+    - event-streaming
+  features:
+    # Enable wiki for documentation
+    wiki: true
+    # Enable issues management
+    issues: true
+    # Enable projects for project management boards
+    projects: true
+  enabled_merge_buttons:
+    # enable squash button:
+    squash:  true
+    # disable merge button:
+    merge:   false
+    # disable rebase button:
+    rebase:  false
\ No newline at end of file
diff --git a/.github/workflows/ci-cpp.yaml b/.github/workflows/ci-cpp.yaml
index d7d746adbb828..d339b7106e947 100644
--- a/.github/workflows/ci-cpp.yaml
+++ b/.github/workflows/ci-cpp.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,24 +31,35 @@ jobs:
     timeout-minutes: 120
 
     steps:
+
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
-
       - name: build pacakge
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR package -DskipTests
 
       - name: build cpp artifacts
+        if: steps.docs.outputs.changed_only == 'no'
         run: |
           echo "Build C++ client library"
           export CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug -DBUILD_DYNAMIC_LIB=OFF"
           pulsar-client-cpp/docker-build.sh
 
       - name: run c++ tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: pulsar-client-cpp/docker-tests.sh
 
 
diff --git a/.github/workflows/ci-go-functions-style.yaml b/.github/workflows/ci-go-functions-style.yaml
index cf30e520cfe42..7acb091fc0aa1 100644
--- a/.github/workflows/ci-go-functions-style.yaml
+++ b/.github/workflows/ci-go-functions-style.yaml
@@ -31,28 +31,37 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
 
       - name: Set up Go 1.12
         uses: actions/setup-go@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           go-version: 1.12
         id: go
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v1
-
       - name: InstallTool
+        if: steps.docs.outputs.changed_only == 'no'
         run: |
           cd pulsar-function-go
           wget -O - -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s v1.18.0
           ./bin/golangci-lint --version
 
       - name: Build
+        if: steps.docs.outputs.changed_only == 'no'
         run: |
           cd pulsar-function-go
-          go build ./pf
+          go build ./...
 
       - name: CheckStyle
+        if: steps.docs.outputs.changed_only == 'no'
         run: |
           cd pulsar-function-go
           ./bin/golangci-lint run -c ./golangci.yml ./pf
diff --git a/.github/workflows/ci-go-functions-test.yaml b/.github/workflows/ci-go-functions-test.yaml
index 059499c1f085e..5609ad706aee5 100644
--- a/.github/workflows/ci-go-functions-test.yaml
+++ b/.github/workflows/ci-go-functions-test.yaml
@@ -34,16 +34,24 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up Go 1.12
         uses: actions/setup-go@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           go-version: 1.12
         id: go
 
-      - name: checkout
-        uses: actions/checkout@v1
-
       - name: run tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: |
           cd pulsar-function-go
           go test -v $(go list ./... | grep -v examples)
diff --git a/.github/workflows/ci-integration-backwards-compatibility.yaml b/.github/workflows/ci-integration-backwards-compatibility.yaml
index 47fc5f6215f61..aa827897ea07b 100644
--- a/.github/workflows/ci-integration-backwards-compatibility.yaml
+++ b/.github/workflows/ci-integration-backwards-compatibility.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,28 +31,41 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
+        if: steps.docs.outputs.changed_only == 'no'
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
-
       - name: run install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn clean install -DskipTests
 
       - name: build artifacts and docker image
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/docker-images/pom.xml install -am -Pdocker -DskipTests
 
       - name: clean docker container
+        if: steps.docs.outputs.changed_only == 'no'
         run: docker system prune -f
 
       - name: remove docker node image
+        if: steps.docs.outputs.changed_only == 'no'
         run: docker rmi -f node:10 && docker rmi -f node:12 && docker rmi -f buildpack-deps:stretch
 
       - name: remove docker builder and microsoft image
+        if: steps.docs.outputs.changed_only == 'no'
         run: docker rmi -f jekyll/builder:latest && docker rmi -f mcr.microsoft.com/azure-pipelines/node8-typescript:latest
 
       - name: run integration tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=pulsar-backwards-compatibility.xml -DintegrationTests -DredirectTestOutputToFile=false
diff --git a/.github/workflows/ci-integration-cli.yaml b/.github/workflows/ci-integration-cli.yaml
index 7e07789426170..f12f8f341f092 100644
--- a/.github/workflows/ci-integration-cli.yaml
+++ b/.github/workflows/ci-integration-cli.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,16 +31,41 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
+      - name: run install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn clean install -DskipTests
 
       - name: build artifacts and docker image
-        run: mvn -B install -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR -Pdocker -DskipTests
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn -B -f tests/docker-images/pom.xml install -am -Pdocker -DskipTests
+
+      - name: clean docker container
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker system prune -f
+
+      - name: remove docker node image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f node:10 && docker rmi -f node:12 && docker rmi -f buildpack-deps:stretch
+
+      - name: remove docker builder and microsoft image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f jekyll/builder:latest && docker rmi -f mcr.microsoft.com/azure-pipelines/node8-typescript:latest
 
       - name: run integration tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=pulsar-cli.xml -DintegrationTests -DredirectTestOutputToFile=false
diff --git a/.github/workflows/ci-integration-function-state.yaml b/.github/workflows/ci-integration-function-state.yaml
index 51a44451c07b7..548beecf9fbac 100644
--- a/.github/workflows/ci-integration-function-state.yaml
+++ b/.github/workflows/ci-integration-function-state.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,16 +31,41 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
+      - name: run install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn clean install -DskipTests
 
       - name: build artifacts and docker image
-        run: mvn -B install -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR -Pdocker -DskipTests
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn -B -f tests/docker-images/pom.xml install -am -Pdocker -DskipTests
+
+      - name: clean docker container
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker system prune -f
+
+      - name: remove docker node image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f node:10 && docker rmi -f node:12 && docker rmi -f buildpack-deps:stretch
+
+      - name: remove docker builder and microsoft image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f jekyll/builder:latest && docker rmi -f mcr.microsoft.com/azure-pipelines/node8-typescript:latest
 
       - name: run integration tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=pulsar-function-state.xml -DintegrationTests -DredirectTestOutputToFile=false
diff --git a/.github/workflows/ci-integration-messaging.yaml b/.github/workflows/ci-integration-messaging.yaml
index 6c008931db90d..795ce5b8143fd 100644
--- a/.github/workflows/ci-integration-messaging.yaml
+++ b/.github/workflows/ci-integration-messaging.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,16 +31,41 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
+      - name: run install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn clean install -DskipTests
 
       - name: build artifacts and docker image
-        run: mvn -B install -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR -Pdocker -DskipTests
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn -B -f tests/docker-images/pom.xml install -am -Pdocker -DskipTests
+
+      - name: clean docker container
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker system prune -f
+
+      - name: remove docker node image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f node:10 && docker rmi -f node:12 && docker rmi -f buildpack-deps:stretch
+
+      - name: remove docker builder and microsoft image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f jekyll/builder:latest && docker rmi -f mcr.microsoft.com/azure-pipelines/node8-typescript:latest
 
       - name: run integration tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=pulsar-messaging.xml -DintegrationTests -DredirectTestOutputToFile=false
diff --git a/.github/workflows/ci-integration-process.yaml b/.github/workflows/ci-integration-process.yaml
index 4fda27149fe6a..09ce922b75c24 100644
--- a/.github/workflows/ci-integration-process.yaml
+++ b/.github/workflows/ci-integration-process.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,34 +31,49 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
-
       - name: run install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn clean install -DskipTests
 
       - name: build artifacts and docker image
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/docker-images/pom.xml install -am -Pdocker -DskipTests
 
       - name: clean docker container
+        if: steps.docs.outputs.changed_only == 'no'
         run: docker system prune -f
 
       - name: remove docker node image
+        if: steps.docs.outputs.changed_only == 'no'
         run: docker rmi -f node:10 && docker rmi -f node:12 && docker rmi -f buildpack-deps:stretch
 
       - name: remove docker builder and microsoft image
+        if: steps.docs.outputs.changed_only == 'no'
         run: docker rmi -f jekyll/builder:latest && docker rmi -f mcr.microsoft.com/azure-pipelines/node8-typescript:latest
 
       - name: run integration function
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=pulsar-process.xml -DintegrationTests -DredirectTestOutputToFile=false -Dgroups=function
 
       - name: run integration source
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=pulsar-process.xml -DintegrationTests -DredirectTestOutputToFile=false -Dgroups=source
 
       - name: run integraion sink
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=pulsar-process.xml -DintegrationTests -DredirectTestOutputToFile=false -Dgroups=sink
diff --git a/.github/workflows/ci-integration-schema.yaml b/.github/workflows/ci-integration-schema.yaml
index af6f457e59833..0b73ddbea4686 100644
--- a/.github/workflows/ci-integration-schema.yaml
+++ b/.github/workflows/ci-integration-schema.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,16 +31,41 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
+      - name: run install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn clean install -DskipTests
 
       - name: build artifacts and docker image
-        run: mvn -B install -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR -Pdocker -DskipTests
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn -B -f tests/docker-images/pom.xml install -am -Pdocker -DskipTests
+
+      - name: clean docker container
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker system prune -f
+
+      - name: remove docker node image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f node:10 && docker rmi -f node:12 && docker rmi -f buildpack-deps:stretch
+
+      - name: remove docker builder and microsoft image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f jekyll/builder:latest && docker rmi -f mcr.microsoft.com/azure-pipelines/node8-typescript:latest
 
       - name: run integration tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=pulsar-schema.xml -DintegrationTests -DredirectTestOutputToFile=false
diff --git a/.github/workflows/ci-integration-sql.yaml b/.github/workflows/ci-integration-sql.yaml
index 1a68323045c70..c495eb720cea4 100644
--- a/.github/workflows/ci-integration-sql.yaml
+++ b/.github/workflows/ci-integration-sql.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,21 +31,41 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
+      - name: remove docker node image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f node:10 && docker rmi -f node:12 && docker rmi -f buildpack-deps:stretch
 
-      - name: Set up Maven
-        uses: aahmed-se/setup-maven@v3
-        with:
-          maven-version: 3.6.1
+      - name: remove docker builder and microsoft image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f jekyll/builder:latest && docker rmi -f mcr.microsoft.com/azure-pipelines/node8-typescript:latest
+
+      - name: run install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn clean install -DskipTests
+
+      - name: build artifacts and docker pulsar latest test image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn -B -f tests/docker-images/pom.xml install -am -Pdocker -DskipTests
 
-      - name: build artifacts and docker image
-        run: mvn -B install -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR -Pdocker -DskipTests
+      - name: clean docker container
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker system prune -f
 
       - name: run integration tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=pulsar-sql.xml -DintegrationTests -DredirectTestOutputToFile=false
diff --git a/.github/workflows/ci-integration-standalone.yaml b/.github/workflows/ci-integration-standalone.yaml
index 6d39512969813..0347f1e53e049 100644
--- a/.github/workflows/ci-integration-standalone.yaml
+++ b/.github/workflows/ci-integration-standalone.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,16 +31,41 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
+      - name: run install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn clean install -DskipTests
 
       - name: build artifacts and docker image
-        run: mvn -B install -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR -Pdocker -DskipTests
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn -B -f tests/docker-images/pom.xml install -am -Pdocker -DskipTests
+
+      - name: clean docker container
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker system prune -f
+
+      - name: remove docker node image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f node:10 && docker rmi -f node:12 && docker rmi -f buildpack-deps:stretch
+
+      - name: remove docker builder and microsoft image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f jekyll/builder:latest && docker rmi -f mcr.microsoft.com/azure-pipelines/node8-typescript:latest
 
       - name: run integration tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=pulsar-standalone.xml -DintegrationTests -DredirectTestOutputToFile=false
diff --git a/.github/workflows/ci-integration-thread.yaml b/.github/workflows/ci-integration-thread.yaml
index 282d44a959738..f650c553b54ca 100644
--- a/.github/workflows/ci-integration-thread.yaml
+++ b/.github/workflows/ci-integration-thread.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,34 +31,49 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
-
       - name: run install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn clean install -DskipTests
 
       - name: build artifacts and docker image
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/docker-images/pom.xml install -am -Pdocker -DskipTests
 
       - name: clean docker container
+        if: steps.docs.outputs.changed_only == 'no'
         run: docker system prune -f
 
       - name: remove docker node image
+        if: steps.docs.outputs.changed_only == 'no'
         run: docker rmi -f node:10 && docker rmi -f node:12 && docker rmi -f buildpack-deps:stretch
 
       - name: remove docker builder and microsoft image
+        if: steps.docs.outputs.changed_only == 'no'
         run: docker rmi -f jekyll/builder:latest && docker rmi -f mcr.microsoft.com/azure-pipelines/node8-typescript:latest
 
       - name: run integration function
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=pulsar-thread.xml -DintegrationTests -DredirectTestOutputToFile=false -Dgroups=function
 
       - name: run integration source
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=pulsar-thread.xml -DintegrationTests -DredirectTestOutputToFile=false -Dgroups=source
 
       - name: run integraion sink
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=pulsar-thread.xml -DintegrationTests -DredirectTestOutputToFile=false -Dgroups=sink
diff --git a/.github/workflows/ci-integration-tiered-filesystem.yaml b/.github/workflows/ci-integration-tiered-filesystem.yaml
index 73f59d90af3a6..01b86c4a7d168 100644
--- a/.github/workflows/ci-integration-tiered-filesystem.yaml
+++ b/.github/workflows/ci-integration-tiered-filesystem.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,16 +31,41 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
+      - name: run install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn clean install -DskipTests
 
       - name: build artifacts and docker image
-        run: mvn -B install -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR -Pdocker -DskipTests
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn -B -f tests/docker-images/pom.xml install -am -Pdocker -DskipTests
+
+      - name: clean docker container
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker system prune -f
+
+      - name: remove docker node image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f node:10 && docker rmi -f node:12 && docker rmi -f buildpack-deps:stretch
+
+      - name: remove docker builder and microsoft image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f jekyll/builder:latest && docker rmi -f mcr.microsoft.com/azure-pipelines/node8-typescript:latest
 
       - name: run integration tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=tiered-filesystem-storage.xml -DintegrationTests -DredirectTestOutputToFile=false
diff --git a/.github/workflows/ci-integration-tiered-jcloud.yaml b/.github/workflows/ci-integration-tiered-jcloud.yaml
index 04116633ee308..f06f1eec4f26c 100644
--- a/.github/workflows/ci-integration-tiered-jcloud.yaml
+++ b/.github/workflows/ci-integration-tiered-jcloud.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,16 +31,41 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
+      - name: run install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn clean install -DskipTests
 
       - name: build artifacts and docker image
-        run: mvn -B install -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR -Pdocker -DskipTests
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn -B -f tests/docker-images/pom.xml install -am -Pdocker -DskipTests
+
+      - name: clean docker container
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker system prune -f
+
+      - name: remove docker node image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f node:10 && docker rmi -f node:12 && docker rmi -f buildpack-deps:stretch
+
+      - name: remove docker builder and microsoft image
+        if: steps.docs.outputs.changed_only == 'no'
+        run: docker rmi -f jekyll/builder:latest && docker rmi -f mcr.microsoft.com/azure-pipelines/node8-typescript:latest
 
       - name: run integration tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=tiered-jcloud-storage.xml -DintegrationTests -DredirectTestOutputToFile=false
diff --git a/.github/workflows/ci-license.yaml b/.github/workflows/ci-license.yaml
index 820e433e7e643..54672a2bcba10 100644
--- a/.github/workflows/ci-license.yaml
+++ b/.github/workflows/ci-license.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,17 +31,17 @@ jobs:
     timeout-minutes: 60
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
-
       # license check fails with 3.6.2 so we have to downgrade
       - name: Set up Maven
-        uses: aahmed-se/setup-maven@v3
+        uses: apache/pulsar-test-infra/setup-maven@master
         with:
           maven-version: 3.6.1
 
diff --git a/.github/workflows/ci-pulsarbot.yaml b/.github/workflows/ci-pulsarbot.yaml
new file mode 100644
index 0000000000000..c00aaa5ee2492
--- /dev/null
+++ b/.github/workflows/ci-pulsarbot.yaml
@@ -0,0 +1,39 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+name: Pulsar Bot
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+
+  action-runner:
+    name:
+    runs-on: ubuntu-latest
+    timeout-minutes: 120
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v1
+      - name: Execute pulsarbot command
+        id:   pulsarbot
+        env:
+          GITHUB_TOKEN: ${{ secrets.PULSARBOT_TOKEN }}
+        uses: apache/pulsar-test-infra/pulsarbot@master
diff --git a/.github/workflows/ci-unit-adaptors.yml b/.github/workflows/ci-unit-adaptors.yml
index a5853e155656a..83ebcd218bd8e 100644
--- a/.github/workflows/ci-unit-adaptors.yml
+++ b/.github/workflows/ci-unit-adaptors.yml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,24 +31,50 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
-
       - name: Set up Maven
-        uses: aahmed-se/setup-maven@v3
+        uses: apache/pulsar-test-infra/setup-maven@master
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           maven-version: 3.6.1
 
       - name: run unit tests install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn clean install -DskipTests
 
       - name: run unit tests pulsar io kafka connect adaptor
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn test -pl pulsar-io/kafka-connect-adaptor
 
       - name: run unit tests pulsar storm tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn test -pl tests/pulsar-storm-test
+
+      - name: package surefire artifacts
+        if: failure()
+        run: |
+          rm -rf artifacts
+          mkdir artifacts
+          find . -type d -name "*surefire*" -exec cp --parents -R {} artifacts/ \;
+          zip -r artifacts.zip artifacts
+
+      - uses: actions/upload-artifact@master
+        name: upload surefire-artifacts
+        if: failure()
+        with:
+          name: surefire-artifacts
+          path: artifacts.zip
diff --git a/.github/workflows/ci-unit-broker-sasl.yml b/.github/workflows/ci-unit-broker-sasl.yml
index 6270efe01bc51..57aceb9c8bf37 100644
--- a/.github/workflows/ci-unit-broker-sasl.yml
+++ b/.github/workflows/ci-unit-broker-sasl.yml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,21 +31,46 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
-
       - name: Set up Maven
-        uses: aahmed-se/setup-maven@v3
+        uses: apache/pulsar-test-infra/setup-maven@master
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           maven-version: 3.6.1
 
       - name: run unit tests install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn clean install -DskipTests
 
       - name: run unit tests pulsar auth sasl
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn test -DfailIfNoTests=false -pl pulsar-broker-auth-sasl
+
+      - name: package surefire artifacts
+        if: failure()
+        run: |
+          rm -rf artifacts
+          mkdir artifacts
+          find . -type d -name "*surefire*" -exec cp --parents -R {} artifacts/ \;
+          zip -r artifacts.zip artifacts
+
+      - uses: actions/upload-artifact@master
+        name: upload surefire-artifacts
+        if: failure()
+        with:
+          name: surefire-artifacts
+          path: artifacts.zip
diff --git a/.github/workflows/ci-unit-broker.yml b/.github/workflows/ci-unit-broker.yml
index 5485bc2595135..4538af439650f 100644
--- a/.github/workflows/ci-unit-broker.yml
+++ b/.github/workflows/ci-unit-broker.yml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,42 +31,73 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
-
       - name: Set up Maven
-        uses: aahmed-se/setup-maven@v3
+        uses: apache/pulsar-test-infra/setup-maven@master
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           maven-version: 3.6.1
 
       - name: run unit tests install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn clean install -DskipTests
 
       - name: run unit tests pulsar broker reader test
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn test -DfailIfNoTests=false '-Dtest=ReaderTest' -pl pulsar-broker
 
       - name: run unit tests pulsar broker rack aware test
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn test -DfailIfNoTests=false '-Dtest=RackAwareTest' -pl pulsar-broker
 
       - name: run unit tests pulsar broker simple producer consumer test
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn test -DfailIfNoTests=false '-Dtest=SimpleProducerConsumerTest' -pl pulsar-broker
 
       - name: run unit tests pulsar broker V1 producer consumer test
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn test -DfailIfNoTests=false '-Dtest=V1_ProducerConsumerTest' -pl pulsar-broker
 
       - name: run unit tests pulsar broker persistent failover end to end test
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn test -DfailIfNoTests=false '-Dtest=PersistentFailoverE2ETest' -pl pulsar-broker
 
       - name: run unit tests pulsar broker client integration test
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn test -DfailIfNoTests=false '-Dtest=BrokerClientIntegrationTest' -pl pulsar-broker
 
       - name: run unit tests pulsar broker replicatior rate limiter test
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn test -DfailIfNoTests=false '-Dtest=ReplicatorRateLimiterTest' -pl pulsar-broker
 
       - name: run unit test pulsar-broker
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn test '-Dtest=!PersistentTransactionBufferTest,!PulsarFunctionE2ESecurityTest,!ServerCnxTest,!AdminApiOffloadTest,!AdminApiSchemaValidationEnforced,!V1_AdminApiTest2,!ProxyPublishConsumeTlsTest,!PulsarFunctionE2ETest,!MessageIdSerialization,!AdminApiTest2,!PulsarFunctionLocalRunTest,!PartitionedProducerConsumerTest,!KafkaProducerSimpleConsumerTest,!MessagePublishThrottlingTest,!ReaderTest,!RackAwareTest,!SimpleProducerConsumerTest,!V1_ProducerConsumerTest,!PersistentFailoverE2ETest,!BrokerClientIntegrationTest,!ReplicatorRateLimiterTest' -DfailIfNoTests=false -pl pulsar-broker
+
+      - name: package surefire artifacts
+        if: failure()
+        run: |
+          rm -rf artifacts
+          mkdir artifacts
+          find . -type d -name "*surefire*" -exec cp --parents -R {} artifacts/ \;
+          zip -r artifacts.zip artifacts
+      - uses: actions/upload-artifact@master
+        name: upload surefire-artifacts
+        if: failure()
+        with:
+          name: surefire-artifacts
+          path: artifacts.zip
diff --git a/.github/workflows/ci-unit-flaky.yaml b/.github/workflows/ci-unit-flaky.yaml
index f47fa406a28d3..8d3f0fb5e8895 100644
--- a/.github/workflows/ci-unit-flaky.yaml
+++ b/.github/workflows/ci-unit-flaky.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,33 +31,54 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
-
       - name: Set up Maven
-        uses: aahmed-se/setup-maven@v3
+        uses: apache/pulsar-test-infra/setup-maven@master
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           maven-version: 3.6.1
 
+      - name: build the project
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn -B clean install -DskipTests
+
       - name: run PersistentTransactionBuffer test
-        run: mvn -B -am -pl pulsar-broker -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR clean install -Dtest=PersistentTransactionBufferTest -DfailIfNoTests=false
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn -B -pl pulsar-broker -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR clean install -Dtest=PersistentTransactionBufferTest -DfailIfNoTests=false -fn
 
       - name: run ServerCnx test
-        run: mvn -B -am -pl pulsar-broker -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR clean install -Dtest=ServerCnxTest -DfailIfNoTests=false
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn -B -pl pulsar-broker -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR clean install -Dtest=ServerCnxTest -DfailIfNoTests=false -fn
 
       - name: run MessagePublishThrottling test
-        run: mvn -B -am -pl pulsar-broker -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR clean install -Dtest=MessagePublishThrottlingTest -DfailIfNoTests=false
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn -B -pl pulsar-broker -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR clean install -Dtest=MessagePublishThrottlingTest -DfailIfNoTests=false -fn
 
       - name: run PrimitiveSchema test
-        run: mvn -B -am -pl pulsar-client -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR clean install -Dtest=PrimitiveSchemaTest -DfailIfNoTests=false
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn -B -pl pulsar-client -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR clean install -Dtest=PrimitiveSchemaTest -DfailIfNoTests=false -fn
+
+      - name: run BlobStoreManagedLedgerOffloaderTest
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn -B -pl tiered-storage/jcloud -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR clean install -Dtest=BlobStoreManagedLedgerOffloaderTest -DfailIfNoTests=false -fn
 
       - name: run unit tests
-        run: mvn -B -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR clean install '-Dtest=PulsarFunctionE2ESecurityTest,AdminApiOffloadTest,AdminApiSchemaValidationEnforced,V1_AdminApiTest2,PulsarFunctionE2ETest,MessageIdSerialization,AdminApiTest2,PulsarFunctionLocalRunTest,PartitionedProducerConsumerTest,KafkaProducerSimpleConsumerTest,ProxyTest' -DfailIfNoTests=false
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn -B -Dorg.slf4j.simpleLogger.defaultLogLevel=ERROR test '-Dtest=PulsarFunctionE2ESecurityTest,AdminApiOffloadTest,AdminApiSchemaValidationEnforced,V1_AdminApiTest2,PulsarFunctionE2ETest,MessageIdSerialization,AdminApiTest2,PulsarFunctionLocalRunTest,PartitionedProducerConsumerTest,KafkaProducerSimpleConsumerTest,ProxyTest' -DfailIfNoTests=false -fn
 
       - name: package surefire artifacts
         if: failure()
diff --git a/.github/workflows/ci-unit-proxy.yaml b/.github/workflows/ci-unit-proxy.yaml
index d957b53223ecd..83e3f3d1112e6 100644
--- a/.github/workflows/ci-unit-proxy.yaml
+++ b/.github/workflows/ci-unit-proxy.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,24 +31,50 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
-
       - name: Set up Maven
-        uses: aahmed-se/setup-maven@v3
+        uses: apache/pulsar-test-infra/setup-maven@master
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           maven-version: 3.6.1
 
       - name: run unit tests install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn clean install -DskipTests
 
       - name: run unit tests pulsar proxy
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn test -DfailIfNoTests=false '-Dtest=!ProxyTest,!ProxyLookupThrottlingTest' -pl pulsar-proxy
 
-      - name: run unit tests pulsar proxy
-        run: mvn test -DfailIfNoTests=false '-Dtest=ProxyTest,ProxyLookupThrottlingTest' -pl pulsar-proxy
+      - name: run proxy lookup throttling test
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn test -DfailIfNoTests=false '-Dtest=ProxyLookupThrottlingTest' -pl pulsar-proxy
+
+      - name: package surefire artifacts
+        if: failure()
+        run: |
+          rm -rf artifacts
+          mkdir artifacts
+          find . -type d -name "*surefire*" -exec cp --parents -R {} artifacts/ \;
+          zip -r artifacts.zip artifacts
+
+      - uses: actions/upload-artifact@master
+        name: upload surefire-artifacts
+        if: failure()
+        with:
+          name: surefire-artifacts
+          path: artifacts.zip
diff --git a/.github/workflows/ci-unit.yaml b/.github/workflows/ci-unit.yaml
index a0b566ca3a764..b429d1639bcb0 100644
--- a/.github/workflows/ci-unit.yaml
+++ b/.github/workflows/ci-unit.yaml
@@ -22,8 +22,6 @@ on:
   pull_request:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
 
 jobs:
 
@@ -33,24 +31,34 @@ jobs:
     timeout-minutes: 120
 
     steps:
+      - name: checkout
+        uses: actions/checkout@v1
+
+      - name: Check if this pull request only changes documentation
+        id:   docs
+        uses: apache/pulsar-test-infra/diff-only@master
+        with:
+          args: site2 .github deployment .asf.yaml
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           java-version: 1.8
 
-      - name: checkout
-        uses: actions/checkout@v1
-
       - name: Set up Maven
-        uses: aahmed-se/setup-maven@v3
+        uses: apache/pulsar-test-infra/setup-maven@master
+        if: steps.docs.outputs.changed_only == 'no'
         with:
           maven-version: 3.6.1
 
       - name: run unit tests install by skip tests
+        if: steps.docs.outputs.changed_only == 'no'
         run: mvn clean install -DskipTests
 
       - name: run unit tests
-        run: mvn clean install -DfailIfNoTests=false '-Dtest=!KafkaProducerSimpleConsumerTest,!PrimitiveSchemaTest' -pl '!pulsar-broker,!pulsar-proxy,!pulsar-broker-auth-sasl,!pulsar-io/kafka-connect-adaptor,!tests/pulsar-storm-test'
+        if: steps.docs.outputs.changed_only == 'no'
+        run: mvn install -DfailIfNoTests=false '-Dtest=!KafkaProducerSimpleConsumerTest,!PrimitiveSchemaTest,!BlobStoreManagedLedgerOffloaderTest' -pl '!pulsar-broker,!pulsar-proxy,!pulsar-broker-auth-sasl,!pulsar-io/kafka-connect-adaptor,!tests/pulsar-storm-test'
 
       - name: package surefire artifacts
         if: failure()
@@ -59,6 +67,7 @@ jobs:
           mkdir artifacts
           find . -type d -name "*surefire*" -exec cp --parents -R {} artifacts/ \;
           zip -r artifacts.zip artifacts
+
       - uses: actions/upload-artifact@master
         name: upload surefire-artifacts
         if: failure()
diff --git a/README.md b/README.md
index 016a68642e64b..e149361f322c2 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ $ bin/pulsar standalone
 ```
 
 Check https://pulsar.apache.org for documentation and examples.
-
+ 
 ## Setting up your IDE
 
 Apache Pulsar is using [lombok](https://projectlombok.org/) so you have to ensure your IDE setup with
diff --git a/bin/bookkeeper b/bin/bookkeeper
index 7024e6546ba55..e1fb3a606816f 100755
--- a/bin/bookkeeper
+++ b/bin/bookkeeper
@@ -48,7 +48,7 @@ else
 fi
 
 BINDIR=`dirname "$0"`
-BK_HOME=`cd $BINDIR/..;pwd`
+BK_HOME=`cd -P $BINDIR/..;pwd`
 
 DEFAULT_CONF=$BK_HOME/conf/bookkeper.conf
 DEFAULT_LOG_CONF=$BK_HOME/conf/log4j2.yaml
diff --git a/bin/function-localrunner b/bin/function-localrunner
index a7aad76b7d200..fb36eb20383ce 100755
--- a/bin/function-localrunner
+++ b/bin/function-localrunner
@@ -19,7 +19,7 @@
 #
 
 BINDIR=$(dirname "$0")
-export PULSAR_HOME=`cd $BINDIR/..;pwd`
+export PULSAR_HOME=`cd -P $BINDIR/..;pwd`
 . "$PULSAR_HOME/bin/pulsar-admin-common.sh"
 
 # functions related variables
diff --git a/bin/pulsar b/bin/pulsar
index f93fbc28eedc1..ffcdf536793ca 100755
--- a/bin/pulsar
+++ b/bin/pulsar
@@ -19,7 +19,7 @@
 #
 
 BINDIR=$(dirname "$0")
-export PULSAR_HOME=`cd $BINDIR/..;pwd`
+export PULSAR_HOME=`cd -P $BINDIR/..;pwd`
 
 DEFAULT_BROKER_CONF=$PULSAR_HOME/conf/broker.conf
 DEFAULT_BOOKKEEPER_CONF=$PULSAR_HOME/conf/bookkeeper.conf
@@ -112,16 +112,18 @@ if [ ! -f "${PY_INSTANCE_FILE}" ]; then
 fi
 
 # find pulsar sql presto distribution location
-if [ ! -d "${PRESTO_HOME}" ]; then
-
-  BUILT_PRESTO_HOME="${SQL_HOME}/presto-distribution/target/pulsar-presto-distribution"
-  if [ ! -d "${BUILT_PRESTO_HOME}" ]; then
-        echo "\nCouldn't find presto distribution.";
-        echo "Make sure you've run 'mvn package'\n";
-        exit 1;
+check_presto_libraries() {
+    if [ ! -d "${PRESTO_HOME}" ]; then
+
+        BUILT_PRESTO_HOME="${SQL_HOME}/presto-distribution/target/pulsar-presto-distribution"
+        if [ ! -d "${BUILT_PRESTO_HOME}" ]; then
+            echo "\nCouldn't find presto distribution.";
+            echo "Make sure you've run 'mvn package'\n";
+            exit 1;
+        fi
+        PRESTO_HOME=${BUILT_PRESTO_HOME}
     fi
-    PRESTO_HOME=${BUILT_PRESTO_HOME}
-fi
+}
 
 pulsar_help() {
     cat <<EOF
@@ -345,8 +347,10 @@ elif [ $COMMAND == "broker-tool" ]; then
 elif [ $COMMAND == "compact-topic" ]; then
     exec $JAVA $OPTS org.apache.pulsar.compaction.CompactorTool --broker-conf $PULSAR_BROKER_CONF $@
 elif [ $COMMAND == "sql" ]; then
+    check_presto_libraries
     exec $JAVA -cp "${PRESTO_HOME}/lib/*" com.facebook.presto.cli.Presto --server localhost:8081 "${@}"
 elif [ $COMMAND == "sql-worker" ]; then
+    check_presto_libraries
     exec ${PRESTO_HOME}/bin/launcher --etc-dir ${PULSAR_PRESTO_CONF} "${@}"
 elif [ $COMMAND == "tokens" ]; then
       exec $JAVA $OPTS org.apache.pulsar.utils.auth.tokens.TokensCliUtils $@
diff --git a/bin/pulsar-admin b/bin/pulsar-admin
index 97206e61f4cdc..0e47cb38e585f 100755
--- a/bin/pulsar-admin
+++ b/bin/pulsar-admin
@@ -19,7 +19,7 @@
 #
 
 BINDIR=$(dirname "$0")
-export PULSAR_HOME=`cd $BINDIR/..;pwd`
+export PULSAR_HOME=`cd -P $BINDIR/..;pwd`
 . "$PULSAR_HOME/bin/pulsar-admin-common.sh"
 
 #Change to PULSAR_HOME to support relative paths
diff --git a/bin/pulsar-client b/bin/pulsar-client
index e48bd1a590ae6..f0e2213484853 100755
--- a/bin/pulsar-client
+++ b/bin/pulsar-client
@@ -19,7 +19,7 @@
 #
 
 BINDIR=$(dirname "$0")
-PULSAR_HOME=`cd $BINDIR/..;pwd`
+PULSAR_HOME=`cd -P $BINDIR/..;pwd`
 
 DEFAULT_CLIENT_CONF=$PULSAR_HOME/conf/client.conf
 DEFAULT_LOG_CONF=$PULSAR_HOME/conf/log4j2.yaml
diff --git a/bin/pulsar-daemon b/bin/pulsar-daemon
index 9848c26d33158..3d555dd09fbbc 100755
--- a/bin/pulsar-daemon
+++ b/bin/pulsar-daemon
@@ -38,7 +38,7 @@ EOF
 }
 
 BINDIR=$(dirname "$0")
-PULSAR_HOME=$(cd $BINDIR/..;pwd)
+PULSAR_HOME=$(cd -P $BINDIR/..;pwd)
 
 # Check bookkeeper env and load bkenv.sh
 if [ -f "$PULSAR_HOME/conf/bkenv.sh" ]
diff --git a/bin/pulsar-perf b/bin/pulsar-perf
index 83814e9fcaf19..b2a273f2dea05 100755
--- a/bin/pulsar-perf
+++ b/bin/pulsar-perf
@@ -19,7 +19,7 @@
 #
 
 BINDIR=$(dirname "$0")
-PULSAR_HOME=`cd $BINDIR/..;pwd`
+PULSAR_HOME=`cd -P $BINDIR/..;pwd`
 
 DEFAULT_CLIENT_CONF=${PULSAR_CLIENT_CONF:-"$PULSAR_HOME/conf/client.conf"}
 DEFAULT_LOG_CONF=$PULSAR_HOME/conf/log4j2.yaml
diff --git a/conf/bkenv.sh b/conf/bkenv.sh
index 6c8295797f2e7..363d8d2423df4 100644
--- a/conf/bkenv.sh
+++ b/conf/bkenv.sh
@@ -33,7 +33,7 @@ BOOKIE_CONF=${BOOKIE_CONF:-"$BK_HOME/conf/bookkeeper.conf"}
 # BOOKIE_LOG_DIR=
 
 # Memory size options
-BOOKIE_MEM=${BOOKIE_MEM:-"-Xms2g -Xmx2g -XX:MaxDirectMemorySize=2g"}
+BOOKIE_MEM=${BOOKIE_MEM:-${PULSAR_MEM:-"-Xms2g -Xmx2g -XX:MaxDirectMemorySize=2g"}}
 
 # Garbage collection options
 BOOKIE_GC=${BOOKIE_GC:-"-XX:+UseG1GC -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB"}
diff --git a/conf/broker.conf b/conf/broker.conf
index 798fbacf271ca..cf01b2d2fddc4 100644
--- a/conf/broker.conf
+++ b/conf/broker.conf
@@ -324,6 +324,18 @@ replicatedSubscriptionsSnapshotTimeoutSeconds=30
 # Max number of snapshot to be cached per subscription.
 replicatedSubscriptionsSnapshotMaxCachedPerSubscription=10
 
+# Max memory size for broker handling messages sending from producers.
+# If the processing message size exceed this value, broker will stop read data
+# from the connection. The processing messages means messages are sends to broker
+# but broker have not send response to client, usually waiting to write to bookies.
+# It's shared across all the topics running in the same broker.
+# Use -1 to disable the memory limitation. Default is 1/2 of direct memory.
+maxMessagePublishBufferSizeInMB=
+
+# Interval between checks to see if message publish buffer size is exceed the max message publish buffer size
+# Use 0 or negative number to disable the max publish buffer limiting.
+messagePublishBufferCheckIntervalInMillis=100
+
 ### --- Authentication --- ###
 # Role names that are treated as "proxy roles". If the broker sees a request with
 #role as proxyRoles - it will demand to see a valid original principal.
@@ -381,6 +393,9 @@ authenticationEnabled=false
 # Autentication provider name list, which is comma separated list of class names
 authenticationProviders=
 
+# Interval of time for checking for expired authentication credentials
+authenticationRefreshCheckSeconds=60
+
 # Enforce authorization
 authorizationEnabled=false
 
@@ -439,6 +454,11 @@ saslJaasClientAllowedIds=
 # Default value `SaslConstants.JAAS_DEFAULT_BROKER_SECTION_NAME`, which is "Broker".
 saslJaasBrokerSectionName=
 
+### --- HTTP Server config --- ###
+
+# If >0, it will reject all HTTP requests with bodies larged than the configured limit
+httpMaxRequestSize=-1
+
 ### --- BookKeeper Client --- ###
 
 # Authentication plugin to use when connecting to bookies
@@ -528,6 +548,10 @@ bookkeeperTLSTrustCertsFilePath=
 # Enable/disable disk weight based placement. Default is false
 bookkeeperDiskWeightBasedPlacementEnabled=false
 
+# Set the interval to check the need for sending an explicit LAC
+# A value of '0' disables sending any explicit LACs. Default is 0.
+bookkeeperExplicitLacIntervalInMills=0
+
 ### --- Managed Ledger --- ###
 
 # Number of bookies to use when creating a ledger
@@ -693,6 +717,14 @@ loadBalancerOverrideBrokerNicSpeedGbps=
 # Name of load manager to use
 loadManagerClassName=org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl
 
+# Supported algorithms name for namespace bundle split.
+# "range_equally_divide" divides the bundle into two parts with the same hash range size.
+# "topic_count_equally_divide" divides the bundle into two parts with the same topics count.
+supportedNamespaceBundleSplitAlgorithms=[range_equally_divide,topic_count_equally_divide]
+
+# Default algorithm name for namespace bundle split
+defaultNamespaceBundleSplitAlgorithm=range_equally_divide
+
 ### --- Replication --- ###
 
 # Enable replication metrics
@@ -758,6 +790,11 @@ exposePublisherStats=true
 statsUpdateFrequencyInSecs=60
 statsUpdateInitialDelayInSecs=60
 
+# Enable expose the precise backlog stats.
+# Set false to use published counter and consumed counter to calculate, this would be more efficient but may be inaccurate.
+# Default is false.
+exposePreciseBacklogInPrometheus=false
+
 ### --- Schema storage --- ###
 # The schema storage implementation used by this broker
 schemaRegistryStorageClassName=org.apache.pulsar.broker.service.schema.BookkeeperSchemaStorageFactory
diff --git a/conf/standalone.conf b/conf/standalone.conf
index 6d1023bb40274..7dff0c3c913ab 100644
--- a/conf/standalone.conf
+++ b/conf/standalone.conf
@@ -334,6 +334,10 @@ bookkeeperTLSTrustCertsFilePath=
 # Enable/disable disk weight based placement. Default is false
 bookkeeperDiskWeightBasedPlacementEnabled=false
 
+# Set the interval to check the need for sending an explicit LAC
+# A value of '0' disables sending any explicit LACs. Default is 0.
+bookkeeperExplicitLacIntervalInMills=0
+
 ### --- Managed Ledger --- ###
 
 # Number of bookies to use when creating a ledger
@@ -527,6 +531,11 @@ exposeTopicLevelMetricsInPrometheus=true
 # Enable topic level metrics
 exposePublisherStats=true
 
+# Enable expose the precise backlog stats.
+# Set false to use published counter and consumed counter to calculate, this would be more efficient but may be inaccurate.
+# Default is false.
+exposePreciseBacklogInPrometheus=false
+
 ### --- Deprecated config variables --- ###
 
 # Deprecated. Use configurationStoreServers
diff --git a/dashboard/Dockerfile b/dashboard/Dockerfile
index b9fa47cf1509f..7388481f7567e 100644
--- a/dashboard/Dockerfile
+++ b/dashboard/Dockerfile
@@ -25,7 +25,7 @@ RUN apt-get update
 RUN apt-get -y install postgresql python sudo nginx supervisor
 
 # Postgres configuration
-COPY conf/postgresql.conf /etc/postgresql/9.6/main/
+COPY conf/postgresql.conf /etc/postgresql/11/main/
 
 # Configure nginx and supervisor
 RUN echo "daemon off;" >> /etc/nginx/nginx.conf
diff --git a/dashboard/conf/postgresql.conf b/dashboard/conf/postgresql.conf
index aabad0dd96244..85dfe1b1bdfdd 100644
--- a/dashboard/conf/postgresql.conf
+++ b/dashboard/conf/postgresql.conf
@@ -24,15 +24,15 @@ synchronous_commit = off
 
 # Default configs
 data_directory = '/data'
-hba_file = '/etc/postgresql/9.6/main/pg_hba.conf'
-ident_file = '/etc/postgresql/9.6/main/pg_ident.conf'
-external_pid_file = '/var/run/postgresql/9.6-main.pid'
+hba_file = '/etc/postgresql/11/main/pg_hba.conf'
+ident_file = '/etc/postgresql/11/main/pg_ident.conf'
+external_pid_file = '/var/run/postgresql/11-main.pid'
 
 port = 5432
 max_connections = 100
 
 datestyle = 'iso, mdy'
 default_text_search_config = 'pg_catalog.english'
-stats_temp_directory = '/var/run/postgresql/9.6-main.pg_stat_tmp'
+stats_temp_directory = '/var/run/postgresql/11-main.pg_stat_tmp'
 timezone = 'UTC'
 log_timezone = 'UTC'
diff --git a/dashboard/init-postgres.sh b/dashboard/init-postgres.sh
index 064b7e37041a1..5f4c62757f5f8 100755
--- a/dashboard/init-postgres.sh
+++ b/dashboard/init-postgres.sh
@@ -23,7 +23,7 @@ set -x -e
 rm -rf /data/*
 chown -R postgres: /data
 chmod 700 /data
-sudo -u postgres /usr/lib/postgresql/9.6/bin/initdb /data/
+sudo -u postgres /usr/lib/postgresql/11/bin/initdb /data/
 sudo -u postgres /etc/init.d/postgresql start
 sudo -u postgres psql --command "CREATE USER docker WITH PASSWORD 'docker';"
 sudo -u postgres createdb -O docker pulsar_dashboard
diff --git a/deployment/kubernetes/aws/bookkeeper.yaml b/deployment/kubernetes/aws/bookkeeper.yaml
index e0cd38dcf5096..f44de68128dd9 100644
--- a/deployment/kubernetes/aws/bookkeeper.yaml
+++ b/deployment/kubernetes/aws/bookkeeper.yaml
@@ -21,13 +21,12 @@
 
 # SSDs for bookie journal storage
 kind: StorageClass
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1
 metadata:
   name: bookie-ssd
 provisioner: kubernetes.io/aws-ebs
 parameters:
   type: gp2
-  zones: us-east-2a
   fsType: xfs
 #  To create encrypted ebs volume using kms
 #  encrypted: "true"
@@ -36,13 +35,12 @@ reclaimPolicy: Retain
 ---
 # HDDs for bookie ledger storage
 kind: StorageClass
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1
 metadata:
   name: bookie-hdd
 provisioner: kubernetes.io/aws-ebs
 parameters:
   type: st1
-  zones: us-east-2a
   fsType: xfs
 #  To create encrypted ebs volume using kms
 #  encrypted: "true"
@@ -54,14 +52,15 @@ kind: ConfigMap
 metadata:
   name: bookie-config
 data:
-  PULSAR_MEM: "\"-Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024 -XX:+UseG1GC -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintHeapAtGC -verbosegc -XX:G1LogLevel=finest -Xms28g -Xmx28g -XX:MaxDirectMemorySize=28g\""
-  PULSAR_PREFIX_dbStorage_writeCacheMaxSizeMb: "2048" # Write cache size (direct memory)
-  PULSAR_PREFIX_dbStorage_readAheadCacheMaxSizeMb: "2048" # Read cache size (direct memory)
-  PULSAR_PREFIX_dbStorage_rocksDB_blockCacheSize: "4294967296"
-  PULSAR_PREFIX_journalMaxSizeMB: "2048"
-  PULSAR_PREFIX_zkServers: zk-0.zookeeper,zk-1.zookeeper,zk-2.zookeeper
-  PULSAR_PREFIX_statsProviderClass: org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
-  PULSAR_PREFIX_useHostNameAsBookieID: "true"
+  BOOKIE_MEM: "\"-Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintHeapAtGC -verbosegc -XX:G1LogLevel=finest -Xms28g -Xmx28g -XX:MaxDirectMemorySize=28g\""
+  BOOKIE_GC: "\"-XX:+UseG1GC -XX:MaxGCPauseMillis=10\""
+  dbStorage_writeCacheMaxSizeMb: "2048" # Write cache size (direct memory)
+  dbStorage_readAheadCacheMaxSizeMb: "2048" # Read cache size (direct memory)
+  dbStorage_rocksDB_blockCacheSize: "4294967296"
+  journalMaxSizeMB: "2048"
+  zkServers: zk-0.zookeeper,zk-1.zookeeper,zk-2.zookeeper
+  statsProviderClass: org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
+  useHostNameAsBookieID: "true"
 ---
 apiVersion: apps/v1beta1
 kind: StatefulSet
@@ -203,9 +202,9 @@ spec:
                         name: bookie-config
                 env:
                     ## Configure for lower mem usage
-                  - name: PULSAR_MEM
+                  - name: BOOKIE_MEM
                     value: "\" -Xmx256m \""
-                  - name: PULSAR_GC
+                  - name: BOOKIE_GC
                     value: "\"  \""
 # Uncomment the following if bookie should be deployed on a specific instance type
 #            nodeSelector:
diff --git a/deployment/kubernetes/aws/broker.yaml b/deployment/kubernetes/aws/broker.yaml
index 06827c8ec89f2..908a3c4185eb4 100644
--- a/deployment/kubernetes/aws/broker.yaml
+++ b/deployment/kubernetes/aws/broker.yaml
@@ -27,13 +27,13 @@ data:
     # better GC behavior at high throughput
     PULSAR_MEM: "\" -Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem -Xms12g -Xmx12g -XX:MaxDirectMemorySize=14g -Dpulsar.root.logger=DEBUG,FILE \""
     PULSAR_GC: "\" -XX:+UseG1GC -XX:MaxGCPauseMillis=10\""
-    PULSAR_PREFIX_zookeeperServers: zk-0.zookeeper,zk-1.zookeeper,zk-2.zookeeper
-    PULSAR_PREFIX_configurationStoreServers: zk-0.zookeeper,zk-1.zookeeper,zk-2.zookeeper
-    PULSAR_PREFIX_clusterName: us-east
-    PULSAR_PREFIX_managedLedgerDefaultEnsembleSize: "2"
-    PULSAR_PREFIX_managedLedgerDefaultWriteQuorum: "2"
-    PULSAR_PREFIX_managedLedgerDefaultAckQuorum: "2"
-    PULSAR_PREFIX_deduplicationEnabled: "false"
+    zookeeperServers: zk-0.zookeeper,zk-1.zookeeper,zk-2.zookeeper
+    configurationStoreServers: zk-0.zookeeper,zk-1.zookeeper,zk-2.zookeeper
+    clusterName: us-east
+    managedLedgerDefaultEnsembleSize: "2"
+    managedLedgerDefaultWriteQuorum: "2"
+    managedLedgerDefaultAckQuorum: "2"
+    deduplicationEnabled: "false"
 ---
 ##
 ## Broker deployment definition
@@ -63,7 +63,7 @@ spec:
 #            dnsPolicy: ClusterFirstWithHostNet
             containers:
               - name: broker
-                image: apachepulsar/pulsar:1.20.0-incubating
+                image: apachepulsar/pulsar:latest
                 command: ["sh", "-c"]
                 args:
                   - >
@@ -127,7 +127,7 @@ metadata:
 spec:
     containers:
       - name: pulsar-admin
-        image: apachepulsar/pulsar:1.20.0-incubating
+        image: apachepulsar/pulsar:latest
         command: ["sh", "-c"]
         args:
           - >
diff --git a/deployment/kubernetes/aws/cluster-metadata.yaml b/deployment/kubernetes/aws/cluster-metadata.yaml
new file mode 100644
index 0000000000000..fd55f372ff839
--- /dev/null
+++ b/deployment/kubernetes/aws/cluster-metadata.yaml
@@ -0,0 +1,42 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: pulsar-cluster-metadata-init
+  labels:
+    app: pulsar
+    component: broker
+spec:
+  template:
+    spec:
+      containers:
+        - name: pulsar-cluster-metadata-init-container
+          image: apachepulsar/pulsar:latest
+          command: ["sh", "-c"]
+          args:
+            - >
+              bin/pulsar initialize-cluster-metadata \
+                --cluster us-east \
+                --zookeeper zookeeper \
+                --configuration-store zookeeper \
+                --web-service-url http://broker:8080/ \
+                --broker-service-url pulsar://broker:6650/ || true;
+      restartPolicy: Never
diff --git a/deployment/kubernetes/aws/proxy.yaml b/deployment/kubernetes/aws/proxy.yaml
index 844e1bb9c0592..589162baff6fa 100644
--- a/deployment/kubernetes/aws/proxy.yaml
+++ b/deployment/kubernetes/aws/proxy.yaml
@@ -23,10 +23,11 @@ metadata:
   name: pulsar-proxy-config
 data:
   PULSAR_MEM: "\" -Xms4g -Xmx4g -XX:MaxDirectMemorySize=4g\""
-  PULSAR_PREFIX_brokerServiceURL: pulsar://broker:6650
-  PULSAR_PREFIX_brokerWebServiceURL: http://broker:8080
-  PULSAR_PREFIX_clusterName: pulsar-eks
-
+  brokerServiceURL: pulsar://broker:6650
+  brokerWebServiceURL: http://broker:8080
+  clusterName: us-east
+  zookeeperServers: zk-0.zookeeper,zk-1.zookeeper,zk-2.zookeeper
+  configurationStoreServers: zk-0.zookeeper,zk-1.zookeeper,zk-2.zookeeper
 ---
 apiVersion: apps/v1beta1
 kind: Deployment
diff --git a/deployment/kubernetes/helm/pulsar/templates/bookkeeper-statefulset.yaml b/deployment/kubernetes/helm/pulsar/templates/bookkeeper-statefulset.yaml
index eb2597d237ab7..012eb4e6246f4 100644
--- a/deployment/kubernetes/helm/pulsar/templates/bookkeeper-statefulset.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/bookkeeper-statefulset.yaml
@@ -115,6 +115,7 @@ spec:
         - >
           bin/apply-config-from-env.py conf/bookkeeper.conf &&
           bin/apply-config-from-env.py conf/pulsar_env.sh &&
+          bin/apply-config-from-env.py conf/bkenv.sh &&
           bin/pulsar bookie
         ports:
         - name: client
diff --git a/deployment/kubernetes/helm/pulsar/templates/broker-configmap.yaml b/deployment/kubernetes/helm/pulsar/templates/broker-configmap.yaml
index d57782675e8c0..cf7b5c1226954 100644
--- a/deployment/kubernetes/helm/pulsar/templates/broker-configmap.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/broker-configmap.yaml
@@ -39,4 +39,9 @@ data:
   clusterName: {{ template "pulsar.fullname" . }}
   functionsWorkerEnabled: "true"
   PF_pulsarFunctionsCluster: {{ template "pulsar.fullname" . }}
-{{ toYaml .Values.broker.configData | indent 2 }}
+  {{- if .Values.extra.functionsAsPods }}
+  PF_functionRuntimeFactoryClassName: "org.apache.pulsar.functions.runtime.kubernetes.KubernetesRuntimeFactory"
+  PF_functionRuntimeFactoryConfigs_submittingInsidePod: "true"
+  PF_functionRuntimeFactoryConfigs_jobNamespace: {{ .Values.namespace }}
+  {{- end }}
+  {{ toYaml .Values.broker.configData | indent 2 }}
diff --git a/deployment/kubernetes/helm/pulsar/templates/broker-deployment.yaml b/deployment/kubernetes/helm/pulsar/templates/broker-deployment.yaml
index 9c74764e0f1cd..4abd2b6cbd191 100644
--- a/deployment/kubernetes/helm/pulsar/templates/broker-deployment.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/broker-deployment.yaml
@@ -55,6 +55,9 @@ spec:
       tolerations:
 {{ toYaml .Values.broker.tolerations | indent 8 }}
     {{- end }}
+      {{- if .Values.extra.functionsAsPods }}
+      serviceAccount: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
+      {{- end }}
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
diff --git a/deployment/kubernetes/helm/pulsar/templates/broker-rbac.yaml b/deployment/kubernetes/helm/pulsar/templates/broker-rbac.yaml
new file mode 100644
index 0000000000000..8f37ed729e584
--- /dev/null
+++ b/deployment/kubernetes/helm/pulsar/templates/broker-rbac.yaml
@@ -0,0 +1,60 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+  {{- if .Values.extra.functionsAsPods }}
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
+rules:
+- apiGroups: [""]
+  resources:
+  - services
+  - configmaps
+  - pods
+  verbs:
+  - '*'
+- apiGroups:
+  - apps
+  resources:
+  - statefulsets
+  verbs:
+  - '*'
+---
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
+  namespace: {{ .Values.namespace }}
+---
+
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
+subjects:
+- kind: ServiceAccount
+  name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
+  namespace: {{ .Values.namespace }}
+  {{- end }}
diff --git a/deployment/kubernetes/helm/pulsar/templates/dashboard-ingress.yaml b/deployment/kubernetes/helm/pulsar/templates/dashboard-ingress.yaml
index ff9106f2f1acb..10dc4f99e08e7 100644
--- a/deployment/kubernetes/helm/pulsar/templates/dashboard-ingress.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/dashboard-ingress.yaml
@@ -17,6 +17,7 @@
 # under the License.
 #
 
+{{- if .Values.extra.dashboard }}
 {{- if .Values.dashboard.ingress.enabled }}
 apiVersion: extensions/v1beta1                                                                                                                                                            
 kind: Ingress                                                                                                                                                                             
@@ -51,3 +52,4 @@ spec:
               serviceName: "{{ template "pulsar.fullname" . }}-{{ .Values.dashboard.component }}"
               servicePort: {{ .Values.dashboard.ingress.port }}
 {{- end }}
+{{- end }}
diff --git a/deployment/kubernetes/helm/pulsar/templates/grafana-ingress.yaml b/deployment/kubernetes/helm/pulsar/templates/grafana-ingress.yaml
new file mode 100644
index 0000000000000..79f4a8babeb3f
--- /dev/null
+++ b/deployment/kubernetes/helm/pulsar/templates/grafana-ingress.yaml
@@ -0,0 +1,50 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+  {{- if .Values.extra.monitoring}}
+  {{- if .Values.grafana.ingress.enabled }}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}"
+  namespace: {{ .Values.namespace }}
+  labels:
+    app: {{ template "pulsar.name" . }}
+    chart: {{ template "pulsar.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.grafana.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if .Values.grafana.ingress.tls }}
+  tls:
+{{ toYaml .Values.grafana.ingress.tls | indent 4 }}
+{{- end }}
+  rules:
+    - host: {{ required "Grafana ingress hostname not provided" .Values.grafana.ingress.hostname }}
+      http:
+        paths:
+        - path: {{ .Values.grafana.ingress.path }}
+          backend:
+            serviceName: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}"
+            servicePort: {{ .Values.grafana.ingress.port }}
+  {{- end }}
+  {{- end }}
diff --git a/deployment/kubernetes/helm/pulsar/templates/grafana-service.yaml b/deployment/kubernetes/helm/pulsar/templates/grafana-service.yaml
index cd73f43a75492..56daddec7dc3b 100644
--- a/deployment/kubernetes/helm/pulsar/templates/grafana-service.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/grafana-service.yaml
@@ -35,9 +35,10 @@ metadata:
 spec:
   ports:
 {{ toYaml .Values.grafana.service.ports | indent 2 }}
-  clusterIP: None
   selector:
     app: {{ template "pulsar.name" . }}
     release: {{ .Release.Name }}
     component: {{ .Values.grafana.component }}
+  type: ClusterIP
+  sessionAffinity: None
 {{- end }}
diff --git a/deployment/kubernetes/helm/pulsar/templates/proxy-deployment.yaml b/deployment/kubernetes/helm/pulsar/templates/proxy-deployment.yaml
index 94c5d760fc156..476f6086ff0f8 100644
--- a/deployment/kubernetes/helm/pulsar/templates/proxy-deployment.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/proxy-deployment.yaml
@@ -76,7 +76,7 @@ spec:
       terminationGracePeriodSeconds: {{ .Values.proxy.gracePeriod }}
       initContainers:
       # This init container will wait for zookeeper to be ready before
-      # deploying the bookies
+      # deploying the proxies
       - name: wait-zookeeper-ready
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -86,6 +86,21 @@ spec:
             until bin/pulsar zookeeper-shell -server {{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }} ls /admin/clusters/{{ template "pulsar.fullname" . }}; do
               sleep 3;
             done;
+      # This init container will wait for at least one broker to be ready before
+      # deploying the proxy
+      - name: wait-broker-ready
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        command: ["bash", "-c"]
+        args:
+          - >-
+            for i in {0..{{ .Values.broker.replicaCount }}}; do
+              brokerServiceNumber="$(nslookup -timeout=10 {{ template "pulsar.fullname" . }}-{{ .Values.broker.component }} | grep Name | wc -l)"
+              if [[ ${brokerServiceNumber} -ge 1 ]]; then
+                break
+              fi
+              sleep 30;
+            done;
       containers:
       - name: "{{ template "pulsar.fullname" . }}-{{ .Values.proxy.component }}"
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
diff --git a/deployment/kubernetes/helm/pulsar/templates/pulsar-manager-configmap.yaml b/deployment/kubernetes/helm/pulsar/templates/pulsar-manager-configmap.yaml
new file mode 100644
index 0000000000000..5444469cba53d
--- /dev/null
+++ b/deployment/kubernetes/helm/pulsar/templates/pulsar-manager-configmap.yaml
@@ -0,0 +1,33 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ template "pulsar.fullname" . }}-{{ .Values.pulsar_manager.component }}"
+  namespace: {{ .Values.namespace }}
+  labels:
+    app: {{ template "pulsar.name" . }}
+    chart: {{ template "pulsar.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+    component: {{ .Values.pulsar_manager.component }}
+    cluster: {{ template "pulsar.fullname" . }}
+data:
+{{ toYaml .Values.pulsar_manager.configData | indent 2 }}
diff --git a/deployment/kubernetes/helm/pulsar/templates/pulsar-manager-deployment.yaml b/deployment/kubernetes/helm/pulsar/templates/pulsar-manager-deployment.yaml
index 674ebf4e73399..8a8493aa53c92 100644
--- a/deployment/kubernetes/helm/pulsar/templates/pulsar-manager-deployment.yaml
+++ b/deployment/kubernetes/helm/pulsar/templates/pulsar-manager-deployment.yaml
@@ -60,27 +60,21 @@ spec:
         - name: "{{ template "pulsar.fullname" . }}-{{ .Values.pulsar_manager.component }}"
           image: "{{ .Values.pulsar_manager.image.repository }}:{{ .Values.pulsar_manager.image.tag }}"
           imagePullPolicy: {{ .Values.pulsar_manager.image.pullPolicy }}
-        {{- if .Values.grafana.resources }}
+        {{- if .Values.pulsar_manager.resources }}
           resources:
-{{ toYaml .Values.pulsar_manager.resources | indent 10 }}
+{{ toYaml .Values.pulsar_manager.resources | indent 12 }}
         {{- end }}
           ports:
           - containerPort: 9527
           volumeMounts:
           - name: pulsar-manager-data
             mountPath: /data
+          envFrom:
+          - configMapRef:
+              name: "{{ template "pulsar.fullname" . }}-{{ .Values.pulsar_manager.component }}"
           env:
-          # for supporting apachepulsar/pulsar-manager
           - name: PULSAR_CLUSTER
             value: {{ template "pulsar.fullname" . }}
-          - name: REDIRECT_HOST
-            value: http://127.0.0.1
-          - name: REDIRECT_PORT
-            value: "9527"
-          - name: DRIVER_CLASS_NAME
-            value: org.postgresql.Driver
-          - name: URL
-            value: jdbc:postgresql://127.0.0.1:5432/pulsar_manager
           - name: USERNAME
             valueFrom:
               secretKeyRef:
@@ -91,8 +85,6 @@ spec:
               secretKeyRef:
                 key: PULSAR_MANAGER_ADMIN_PASSWORD
                 name: "{{ template "pulsar.fullname" . }}-{{ .Values.pulsar_manager.component }}-secret"
-          - name: LOG_LEVEL
-            value: DEBUG
       volumes:
         - name: pulsar-manager-data
           emptyDir: {}
diff --git a/deployment/kubernetes/helm/pulsar/values-mini.yaml b/deployment/kubernetes/helm/pulsar/values-mini.yaml
index deca8193de86f..796e232b5251c 100644
--- a/deployment/kubernetes/helm/pulsar/values-mini.yaml
+++ b/deployment/kubernetes/helm/pulsar/values-mini.yaml
@@ -49,6 +49,8 @@ extra:
   bastion: yes
   # Monitoring stack (prometheus and grafana)
   monitoring: yes
+  # Configure Kubernetes runtime for Functions
+  functionsAsPods: no
 
 ## Which pulsar image to use
 image:
@@ -70,7 +72,7 @@ zookeeper:
   annotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "8000"
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   resources:
     requests:
@@ -140,7 +142,7 @@ bookkeeper:
   annotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "8000"
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   resources:
     requests:
@@ -179,7 +181,8 @@ bookkeeper:
   ## templates/bookkeeper-configmap.yaml
   ##
   configData:
-    PULSAR_MEM: "\"-Xms128m -Xmx256m -XX:MaxDirectMemorySize=128m -Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024 -XX:+UseG1GC -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintHeapAtGC -verbosegc -XX:G1LogLevel=finest\""
+    BOOKIE_MEM: "\"-Xms128m -Xmx256m -XX:MaxDirectMemorySize=128m -Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem\""
+    BOOKIE_GC: "\"-XX:+UseG1GC -XX:MaxGCPauseMillis=10\""
     PULSAR_PREFIX_dbStorage_writeCacheMaxSizeMb: "32"
     PULSAR_PREFIX_dbStorage_readAheadCacheMaxSizeMb: "32"
     PULSAR_PREFIX_journalMaxSizeMB: "2048"
@@ -212,7 +215,7 @@ broker:
   annotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "8080"
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   resources:
     requests:
@@ -245,6 +248,11 @@ broker:
   pdb:
     usePolicy: yes
     maxUnavailable: 1
+  ## Broker rbac
+  ## templates/broker-rbac.yaml
+  ##
+  functions:
+    component: functions-worker
 
 ## Pulsar Extra: Proxy
 ## templates/proxy-deployment.yaml
@@ -257,7 +265,7 @@ proxy:
   annotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "8080"
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   resources:
     requests:
@@ -299,7 +307,7 @@ autoRecovery:
   # nodeSelector:
     # cloud.google.com/gke-nodepool: default-pool
   annotations: {}
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   resources:
     requests:
@@ -321,7 +329,7 @@ dashboard:
   # nodeSelector:
     # cloud.google.com/gke-nodepool: default-pool
   annotations: {}
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   image:
     repository: apachepulsar/pulsar-dashboard
@@ -347,7 +355,7 @@ dashboard:
 
       ## Optional. Leave it blank if your Ingress Controller can provide a default certificate.
       secretName: ""
-    
+
     ## Required if ingress is enabled
     hostname: ""
     path: "/"
@@ -363,7 +371,7 @@ bastion:
   # nodeSelector:
     # cloud.google.com/gke-nodepool: default-pool
   annotations: {}
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   resources:
     requests:
@@ -384,7 +392,7 @@ prometheus:
   # nodeSelector:
     # cloud.google.com/gke-nodepool: default-pool
   annotations: {}
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   image:
     repository: prom/prometheus
@@ -393,7 +401,7 @@ prometheus:
     resources:
       requests:
         memory: 64Mi
-        cpu: 0.1  
+        cpu: 0.1
   volumes:
     data:
       name: data
@@ -427,7 +435,7 @@ grafana:
   # nodeSelector:
     # cloud.google.com/gke-nodepool: default-pool
   annotations: {}
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   image:
     repository: apachepulsar/pulsar-grafana
@@ -445,6 +453,31 @@ grafana:
     ports:
     - name: server
       port: 3000
+  plugins: []
+  ## Grafana ingress
+  ## templates/grafana-ingress.yaml
+  ##
+  ingress:
+    enabled: false
+    annotations:
+      kubernetes.io/ingress.class: nginx
+      # nginx.ingress.kubernetes.io/rewrite-target: /$1
+      # ingress.kubernetes.io/force-ssl-redirect: "true"
+      ingress.kubernetes.io/rewrite-target: /
+    labels: {}
+
+    tls: []
+
+    ## Optional. Leave it blank if your Ingress Controller can provide a default certificate.
+    #- secretName: ""
+
+    ## Extra paths to prepend to every host configuration. This is useful when working with annotation based services.
+    extraPaths: []
+    ## Required if ingress is enabled
+    hostname: ""
+    protocol: http
+    path: /grafana
+    port: 80
 
 zookeeper_metadata:
   resources:
@@ -462,7 +495,7 @@ pulsar_manager:
   # nodeSelector:
   # cloud.google.com/gke-nodepool: default-pool
   annotations: {}
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   image:
     repository: apachepulsar/pulsar-manager
@@ -472,6 +505,15 @@ pulsar_manager:
     requests:
       memory: 250Mi
       cpu: 0.1
+  configData:
+    REDIRECT_HOST: "http://127.0.0.1"
+    REDIRECT_PORT: "9527"
+    DRIVER_CLASS_NAME: org.postgresql.Driver
+    URL: jdbc:postgresql://127.0.0.1:5432/pulsar_manager
+    LOG_LEVEL: DEBUG
+    ## If you enabled authentication support
+    #JWT_TOKEN: <token>
+    #SECRET_KEY: data:base64,<secret key>
   ## Pulsar manager service
   ## templates/pulsar-manager-service.yaml
   ##
@@ -484,4 +526,3 @@ pulsar_manager:
   admin:
     user: pulsar
     password: pulsar
-
diff --git a/deployment/kubernetes/helm/pulsar/values.yaml b/deployment/kubernetes/helm/pulsar/values.yaml
index 90811b3a47a8f..d9fc5025805f9 100644
--- a/deployment/kubernetes/helm/pulsar/values.yaml
+++ b/deployment/kubernetes/helm/pulsar/values.yaml
@@ -49,6 +49,8 @@ extra:
   bastion: yes
   # Monitoring stack (prometheus and grafana)
   monitoring: yes
+  # Configure Kubernetes runtime for Functions
+  functionsAsPods: no
 
 ## Which pulsar image to use
 image:
@@ -70,7 +72,7 @@ zookeeper:
   annotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "8000"
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   resources:
     requests:
@@ -140,7 +142,7 @@ bookkeeper:
   annotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "8000"
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   resources:
     requests:
@@ -179,7 +181,8 @@ bookkeeper:
   ## templates/bookkeeper-configmap.yaml
   ##
   configData:
-    PULSAR_MEM: "\"-Xms15g -Xmx15g -XX:MaxDirectMemorySize=15g -Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024 -XX:+UseG1GC -XX:MaxGCPauseMillis=10 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintHeapAtGC -verbosegc -XX:G1LogLevel=finest\""
+    BOOKIE_MEM: "\"-Xms15g -Xmx15g -XX:MaxDirectMemorySize=15g -Dio.netty.leakDetectionLevel=disabled -Dio.netty.recycler.linkCapacity=1024 -XX:+ParallelRefProcEnabled -XX:+UnlockExperimentalVMOptions -XX:+AggressiveOpts -XX:+DoEscapeAnalysis -XX:ParallelGCThreads=32 -XX:ConcGCThreads=32 -XX:G1NewSizePercent=50 -XX:+DisableExplicitGC -XX:-ResizePLAB -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCApplicationStoppedTime -XX:+PrintHeapAtGC -verbosegc -XX:G1LogLevel=finest\""
+    BOOKIE_GC: "\"-XX:+UseG1GC -XX:MaxGCPauseMillis=10\""
     PULSAR_PREFIX_dbStorage_writeCacheMaxSizeMb: "2048"
     PULSAR_PREFIX_dbStorage_readAheadCacheMaxSizeMb: "2048"
     PULSAR_PREFIX_dbStorage_rocksDB_blockCacheSize: "268435456"
@@ -213,7 +216,7 @@ broker:
   annotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "8080"
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   resources:
     requests:
@@ -246,6 +249,11 @@ broker:
   pdb:
     usePolicy: yes
     maxUnavailable: 1
+  ## Broker rbac
+  ## templates/broker-rbac.yaml
+  ##
+  functions:
+    component: functions-worker
 
 ## Pulsar Extra: Proxy
 ## templates/proxy-deployment.yaml
@@ -258,7 +266,7 @@ proxy:
   annotations:
     prometheus.io/scrape: "true"
     prometheus.io/port: "8080"
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   resources:
     requests:
@@ -300,7 +308,7 @@ autoRecovery:
   # nodeSelector:
     # cloud.google.com/gke-nodepool: default-pool
   annotations: {}
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   resources:
     requests:
@@ -322,7 +330,7 @@ dashboard:
   # nodeSelector:
     # cloud.google.com/gke-nodepool: default-pool
   annotations: {}
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   image:
     repository: apachepulsar/pulsar-dashboard
@@ -348,7 +356,7 @@ dashboard:
 
       ## Optional. Leave it blank if your Ingress Controller can provide a default certificate.
       secretName: ""
-    
+
     ## Required if ingress is enabled
     hostname: ""
     path: "/"
@@ -364,7 +372,7 @@ bastion:
   # nodeSelector:
     # cloud.google.com/gke-nodepool: default-pool
   annotations: {}
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   resources:
     requests:
@@ -385,7 +393,7 @@ prometheus:
   # nodeSelector:
     # cloud.google.com/gke-nodepool: default-pool
   annotations: {}
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   image:
     repository: prom/prometheus
@@ -428,16 +436,16 @@ grafana:
   # nodeSelector:
     # cloud.google.com/gke-nodepool: default-pool
   annotations: {}
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   image:
     repository: apachepulsar/pulsar-grafana
     tag: latest
     pullPolicy: IfNotPresent
-#  resources:
-#    requests:
-#      memory: 4Gi
-#      cpu: 1
+  resources:
+    requests:
+      memory: 4Gi
+      cpu: 1
   ## Grafana service
   ## templates/grafana-service.yaml
   ##
@@ -446,6 +454,31 @@ grafana:
     ports:
     - name: server
       port: 3000
+  plugins: []
+  ## Grafana ingress
+  ## templates/grafana-ingress.yaml
+  ##
+  ingress:
+    enabled: false
+    annotations:
+      kubernetes.io/ingress.class: nginx
+      # nginx.ingress.kubernetes.io/rewrite-target: /$1
+      # ingress.kubernetes.io/force-ssl-redirect: "true"
+      ingress.kubernetes.io/rewrite-target: /
+    labels: {}
+
+    tls: []
+
+    ## Optional. Leave it blank if your Ingress Controller can provide a default certificate.
+    #- secretName: ""
+
+    ## Extra paths to prepend to every host configuration. This is useful when working with annotation based services.
+    extraPaths: []
+    ## Required if ingress is enabled
+    hostname: ""
+    protocol: http
+    path: /grafana
+    port: 80
 
 ## Components Stack: pulsar_manager
 ## templates/pulsar-manager.yaml
@@ -457,7 +490,7 @@ pulsar_manager:
   # nodeSelector:
   # cloud.google.com/gke-nodepool: default-pool
   annotations: {}
-  tolarations: []
+  tolerations: []
   gracePeriod: 0
   image:
     repository: apachepulsar/pulsar-manager
@@ -467,6 +500,15 @@ pulsar_manager:
     requests:
       memory: 250Mi
       cpu: 0.1
+  configData:
+    REDIRECT_HOST: "http://127.0.0.1"
+    REDIRECT_PORT: "9527"
+    DRIVER_CLASS_NAME: org.postgresql.Driver
+    URL: jdbc:postgresql://127.0.0.1:5432/pulsar_manager
+    LOG_LEVEL: DEBUG
+    ## If you enabled authentication support
+    #JWT_TOKEN: <token>
+    #SECRET_KEY: data:base64,<secret key>
   ## Pulsar manager service
   ## templates/pulsar-manager-service.yaml
   ##
@@ -479,4 +521,3 @@ pulsar_manager:
   admin:
     user: pulsar
     password: pulsar
-
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 9a57a48791066..a817987f0006b 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -358,9 +358,10 @@ The Apache Software License, Version 2.0
     - io.netty-netty-resolver-4.1.43.Final.jar
     - io.netty-netty-resolver-dns-4.1.43.Final.jar
     - io.netty-netty-transport-4.1.43.Final.jar
-    - io.netty-netty-transport-native-epoll-4.1.33.Final-linux-x86_64.jar
+    - io.netty-netty-transport-native-epoll-4.1.43.Final-linux-x86_64.jar
     - io.netty-netty-transport-native-epoll-4.1.43.Final.jar
     - io.netty-netty-transport-native-unix-common-4.1.43.Final.jar
+    - io.netty-netty-transport-native-unix-common-4.1.43.Final-linux-x86_64.jar
     - io.netty-netty-tcnative-boringssl-static-2.0.26.Final.jar
  * Prometheus client
     - io.prometheus-simpleclient-0.5.0.jar
@@ -496,7 +497,7 @@ The Apache Software License, Version 2.0
     - io.vertx-vertx-core-3.4.1.jar
     - io.vertx-vertx-web-3.4.1.jar
   * Apache ZooKeeper
-    - org.apache.zookeeper-zookeeper-jute-3.5.6.jar
+    - org.apache.zookeeper-zookeeper-jute-3.5.7.jar
 
 BSD 3-clause "New" or "Revised" License
  * Google auth library
diff --git a/docker/pulsar-standalone/Dockerfile b/docker/pulsar-standalone/Dockerfile
index 076d356949d80..42a70ab166c59 100644
--- a/docker/pulsar-standalone/Dockerfile
+++ b/docker/pulsar-standalone/Dockerfile
@@ -26,24 +26,16 @@ FROM apachepulsar/pulsar-dashboard:latest as dashboard
 # Restart from
 FROM openjdk:8-jdk
 
-# Copy pulsar files from pulsar-all
-COPY --from=pulsar /pulsar /pulsar
-
-# Copy dashboard files from pulsar-dashboard
-COPY --from=dashboard /pulsar/django /pulsar/django
-COPY --from=dashboard /pulsar/requirements.txt /pulsar/django
-COPY --from=dashboard /pulsar/conf/* /pulsar/conf/
-
 # Note that the libpq-dev package is needed here in order to install
 # the required python psycopg2 package (for postgresql) later
 RUN apt-get update
-RUN apt-get -y install python2.7 python-pip postgresql-9.6 sudo nginx supervisor libpq-dev
+RUN apt-get -y install python2.7 python-pip postgresql sudo nginx supervisor libpq-dev
 
 # Python dependencies
 RUN pip2 install -r /pulsar/django/requirements.txt 
 
 # Postgres configuration
-COPY --from=dashboard /etc/postgresql/9.6/main/postgresql.conf /etc/postgresql/9.6/main/postgresql.conf
+COPY --from=dashboard /etc/postgresql/11/main/postgresql.conf /etc/postgresql/11/main/postgresql.conf
 
 # Configure supervisor
 COPY --from=dashboard /etc/supervisor/conf.d/supervisor-app.conf /etc/supervisor/conf.d/supervisor-app.conf
@@ -59,6 +51,17 @@ redirect_stderr=true" >> /etc/supervisor/conf.d/supervisor-app.conf
 RUN echo "daemon off;" >> /etc/nginx/nginx.conf
 COPY --from=dashboard /etc/nginx/sites-available/default /etc/nginx/sites-available/default
 
+# Copy pulsar files from pulsar-all
+COPY --from=pulsar /pulsar /pulsar
+
+# Copy web-app sources
+COPY . /pulsar/
+
+# Copy dashboard files from pulsar-dashboard
+COPY --from=dashboard /pulsar/django /pulsar/django
+COPY --from=dashboard /pulsar/requirements.txt /pulsar/django
+COPY --from=dashboard /pulsar/conf/* /pulsar/conf/
+
 # Copy web-app sources
 # Setup database and create tables
 COPY --from=dashboard /pulsar/init-postgres.sh /pulsar/django/init-postgres.sh
diff --git a/docker/pulsar/Dockerfile b/docker/pulsar/Dockerfile
index d4b86469312c9..d8ceac8b7d678 100644
--- a/docker/pulsar/Dockerfile
+++ b/docker/pulsar/Dockerfile
@@ -39,7 +39,6 @@ COPY scripts/install-pulsar-client-37.sh /pulsar/bin
 ### and add Python dependencies (for Pulsar functions)
 
 FROM openjdk:8-jdk-slim
-COPY --from=pulsar /pulsar /pulsar
 
 # Install some utilities
 RUN apt-get update \
@@ -57,16 +56,20 @@ RUN python3.7 get-pip.py
 
 ADD target/python-client/ /pulsar/pulsar-client
 ADD target/cpp-client/ /pulsar/cpp-client
-RUN /pulsar/bin/install-pulsar-client-27.sh
-RUN /pulsar/bin/install-pulsar-client-37.sh
 RUN echo networkaddress.cache.ttl=1 >> $JAVA_HOME/jre/lib/security/java.security
 RUN apt-get update \
      && apt install -y /pulsar/cpp-client/*.deb \
      && apt-get clean \
      && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /pulsar
-
 VOLUME  ["/pulsar/conf", "/pulsar/data"]
 
 ENV PULSAR_ROOT_LOGGER=INFO,CONSOLE
+
+
+COPY --from=pulsar /pulsar /pulsar
+WORKDIR /pulsar
+
+RUN /pulsar/bin/install-pulsar-client-27.sh
+RUN /pulsar/bin/install-pulsar-client-37.sh
+
diff --git a/docker/pulsar/scripts/apply-config-from-env.py b/docker/pulsar/scripts/apply-config-from-env.py
index 3d0e5ee8e295d..92f555403ebe1 100755
--- a/docker/pulsar/scripts/apply-config-from-env.py
+++ b/docker/pulsar/scripts/apply-config-from-env.py
@@ -68,6 +68,9 @@
         if k not in keys:
             print('[%s] Adding config %s = %s' % (conf_filename, k, v))
             lines.append('%s=%s\n' % (k, v))
+        else:
+            print('[%s] Updating config %s = %s' %(conf_filename, k, v))
+            lines[keys[k]] = '%s=%s\n' % (k, v)
 
     # Store back the updated config in the same file
     f = open(conf_filename, 'w')
diff --git a/managed-ledger/pom.xml b/managed-ledger/pom.xml
index 06d057263317b..b883c8661d9c4 100644
--- a/managed-ledger/pom.xml
+++ b/managed-ledger/pom.xml
@@ -60,6 +60,12 @@
       <artifactId>pulsar-common</artifactId>
       <version>${project.version}</version>
     </dependency>
+    
+    <dependency>
+      <groupId>org.apache.pulsar</groupId>
+      <artifactId>pulsar-metadata</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>com.google.guava</groupId>
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloader.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloader.java
index c85fe9fd79107..9402e82ff2215 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloader.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloader.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.CompletableFuture;
 
 import org.apache.bookkeeper.client.api.ReadHandle;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 
 /**
  * Interface for offloading ledgers to long-term storage
@@ -112,5 +113,17 @@ CompletableFuture<ReadHandle> readOffloaded(long ledgerId, UUID uid,
      */
     CompletableFuture<Void> deleteOffloaded(long ledgerId, UUID uid,
                                             Map<String, String> offloadDriverMetadata);
+
+    /**
+     * Get offload policies of this LedgerOffloader
+     *
+     * @return offload policies
+     */
+    OffloadPolicies getOffloadPolicies();
+
+    /**
+     * Close the resources if necessary
+     */
+    void close();
 }
 
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderFactory.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderFactory.java
index f0a6890aeb272..7a0e6dc38d0d9 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderFactory.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/LedgerOffloaderFactory.java
@@ -24,6 +24,7 @@
 import org.apache.bookkeeper.common.annotation.InterfaceAudience.LimitedPrivate;
 import org.apache.bookkeeper.common.annotation.InterfaceStability.Evolving;
 import org.apache.bookkeeper.common.util.OrderedScheduler;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 
 /**
  * Factory to create {@link LedgerOffloader} to offload ledgers into long-term storage.
@@ -43,13 +44,13 @@ public interface LedgerOffloaderFactory<T extends LedgerOffloader> {
     /**
      * Create a ledger offloader with the provided configuration, user-metadata and scheduler.
      *
-     * @param properties service configuration
+     * @param offloadPolicies offload policies
      * @param userMetadata user metadata
      * @param scheduler scheduler
      * @return the offloader instance
      * @throws IOException when fail to create an offloader
      */
-    T create(Properties properties,
+    T create(OffloadPolicies offloadPolicies,
              Map<String, String> userMetadata,
              OrderedScheduler scheduler)
         throws IOException;
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursor.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursor.java
index ae0426935637c..6f12fb2cb20dc 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursor.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedCursor.java
@@ -193,9 +193,10 @@ void asyncGetNthEntry(int n, IndividualDeletedEntries deletedEntries, ReadEntryC
      *
      * <p/>This method has linear time complexity on the number of ledgers included in the managed ledger.
      *
+     * @param isPrecise set to true to get precise backlog count
      * @return the number of entries
      */
-    long getNumberOfEntriesInBacklog();
+    long getNumberOfEntriesInBacklog(boolean isPrecise);
 
     /**
      * This signals that the reader is done with all the entries up to "position" (included). This can potentially
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerException.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerException.java
index 698acfd33e74d..6e6e6a2b848c7 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerException.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerException.java
@@ -39,8 +39,12 @@ public static ManagedLedgerException getManagedLedgerException(Throwable e) {
     }
 
     public static class MetaStoreException extends ManagedLedgerException {
-        public MetaStoreException(Exception e) {
-            super(e);
+        public MetaStoreException(Throwable t) {
+            super(t);
+        }
+
+        public MetaStoreException(String msg) {
+            super(msg);
         }
     }
 
@@ -48,12 +52,20 @@ public static class BadVersionException extends MetaStoreException {
         public BadVersionException(Exception e) {
             super(e);
         }
+
+        public BadVersionException(String msg) {
+            super(msg);
+        }
     }
 
     public static class MetadataNotFoundException extends MetaStoreException {
         public MetadataNotFoundException(Exception e) {
             super(e);
         }
+
+        public MetadataNotFoundException(String msg) {
+            super(msg);
+        }
     }
 
 
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerInfo.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerInfo.java
index ff3f6b505a57a..c03da89921e7c 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerInfo.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerInfo.java
@@ -24,7 +24,7 @@
 @SuppressWarnings("checkstyle:javadoctype")
 public class ManagedLedgerInfo {
     /** Z-Node version. */
-    public int version;
+    public long version;
     public String creationDate;
     public String modificationDate;
 
@@ -42,7 +42,7 @@ public static class LedgerInfo {
 
     public static class CursorInfo {
         /** Z-Node version. */
-        public int version;
+        public long version;
         public String creationDate;
         public String modificationDate;
 
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
index d76553877fbef..9498145de2823 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
@@ -83,7 +83,6 @@
 import org.apache.bookkeeper.mledger.Position;
 import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl.PositionBound;
 import org.apache.bookkeeper.mledger.impl.MetaStore.MetaStoreCallback;
-import org.apache.bookkeeper.mledger.impl.MetaStore.Stat;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.LongProperty;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedCursorInfo;
@@ -93,6 +92,7 @@
 import org.apache.pulsar.common.util.collections.ConcurrentOpenLongPairRangeSet;
 import org.apache.pulsar.common.util.collections.LongPairRangeSet;
 import org.apache.pulsar.common.util.collections.LongPairRangeSet.LongPairConsumer;
+import org.apache.pulsar.metadata.api.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -734,12 +734,16 @@ public long getEstimatedSizeSinceMarkDeletePosition() {
     }
 
     @Override
-    public long getNumberOfEntriesInBacklog() {
+    public long getNumberOfEntriesInBacklog(boolean isPrecise) {
         if (log.isDebugEnabled()) {
             log.debug("[{}] Consumer {} cursor ml-entries: {} -- deleted-counter: {} other counters: mdPos {} rdPos {}",
                     ledger.getName(), name, ManagedLedgerImpl.ENTRIES_ADDED_COUNTER_UPDATER.get(ledger),
                     messagesConsumedCounter, markDeletePosition, readPosition);
         }
+        if (isPrecise) {
+            return getNumberOfEntries(Range.closed(markDeletePosition, ledger.getLastPosition())) - 1;
+        }
+
         long backlog = ManagedLedgerImpl.ENTRIES_ADDED_COUNTER_UPDATER.get(ledger) - messagesConsumedCounter;
         if (backlog < 0) {
             // In some case the counters get incorrect values, fall back to the precise backlog count
@@ -948,14 +952,21 @@ public void asyncResetCursor(Position newPos, AsyncCallbacks.ResetCursorCallback
 
         // order trim and reset operations on a ledger
         ledger.getExecutor().executeOrdered(ledger.getName(), safeRun(() -> {
-            if (ledger.isValidPosition(newPosition) || newPosition.equals(PositionImpl.earliest)
-                    || newPosition.equals(PositionImpl.latest)) {
-                internalResetCursor(newPosition, callback);
-            } else {
-                // caller (replay) should handle this error and retry cursor reset
-                callback.resetFailed(new ManagedLedgerException.InvalidCursorPositionException(newPosition.toString()),
-                        newPosition);
+            PositionImpl actualPosition = newPosition;
+
+            if (!ledger.isValidPosition(actualPosition) &&
+                !actualPosition.equals(PositionImpl.earliest) &&
+                !actualPosition.equals(PositionImpl.latest)) {
+                actualPosition = ledger.getNextValidPosition(actualPosition);
+
+                if (actualPosition == null) {
+                    // next valid position would only return null when newPos
+                    // is larger than all available positions, then it's latest in effect.
+                    actualPosition = PositionImpl.latest;
+                }
             }
+
+            internalResetCursor(actualPosition, callback);
         }));
     }
 
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryImpl.java
index f8abcebafda4f..b88bc7f3444f1 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryImpl.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryImpl.java
@@ -68,7 +68,6 @@
 import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl.ManagedLedgerInitializeLedgerCallback;
 import org.apache.bookkeeper.mledger.impl.ManagedLedgerImpl.State;
 import org.apache.bookkeeper.mledger.impl.MetaStore.MetaStoreCallback;
-import org.apache.bookkeeper.mledger.impl.MetaStore.Stat;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.LongProperty;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedCursorInfo;
@@ -76,7 +75,9 @@
 import org.apache.bookkeeper.mledger.util.Futures;
 import org.apache.bookkeeper.zookeeper.ZooKeeperClient;
 import org.apache.pulsar.common.util.DateFormatter;
-import org.apache.zookeeper.KeeperException;
+import org.apache.pulsar.metadata.api.MetadataStore;
+import org.apache.pulsar.metadata.api.Stat;
+import org.apache.pulsar.metadata.impl.zookeeper.ZKMetadataStore;
 import org.apache.zookeeper.ZooKeeper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -101,6 +102,7 @@ public class ManagedLedgerFactoryImpl implements ManagedLedgerFactory {
     private final ScheduledFuture<?> statsTask;
 
     private final long cacheEvictionTimeThresholdNanos;
+    private final MetadataStore metadataStore;
 
     private static final int StatsPeriodSeconds = 60;
 
@@ -160,7 +162,8 @@ private ManagedLedgerFactoryImpl(BookkeeperFactoryForCustomEnsemblePlacementPoli
         this.bookkeeperFactory = bookKeeperGroupFactory;
         this.isBookkeeperManaged = isBookkeeperManaged;
         this.zookeeper = isBookkeeperManaged ? zooKeeper : null;
-        this.store = new MetaStoreImplZookeeper(zooKeeper, orderedExecutor);
+        this.metadataStore = new ZKMetadataStore(zooKeeper);
+        this.store = new MetaStoreImpl(metadataStore, orderedExecutor);
         this.config = config;
         this.mbean = new ManagedLedgerFactoryMBeanImpl(this);
         this.entryCacheManager = new EntryCacheManager(this);
@@ -464,6 +467,11 @@ public void closeFailed(ManagedLedgerException exception, Object ctx) {
         cacheEvictionExecutor.shutdownNow();
 
         entryCacheManager.clear();
+        try {
+            metadataStore.close();
+        } catch (Exception e) {
+            throw new ManagedLedgerException(e);
+        }
     }
 
     @Override
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
index 85850acb5373c..ecf99a426dbd4 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
@@ -24,6 +24,7 @@
 import static org.apache.bookkeeper.mledger.util.Errors.isNoSuchLedgerExistsException;
 import static org.apache.bookkeeper.mledger.util.SafeRun.safeRun;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.BoundType;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -106,7 +107,6 @@
 import org.apache.bookkeeper.mledger.Position;
 import org.apache.bookkeeper.mledger.impl.ManagedCursorImpl.VoidCallback;
 import org.apache.bookkeeper.mledger.impl.MetaStore.MetaStoreCallback;
-import org.apache.bookkeeper.mledger.impl.MetaStore.Stat;
 import org.apache.bookkeeper.mledger.offload.OffloadUtils;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo.LedgerInfo;
@@ -117,6 +117,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.pulsar.common.api.proto.PulsarApi.CommandSubscribe.InitialPosition;
 import org.apache.pulsar.common.util.collections.ConcurrentLongHashMap;
+import org.apache.pulsar.metadata.api.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -142,6 +143,7 @@ public class ManagedLedgerImpl implements ManagedLedger, CreateCallback {
     private final ManagedCursorContainer activeCursors = new ManagedCursorContainer();
 
     // Ever increasing counter of entries added
+    @VisibleForTesting
     static final AtomicLongFieldUpdater<ManagedLedgerImpl> ENTRIES_ADDED_COUNTER_UPDATER = AtomicLongFieldUpdater
             .newUpdater(ManagedLedgerImpl.class, "entriesAddedCounter");
     @SuppressWarnings("unused")
@@ -3176,6 +3178,11 @@ public long getOffloadedSize() {
         return offloadedSize;
     }
 
+    @VisibleForTesting
+    public void setEntriesAddedCounter(long count) {
+        ENTRIES_ADDED_COUNTER_UPDATER.set(this, count);
+    }
+
     private static final Logger log = LoggerFactory.getLogger(ManagedLedgerImpl.class);
 
 }
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanImpl.java
index 38c67f49f8085..ec1dc74a290bd 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanImpl.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerMBeanImpl.java
@@ -263,7 +263,7 @@ public long getNumberOfMessagesInBacklog() {
         long count = 0;
 
         for (ManagedCursor cursor : managedLedger.getCursors()) {
-            count += cursor.getNumberOfEntriesInBacklog();
+            count += cursor.getNumberOfEntriesInBacklog(false);
         }
 
         return count;
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerOfflineBacklog.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerOfflineBacklog.java
index 382f457688b4a..d8b49ad959b62 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerOfflineBacklog.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerOfflineBacklog.java
@@ -41,6 +41,7 @@
 import org.apache.pulsar.common.naming.TopicName;
 import org.apache.pulsar.common.policies.data.PersistentOfflineTopicStats;
 import org.apache.pulsar.common.util.collections.ConcurrentOpenHashMap;
+import org.apache.pulsar.metadata.api.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -146,7 +147,7 @@ private void readLedgerMeta(final ManagedLedgerFactoryImpl factory, final TopicN
         store.getManagedLedgerInfo(managedLedgerName, false /* createIfMissing */,
                 new MetaStore.MetaStoreCallback<MLDataFormats.ManagedLedgerInfo>() {
                     @Override
-                    public void operationComplete(MLDataFormats.ManagedLedgerInfo mlInfo, MetaStore.Stat version) {
+                    public void operationComplete(MLDataFormats.ManagedLedgerInfo mlInfo, Stat stat) {
                         for (MLDataFormats.ManagedLedgerInfo.LedgerInfo ls : mlInfo.getLedgerInfoList()) {
                             ledgers.put(ls.getLedgerId(), ls);
                         }
@@ -230,7 +231,7 @@ private void calculateCursorBacklogs(final ManagedLedgerFactoryImpl factory, fin
 
         store.getCursors(managedLedgerName, new MetaStore.MetaStoreCallback<List<String>>() {
             @Override
-            public void operationComplete(List<String> cursors, MetaStore.Stat v) {
+            public void operationComplete(List<String> cursors, Stat v) {
                 // Load existing cursors
                 if (log.isDebugEnabled()) {
                     log.debug("[{}] Found {} cursors", managedLedgerName, cursors.size());
@@ -336,7 +337,7 @@ public void readComplete(int rc, LedgerHandle lh, Enumeration<LedgerEntry> seq,
                             new MetaStore.MetaStoreCallback<MLDataFormats.ManagedCursorInfo>() {
                                 @Override
                                 public void operationComplete(MLDataFormats.ManagedCursorInfo info,
-                                        MetaStore.Stat version) {
+                                        Stat stat) {
                                     long cursorLedgerId = info.getCursorsLedgerId();
                                     if (log.isDebugEnabled()) {
                                         log.debug("[{}] Cursor {} meta-data read ledger id {}", managedLedgerName,
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStore.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStore.java
index 72ef566a9cc7d..8b99203c91a57 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStore.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStore.java
@@ -22,19 +22,13 @@
 import org.apache.bookkeeper.mledger.ManagedLedgerException.MetaStoreException;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedCursorInfo;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo;
+import org.apache.pulsar.metadata.api.Stat;
 
 /**
  * Interface that describes the operations that the ManagedLedger need to do on the metadata store.
  */
 public interface MetaStore {
 
-    @SuppressWarnings("checkstyle:javadoctype")
-    interface Stat {
-        int getVersion();
-        long getCreationTimestamp();
-        long getModificationTimestamp();
-    }
-
     @SuppressWarnings("checkstyle:javadoctype")
     interface UpdateLedgersIdsCallback {
         void updateLedgersIdsComplete(MetaStoreException status, Stat stat);
@@ -64,12 +58,12 @@ interface MetaStoreCallback<T> {
      *            the name of the ManagedLedger
      * @param mlInfo
      *            managed ledger info
-     * @param version
+     * @param stat
      *            version object associated with current state
      * @param callback
      *            callback object
      */
-    void asyncUpdateLedgerIds(String ledgerName, ManagedLedgerInfo mlInfo, Stat version,
+    void asyncUpdateLedgerIds(String ledgerName, ManagedLedgerInfo mlInfo, Stat stat,
             MetaStoreCallback<Void> callback);
 
     /**
@@ -98,12 +92,12 @@ void asyncUpdateLedgerIds(String ledgerName, ManagedLedgerInfo mlInfo, Stat vers
      *            the name of the ManagedLedger
      * @param cursorName
      * @param info
-     * @param version
+     * @param stat
      * @param callback
      *            the callback
      * @throws MetaStoreException
      */
-    void asyncUpdateCursorInfo(String ledgerName, String cursorName, ManagedCursorInfo info, Stat version,
+    void asyncUpdateCursorInfo(String ledgerName, String cursorName, ManagedCursorInfo info, Stat stat,
             MetaStoreCallback<Void> callback);
 
     /**
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStoreImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStoreImpl.java
new file mode 100644
index 0000000000000..8f229fdb478e9
--- /dev/null
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStoreImpl.java
@@ -0,0 +1,286 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.bookkeeper.mledger.impl;
+
+import com.google.protobuf.InvalidProtocolBufferException;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CompletionException;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.apache.bookkeeper.common.util.OrderedExecutor;
+import org.apache.bookkeeper.mledger.ManagedLedgerException;
+import org.apache.bookkeeper.mledger.ManagedLedgerException.MetaStoreException;
+import org.apache.bookkeeper.mledger.ManagedLedgerException.MetadataNotFoundException;
+import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedCursorInfo;
+import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo;
+import org.apache.bookkeeper.util.SafeRunnable;
+import org.apache.pulsar.metadata.api.MetadataStore;
+import org.apache.pulsar.metadata.api.MetadataStoreException;
+import org.apache.pulsar.metadata.api.Stat;
+
+@Slf4j
+public class MetaStoreImpl implements MetaStore {
+
+    private static final String BASE_NODE = "/managed-ledgers";
+    private static final String PREFIX = BASE_NODE + "/";
+
+    private final MetadataStore store;
+    private final OrderedExecutor executor;
+
+    public MetaStoreImpl(MetadataStore store, OrderedExecutor executor) {
+        this.store = store;
+        this.executor = executor;
+    }
+
+    @Override
+    public void getManagedLedgerInfo(String ledgerName, boolean createIfMissing,
+            MetaStoreCallback<ManagedLedgerInfo> callback) {
+        // Try to get the content or create an empty node
+        String path = PREFIX + ledgerName;
+        store.get(path)
+                .thenAcceptAsync(optResult -> {
+                    if (optResult.isPresent()) {
+                        ManagedLedgerInfo info;
+                        try {
+                            info = ManagedLedgerInfo.parseFrom(optResult.get().getValue());
+                            info = updateMLInfoTimestamp(info);
+                            callback.operationComplete(info, optResult.get().getStat());
+                        } catch (InvalidProtocolBufferException e) {
+                            callback.operationFailed(getException(e));
+                        }
+                    } else {
+                        // Z-node doesn't exist
+                        if (createIfMissing) {
+                            log.info("Creating '{}'", path);
+
+                            store.put(path, new byte[0], Optional.of(-1L))
+                                    .thenAccept(stat -> {
+                                        ManagedLedgerInfo info = ManagedLedgerInfo.getDefaultInstance();
+                                        callback.operationComplete(info, stat);
+                                    }).exceptionally(ex -> {
+                                        callback.operationFailed(getException(ex));
+                                        return null;
+                                    });
+                        } else {
+                            // Tried to open a managed ledger but it doesn't exist and we shouldn't creating it at this
+                            // point
+                            callback.operationFailed(new MetadataNotFoundException("Managed ledger not found"));
+                        }
+                    }
+                }, executor.chooseThread(ledgerName))
+                .exceptionally(ex -> {
+                    executor.executeOrdered(ledgerName, SafeRunnable.safeRun(() -> {
+                        callback.operationFailed(getException(ex));
+                    }));
+                    return null;
+                });
+    }
+
+    @Override
+    public void asyncUpdateLedgerIds(String ledgerName, ManagedLedgerInfo mlInfo, Stat stat,
+            MetaStoreCallback<Void> callback) {
+        if (log.isDebugEnabled()) {
+            log.debug("[{}] Updating metadata version={} with content={}", ledgerName, stat, mlInfo);
+        }
+
+        byte[] serializedMlInfo = mlInfo.toByteArray(); // Binary format
+        String path = PREFIX + ledgerName;
+        store.put(path, serializedMlInfo, Optional.of(stat.getVersion()))
+                .thenAcceptAsync(newVersion -> {
+                    callback.operationComplete(null, newVersion);
+                }, executor.chooseThread(ledgerName))
+                .exceptionally(ex -> {
+                    executor.executeOrdered(ledgerName, SafeRunnable.safeRun(() -> {
+                        callback.operationFailed(getException(ex));
+                    }));
+                    return null;
+                });
+    }
+
+    @Override
+    public void getCursors(String ledgerName, MetaStoreCallback<List<String>> callback) {
+        if (log.isDebugEnabled()) {
+            log.debug("[{}] Get cursors list", ledgerName);
+        }
+
+        String path = PREFIX + ledgerName;
+        store.getChildren(path)
+                .thenAcceptAsync(cursors -> {
+                    callback.operationComplete(cursors, null);
+                }, executor.chooseThread(ledgerName))
+                .exceptionally(ex -> {
+                    executor.executeOrdered(ledgerName, SafeRunnable.safeRun(() -> {
+                        callback.operationFailed(getException(ex));
+                    }));
+                    return null;
+                });
+    }
+
+    @Override
+    public void asyncGetCursorInfo(String ledgerName, String cursorName,
+            MetaStoreCallback<ManagedCursorInfo> callback) {
+        String path = PREFIX + ledgerName + "/" + cursorName;
+        if (log.isDebugEnabled()) {
+            log.debug("Reading from {}", path);
+        }
+
+        store.get(path)
+                .thenAcceptAsync(optRes -> {
+                    if (optRes.isPresent()) {
+                        try {
+                            ManagedCursorInfo info = ManagedCursorInfo.parseFrom(optRes.get().getValue());
+                            callback.operationComplete(info, optRes.get().getStat());
+                        } catch (InvalidProtocolBufferException e) {
+                            callback.operationFailed(getException(e));
+                        }
+                    } else {
+                        callback.operationFailed(new MetadataNotFoundException("Cursor metadata not found"));
+                    }
+                }, executor.chooseThread(ledgerName))
+                .exceptionally(ex -> {
+                    executor.executeOrdered(ledgerName, SafeRunnable.safeRun(() -> {
+                        callback.operationFailed(getException(ex));
+                    }));
+                    return null;
+                });
+    }
+
+    @Override
+    public void asyncUpdateCursorInfo(String ledgerName, String cursorName, ManagedCursorInfo info, Stat stat,
+            MetaStoreCallback<Void> callback) {
+        log.info("[{}] [{}] Updating cursor info ledgerId={} mark-delete={}:{}", ledgerName, cursorName,
+                info.getCursorsLedgerId(), info.getMarkDeleteLedgerId(), info.getMarkDeleteEntryId());
+
+        String path = PREFIX + ledgerName + "/" + cursorName;
+        byte[] content = info.toByteArray(); // Binary format
+
+        long expectedVersion;
+
+        if (stat != null) {
+            expectedVersion = stat.getVersion();
+            if (log.isDebugEnabled()) {
+                log.debug("[{}] Creating consumer {} on meta-data store with {}", ledgerName, cursorName, info);
+            }
+        } else {
+            expectedVersion = -1;
+            if (log.isDebugEnabled()) {
+                log.debug("[{}] Updating consumer {} on meta-data store with {}", ledgerName, cursorName, info);
+            }
+        }
+
+        store.put(path, content, Optional.of(expectedVersion))
+                .thenAcceptAsync(optStat -> {
+                    callback.operationComplete(null, optStat);
+                }, executor.chooseThread(ledgerName))
+                .exceptionally(ex -> {
+                    executor.executeOrdered(ledgerName, SafeRunnable.safeRun(() -> {
+                        callback.operationFailed(getException(ex));
+                    }));
+                    return null;
+                });
+    }
+
+    @Override
+    public void asyncRemoveCursor(String ledgerName, String cursorName, MetaStoreCallback<Void> callback) {
+        String path = PREFIX + ledgerName + "/" + cursorName;
+        log.info("[{}] Remove consumer={}", ledgerName, cursorName);
+
+        store.delete(path, Optional.empty())
+                .thenAcceptAsync(v -> {
+                    if (log.isDebugEnabled()) {
+                        log.debug("[{}] [{}] cursor delete done", ledgerName, cursorName);
+                    }
+                    callback.operationComplete(null, null);
+                }, executor.chooseThread(ledgerName))
+                .exceptionally(ex -> {
+                    executor.executeOrdered(ledgerName, SafeRunnable.safeRun(() -> {
+                        callback.operationFailed(getException(ex));
+                    }));
+                    return null;
+                });
+    }
+
+    @Override
+    public void removeManagedLedger(String ledgerName, MetaStoreCallback<Void> callback) {
+        log.info("[{}] Remove ManagedLedger", ledgerName);
+
+        String path = PREFIX + ledgerName;
+        store.delete(path, Optional.empty())
+                .thenAcceptAsync(v -> {
+                    if (log.isDebugEnabled()) {
+                        log.debug("[{}] managed ledger delete done", ledgerName);
+                    }
+                    callback.operationComplete(null, null);
+                }, executor.chooseThread(ledgerName))
+                .exceptionally(ex -> {
+                    executor.executeOrdered(ledgerName, SafeRunnable.safeRun(() -> {
+                        callback.operationFailed(getException(ex));
+                    }));
+                    return null;
+                });
+    }
+
+    @Override
+    public Iterable<String> getManagedLedgers() throws MetaStoreException {
+        try {
+            return store.getChildren(BASE_NODE).join();
+        } catch (CompletionException e) {
+            throw getException(e);
+        }
+    }
+
+    //
+    // update timestamp if missing or 0
+    // 3 cases - timestamp does not exist for ledgers serialized before
+    // - timestamp is 0 for a ledger in recovery
+    // - ledger has timestamp which is the normal case now
+
+    private static ManagedLedgerInfo updateMLInfoTimestamp(ManagedLedgerInfo info) {
+        List<ManagedLedgerInfo.LedgerInfo> infoList = new ArrayList<>(info.getLedgerInfoCount());
+        long currentTime = System.currentTimeMillis();
+
+        for (ManagedLedgerInfo.LedgerInfo ledgerInfo : info.getLedgerInfoList()) {
+            if (!ledgerInfo.hasTimestamp() || ledgerInfo.getTimestamp() == 0) {
+                ManagedLedgerInfo.LedgerInfo.Builder singleInfoBuilder = ledgerInfo.toBuilder();
+                singleInfoBuilder.setTimestamp(currentTime);
+                infoList.add(singleInfoBuilder.build());
+            } else {
+                infoList.add(ledgerInfo);
+            }
+        }
+        ManagedLedgerInfo.Builder mlInfo = ManagedLedgerInfo.newBuilder();
+        mlInfo.addAllLedgerInfo(infoList);
+        if (info.hasTerminatedPosition()) {
+            mlInfo.setTerminatedPosition(info.getTerminatedPosition());
+        }
+        return mlInfo.build();
+    }
+
+    private static MetaStoreException getException(Throwable t) {
+        if (t.getCause() instanceof MetadataStoreException.BadVersionException) {
+            return new ManagedLedgerException.BadVersionException(t.getMessage());
+        } else {
+            return new MetaStoreException(t);
+        }
+    }
+}
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStoreImplZookeeper.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStoreImplZookeeper.java
deleted file mode 100644
index 2e69614f65000..0000000000000
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/MetaStoreImplZookeeper.java
+++ /dev/null
@@ -1,422 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.bookkeeper.mledger.impl;
-
-import static org.apache.bookkeeper.mledger.util.SafeRun.safeRun;
-
-import com.google.common.base.Charsets;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.TextFormat;
-import com.google.protobuf.TextFormat.ParseException;
-
-import java.io.File;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ForkJoinPool;
-import java.util.function.Consumer;
-
-import org.apache.bookkeeper.common.util.OrderedExecutor;
-import org.apache.bookkeeper.mledger.ManagedLedgerException;
-import org.apache.bookkeeper.mledger.ManagedLedgerException.BadVersionException;
-import org.apache.bookkeeper.mledger.ManagedLedgerException.MetaStoreException;
-import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedCursorInfo;
-import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo;
-import org.apache.zookeeper.AsyncCallback.StringCallback;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.KeeperException.Code;
-import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.ZooKeeper;
-import org.apache.zookeeper.data.ACL;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings("checkstyle:javadoctype")
-public class MetaStoreImplZookeeper implements MetaStore {
-
-    private static final Charset Encoding = Charsets.UTF_8;
-    private static final List<ACL> Acl = ZooDefs.Ids.OPEN_ACL_UNSAFE;
-
-    private static final String prefixName = "/managed-ledgers";
-    private static final String prefix = prefixName + "/";
-
-    private final ZooKeeper zk;
-    private final OrderedExecutor executor;
-
-    private static class ZKStat implements Stat {
-        private final int version;
-        private final long creationTimestamp;
-        private final long modificationTimestamp;
-
-        ZKStat(org.apache.zookeeper.data.Stat stat) {
-            this.version = stat.getVersion();
-            this.creationTimestamp = stat.getCtime();
-            this.modificationTimestamp = stat.getMtime();
-        }
-
-        ZKStat() {
-            this.version = 0;
-            this.creationTimestamp = System.currentTimeMillis();
-            this.modificationTimestamp = System.currentTimeMillis();
-        }
-
-        @Override
-        public int getVersion() {
-            return version;
-        }
-
-        @Override
-        public long getCreationTimestamp() {
-            return creationTimestamp;
-        }
-
-        @Override
-        public long getModificationTimestamp() {
-            return modificationTimestamp;
-        }
-    }
-
-    public MetaStoreImplZookeeper(ZooKeeper zk, OrderedExecutor executor)
-            throws Exception {
-        this.zk = zk;
-        this.executor = executor;
-    }
-
-    //
-    // update timestamp if missing or 0
-    // 3 cases - timestamp does not exist for ledgers serialized before
-    // - timestamp is 0 for a ledger in recovery
-    // - ledger has timestamp which is the normal case now
-
-    private ManagedLedgerInfo updateMLInfoTimestamp(ManagedLedgerInfo info) {
-        List<ManagedLedgerInfo.LedgerInfo> infoList = new ArrayList<>(info.getLedgerInfoCount());
-        long currentTime = System.currentTimeMillis();
-
-        for (ManagedLedgerInfo.LedgerInfo ledgerInfo : info.getLedgerInfoList()) {
-            if (!ledgerInfo.hasTimestamp() || ledgerInfo.getTimestamp() == 0) {
-                ManagedLedgerInfo.LedgerInfo.Builder singleInfoBuilder = ledgerInfo.toBuilder();
-                singleInfoBuilder.setTimestamp(currentTime);
-                infoList.add(singleInfoBuilder.build());
-            } else {
-                infoList.add(ledgerInfo);
-            }
-        }
-        ManagedLedgerInfo.Builder mlInfo = ManagedLedgerInfo.newBuilder();
-        mlInfo.addAllLedgerInfo(infoList);
-        if (info.hasTerminatedPosition()) {
-            mlInfo.setTerminatedPosition(info.getTerminatedPosition());
-        }
-        return mlInfo.build();
-    }
-
-    @Override
-    public void getManagedLedgerInfo(final String ledgerName, boolean createIfMissing,
-            final MetaStoreCallback<ManagedLedgerInfo> callback) {
-        // Try to get the content or create an empty node
-        zk.getData(prefix + ledgerName, false,
-                (rc, path, ctx, readData, stat) -> executor.executeOrdered(ledgerName, safeRun(() -> {
-                    if (rc == Code.OK.intValue()) {
-                        try {
-                            ManagedLedgerInfo info = parseManagedLedgerInfo(readData);
-                            info = updateMLInfoTimestamp(info);
-                            callback.operationComplete(info, new ZKStat(stat));
-                        } catch (ParseException | InvalidProtocolBufferException e) {
-                            callback.operationFailed(new MetaStoreException(e));
-                        }
-                    } else if (rc == Code.NONODE.intValue()) {
-                        // Z-node doesn't exist
-                        if (createIfMissing) {
-                            log.info("Creating '{}{}'", prefix, ledgerName);
-
-                            StringCallback createcb = (rc1, path1, ctx1, name) -> {
-                                if (rc1 == Code.OK.intValue()) {
-                                    ManagedLedgerInfo info = ManagedLedgerInfo.getDefaultInstance();
-                                    callback.operationComplete(info, new ZKStat());
-                                } else {
-                                    callback.operationFailed(
-                                            new MetaStoreException(KeeperException.create(Code.get(rc1))));
-                                }
-                            };
-
-                            asyncCreateFullPathOptimistic(prefixName, ledgerName, new byte[0], Acl,
-                                                          CreateMode.PERSISTENT, createcb);
-                        } else {
-                            // Tried to open a managed ledger but it doesn't exist and we shouldn't creating it at this
-                            // point
-
-                            callback.operationFailed(new ManagedLedgerException.MetadataNotFoundException(
-                                    KeeperException.create(Code.get(rc))));
-                        }
-                    } else {
-                        // Other ZK error
-                        callback.operationFailed(new MetaStoreException(KeeperException.create(Code.get(rc))));
-                    }
-                })), null);
-    }
-
-    @Override
-    public void asyncUpdateLedgerIds(String ledgerName, ManagedLedgerInfo mlInfo, Stat stat,
-            final MetaStoreCallback<Void> callback) {
-
-        ZKStat zkStat = (ZKStat) stat;
-        if (log.isDebugEnabled()) {
-            log.debug("[{}] Updating metadata version={} with content={}", ledgerName, zkStat.version, mlInfo);
-        }
-
-        byte[] serializedMlInfo = mlInfo.toByteArray(); // Binary format
-
-        zk.setData(prefix + ledgerName, serializedMlInfo, zkStat.getVersion(),
-                (rc, path, zkCtx, stat1) -> executor.executeOrdered(ledgerName, safeRun(() -> {
-                    if (log.isDebugEnabled()) {
-                        log.debug("[{}] UpdateLedgersIdsCallback.processResult rc={} newVersion={}", ledgerName,
-                                Code.get(rc), stat != null ? stat.getVersion() : "null");
-                    }
-                    MetaStoreException status = null;
-                    if (rc == Code.BADVERSION.intValue()) {
-                        // Content has been modified on ZK since our last read
-                        status = new BadVersionException(KeeperException.create(Code.get(rc)));
-                        callback.operationFailed(status);
-                    } else if (rc != Code.OK.intValue()) {
-                        status = new MetaStoreException(KeeperException.create(Code.get(rc)));
-                        callback.operationFailed(status);
-                    } else {
-                        callback.operationComplete(null, new ZKStat(stat1));
-                    }
-                })), null);
-    }
-
-    @Override
-    public void getCursors(final String ledgerName, final MetaStoreCallback<List<String>> callback) {
-        if (log.isDebugEnabled()) {
-            log.debug("[{}] Get cursors list", ledgerName);
-        }
-        zk.getChildren(prefix + ledgerName, false,
-                (rc, path, ctx, children, stat) -> executor.executeOrdered(ledgerName, safeRun(() -> {
-            if (log.isDebugEnabled()) {
-                log.debug("[{}] getConsumers complete rc={} children={}", ledgerName, Code.get(rc), children);
-            }
-            if (rc != Code.OK.intValue()) {
-                callback.operationFailed(new MetaStoreException(KeeperException.create(Code.get(rc))));
-                return;
-            }
-
-            if (log.isDebugEnabled()) {
-                log.debug("[{}] Get childrend completed version={}", ledgerName, stat.getVersion());
-            }
-            callback.operationComplete(children, new ZKStat(stat));
-        })), null);
-    }
-
-    @Override
-    public void asyncGetCursorInfo(String ledgerName, String consumerName,
-            final MetaStoreCallback<ManagedCursorInfo> callback) {
-        String path = prefix + ledgerName + "/" + consumerName;
-        if (log.isDebugEnabled()) {
-            log.debug("Reading from {}", path);
-        }
-
-        zk.getData(path, false, (rc, path1, ctx, data, stat) -> executor.executeOrdered(ledgerName, safeRun(() -> {
-            if (rc != Code.OK.intValue()) {
-                callback.operationFailed(new MetaStoreException(KeeperException.create(Code.get(rc))));
-            } else {
-                try {
-                    ManagedCursorInfo info = parseManagedCursorInfo(data);
-                    callback.operationComplete(info, new ZKStat(stat));
-                } catch (ParseException | InvalidProtocolBufferException e) {
-                    callback.operationFailed(new MetaStoreException(e));
-                }
-            }
-        })), null);
-
-        if (log.isDebugEnabled()) {
-            log.debug("Reading from {} ok", path);
-        }
-    }
-
-    @Override
-    public void asyncUpdateCursorInfo(final String ledgerName, final String cursorName, final ManagedCursorInfo info,
-            Stat stat, final MetaStoreCallback<Void> callback) {
-        log.info("[{}] [{}] Updating cursor info ledgerId={} mark-delete={}:{}", ledgerName, cursorName,
-                info.getCursorsLedgerId(), info.getMarkDeleteLedgerId(), info.getMarkDeleteEntryId());
-
-        String path = prefix + ledgerName + "/" + cursorName;
-        byte[] content = info.toByteArray(); // Binary format
-
-        if (stat == null) {
-            if (log.isDebugEnabled()) {
-                log.debug("[{}] Creating consumer {} on meta-data store with {}", ledgerName, cursorName, info);
-            }
-            zk.create(path, content, Acl, CreateMode.PERSISTENT,
-                    (rc, path1, ctx, name) -> executor.executeOrdered(ledgerName, safeRun(() -> {
-                        if (rc != Code.OK.intValue()) {
-                            log.warn("[{}] Error creating cosumer {} node on meta-data store with {}: ", ledgerName,
-                                    cursorName, info, Code.get(rc));
-                            callback.operationFailed(new MetaStoreException(KeeperException.create(Code.get(rc))));
-                        } else {
-                            if (log.isDebugEnabled()) {
-                                log.debug("[{}] Created consumer {} on meta-data store with {}", ledgerName, cursorName,
-                                        info);
-                            }
-                            callback.operationComplete(null, new ZKStat());
-                        }
-                    })), null);
-        } else {
-            ZKStat zkStat = (ZKStat) stat;
-            if (log.isDebugEnabled()) {
-                log.debug("[{}] Updating consumer {} on meta-data store with {}", ledgerName, cursorName, info);
-            }
-            zk.setData(path, content, zkStat.getVersion(),
-                    (rc, path1, ctx, stat1) -> executor.executeOrdered(ledgerName, safeRun(() -> {
-                if (rc == Code.BADVERSION.intValue()) {
-                    callback.operationFailed(new BadVersionException(KeeperException.create(Code.get(rc))));
-                } else if (rc != Code.OK.intValue()) {
-                    callback.operationFailed(new MetaStoreException(KeeperException.create(Code.get(rc))));
-                } else {
-                    callback.operationComplete(null, new ZKStat(stat1));
-                }
-            })), null);
-        }
-    }
-
-    @Override
-    public void asyncRemoveCursor(final String ledgerName, final String consumerName,
-            final MetaStoreCallback<Void> callback) {
-        log.info("[{}] Remove consumer={}", ledgerName, consumerName);
-        zk.delete(prefix + ledgerName + "/" + consumerName, -1,
-                (rc, path, ctx) -> executor.executeOrdered(ledgerName, safeRun(() -> {
-            if (log.isDebugEnabled()) {
-                log.debug("[{}] [{}] zk delete done. rc={}", ledgerName, consumerName, Code.get(rc));
-            }
-            if (rc == Code.OK.intValue()) {
-                callback.operationComplete(null, null);
-            } else {
-                callback.operationFailed(new MetaStoreException(KeeperException.create(Code.get(rc))));
-            }
-        })), null);
-    }
-
-    @Override
-    public void removeManagedLedger(String ledgerName, MetaStoreCallback<Void> callback) {
-        log.info("[{}] Remove ManagedLedger", ledgerName);
-        zk.delete(prefix + ledgerName, -1, (rc, path, ctx) -> executor.executeOrdered(ledgerName, safeRun(() -> {
-            if (log.isDebugEnabled()) {
-                log.debug("[{}] zk delete done. rc={}", ledgerName, Code.get(rc));
-            }
-            if (rc == Code.OK.intValue()) {
-                callback.operationComplete(null, null);
-            } else {
-                callback.operationFailed(new MetaStoreException(KeeperException.create(Code.get(rc))));
-            }
-        })), null);
-    }
-
-    @Override
-    public Iterable<String> getManagedLedgers() throws MetaStoreException {
-        try {
-            return zk.getChildren(prefixName, false);
-        } catch (Exception e) {
-            throw new MetaStoreException(e);
-        }
-    }
-
-    private ManagedLedgerInfo parseManagedLedgerInfo(byte[] data)
-            throws ParseException, InvalidProtocolBufferException {
-        // First try binary format, then fallback to text
-        try {
-            return ManagedLedgerInfo.parseFrom(data);
-        } catch (InvalidProtocolBufferException e) {
-            // Fallback to parsing protobuf text format
-            ManagedLedgerInfo.Builder builder = ManagedLedgerInfo.newBuilder();
-            TextFormat.merge(new String(data, Encoding), builder);
-            return builder.build();
-        }
-    }
-
-    private ManagedCursorInfo parseManagedCursorInfo(byte[] data)
-            throws ParseException, InvalidProtocolBufferException {
-        // First try binary format, then fallback to text
-        try {
-            return ManagedCursorInfo.parseFrom(data);
-        } catch (InvalidProtocolBufferException e) {
-            // Fallback to parsing protobuf text format
-            ManagedCursorInfo.Builder builder = ManagedCursorInfo.newBuilder();
-            TextFormat.merge(new String(data, Encoding), builder);
-            return builder.build();
-        }
-
-    }
-
-    void asyncCreateFullPathOptimistic(
-            final String basePath, final String nodePath, final byte[] data,
-            final List<ACL> acl, final CreateMode createMode, final StringCallback callback) {
-        String fullPath = basePath + "/" + nodePath;
-
-        zk.create(fullPath, data, acl, createMode,
-                  (rc, path, ignoreCtx1, name) -> {
-                      Runnable retry = () -> {
-                          asyncCreateFullPathOptimistic(basePath, nodePath, data,
-                                                        acl, createMode, callback);
-                      };
-
-                      Consumer<Integer> complete = (finalrc) -> {
-                          executor.executeOrdered(nodePath, safeRun(() -> {
-                              callback.processResult(finalrc, path, null, name);
-                          }));
-                      };
-
-                      if (rc != Code.NONODE.intValue()) {
-                          complete.accept(rc);
-                          return;
-                      }
-
-                      // Since I got a nonode, it means that my parents don't exist
-                      // create mode is persistent since ephemeral nodes can't be
-                      // parents
-                      String nodeParent = new File(nodePath).getParent();
-                      if (nodeParent == null) {
-                          zk.exists(basePath, false,
-                                    (existsRc, existsPath, ignoreCtx2, stat) -> {
-                                        if (existsRc == Code.OK.intValue()) {
-                                            if (stat != null) {
-                                                retry.run();
-                                            } else {
-                                                complete.accept(Code.NONODE.intValue());
-                                            }
-                                        } else {
-                                            complete.accept(existsRc);
-                                        }
-                                    }, null);
-                      } else {
-                          nodeParent = nodeParent.replace("\\", "/");
-                          asyncCreateFullPathOptimistic(
-                                  basePath, nodeParent, new byte[0], acl, CreateMode.PERSISTENT,
-                                  (parentRc, parentPath, ignoreCtx3, parentName) -> {
-                                      if (parentRc == Code.OK.intValue() || parentRc == Code.NODEEXISTS.intValue()) {
-                                          retry.run();
-                                      } else {
-                                          complete.accept(parentRc);
-                                      }
-                                  });
-                      }
-                  }, null);
-    }
-
-    private static final Logger log = LoggerFactory.getLogger(MetaStoreImplZookeeper.class);
-}
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NullLedgerOffloader.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NullLedgerOffloader.java
index 3401f1bbbb647..aa3aae71d1db7 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NullLedgerOffloader.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NullLedgerOffloader.java
@@ -24,6 +24,7 @@
 
 import org.apache.bookkeeper.client.api.ReadHandle;
 import org.apache.bookkeeper.mledger.LedgerOffloader;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 
 /**
  * Null implementation that throws an error on any invokation.
@@ -60,4 +61,14 @@ public CompletableFuture<Void> deleteOffloaded(long ledgerId, UUID uid,
         promise.completeExceptionally(new UnsupportedOperationException());
         return promise;
     }
+
+    @Override
+    public OffloadPolicies getOffloadPolicies() {
+        return null;
+    }
+
+    @Override
+    public void close() {
+
+    }
 }
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpFindNewest.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpFindNewest.java
index 4bce5690ad35f..861d2472e05d6 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpFindNewest.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/OpFindNewest.java
@@ -67,7 +67,10 @@ public void readEntryComplete(Entry entry, Object ctx) {
         switch (state) {
         case checkFirst:
             if (!condition.apply(entry)) {
-                callback.findEntryComplete(startPosition, OpFindNewest.this.ctx);
+                // If no entry is found that matches the condition, it is expected to pass null to the callback.
+                // Otherwise, a message before the expiration date will be deleted due to message TTL.
+                // cf. https://github.com/apache/pulsar/issues/5579
+                callback.findEntryComplete(null, OpFindNewest.this.ctx);
                 return;
             } else {
                 lastMatchedPosition = position;
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyManagedLedgerImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyManagedLedgerImpl.java
index 9721b15bd4280..621131752720a 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyManagedLedgerImpl.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ReadOnlyManagedLedgerImpl.java
@@ -34,9 +34,9 @@
 import org.apache.bookkeeper.mledger.ManagedLedgerException.MetadataNotFoundException;
 import org.apache.bookkeeper.mledger.ReadOnlyCursor;
 import org.apache.bookkeeper.mledger.impl.MetaStore.MetaStoreCallback;
-import org.apache.bookkeeper.mledger.impl.MetaStore.Stat;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo.LedgerInfo;
+import org.apache.pulsar.metadata.api.Stat;
 
 @Slf4j
 public class ReadOnlyManagedLedgerImpl extends ManagedLedgerImpl {
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainerTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainerTest.java
index 21f5747919b2f..99e7aec740bed 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainerTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorContainerTest.java
@@ -92,7 +92,7 @@ public long getNumberOfEntries() {
         }
 
         @Override
-        public long getNumberOfEntriesInBacklog() {
+        public long getNumberOfEntriesInBacklog(boolean isPrecise) {
             return 0;
         }
 
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorListAckTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorListAckTest.java
index aaf7cd1c6f282..dc876e19eb1ab 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorListAckTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorListAckTest.java
@@ -51,24 +51,24 @@ void testMultiPositionDelete() throws Exception {
         Position p7 = ledger.addEntry("dummy-entry-7".getBytes(Encoding));
 
         assertEquals(c1.getNumberOfEntries(), 7);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 7);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 7);
 
         c1.delete(Lists.newArrayList(p2, p3, p5, p7));
 
         assertEquals(c1.getNumberOfEntries(), 3);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 3);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 3);
         assertEquals(c1.getMarkDeletedPosition(), p0);
 
         c1.delete(Lists.newArrayList(p1));
 
         assertEquals(c1.getNumberOfEntries(), 2);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 2);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 2);
         assertEquals(c1.getMarkDeletedPosition(), p3);
 
         c1.delete(Lists.newArrayList(p4, p6, p7));
 
         assertEquals(c1.getNumberOfEntries(), 0);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 0);
         assertEquals(c1.getMarkDeletedPosition(), p7);
     }
 
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
index b0db9264d8f91..75d0280ca52b7 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
@@ -77,10 +77,10 @@
 import org.apache.bookkeeper.mledger.Position;
 import org.apache.bookkeeper.mledger.impl.ManagedCursorImpl.VoidCallback;
 import org.apache.bookkeeper.mledger.impl.MetaStore.MetaStoreCallback;
-import org.apache.bookkeeper.mledger.impl.MetaStore.Stat;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedCursorInfo;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.PositionInfo;
 import org.apache.bookkeeper.test.MockedBookKeeperTestCase;
+import org.apache.pulsar.metadata.api.Stat;
 import org.apache.zookeeper.KeeperException.Code;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
@@ -92,7 +92,7 @@
 public class ManagedCursorTest extends MockedBookKeeperTestCase {
 
     private static final Charset Encoding = Charsets.UTF_8;
-    
+
     @DataProvider(name = "useOpenRangeSet")
     public static Object[][] useOpenRangeSet() {
         return new Object[][] { { Boolean.TRUE }, { Boolean.FALSE } };
@@ -265,31 +265,31 @@ void testNumberOfEntriesInBacklog() throws Exception {
         Position p4 = ledger.addEntry("dummy-entry-4".getBytes(Encoding));
         ManagedCursor c5 = ledger.openCursor("c5");
 
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 4);
-        assertEquals(c2.getNumberOfEntriesInBacklog(), 3);
-        assertEquals(c3.getNumberOfEntriesInBacklog(), 2);
-        assertEquals(c4.getNumberOfEntriesInBacklog(), 1);
-        assertEquals(c5.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 4);
+        assertEquals(c2.getNumberOfEntriesInBacklog(false), 3);
+        assertEquals(c3.getNumberOfEntriesInBacklog(false), 2);
+        assertEquals(c4.getNumberOfEntriesInBacklog(false), 1);
+        assertEquals(c5.getNumberOfEntriesInBacklog(false), 0);
 
         List<Entry> entries = c1.readEntries(2);
         assertEquals(entries.size(), 2);
         entries.forEach(e -> e.release());
 
         assertEquals(c1.getNumberOfEntries(), 2);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 4);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 4);
 
         c1.markDelete(p1);
         assertEquals(c1.getNumberOfEntries(), 2);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 3);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 3);
 
         c1.delete(p3);
 
         assertEquals(c1.getNumberOfEntries(), 1);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 2);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 2);
 
         c1.markDelete(p4);
         assertEquals(c1.getNumberOfEntries(), 0);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 0);
     }
 
     @Test(timeOut = 20000)
@@ -315,11 +315,11 @@ void testNumberOfEntriesInBacklogWithFallback() throws Exception {
         field.setLong(c4, counter);
         field.setLong(c5, counter);
 
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 4);
-        assertEquals(c2.getNumberOfEntriesInBacklog(), 3);
-        assertEquals(c3.getNumberOfEntriesInBacklog(), 2);
-        assertEquals(c4.getNumberOfEntriesInBacklog(), 1);
-        assertEquals(c5.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 4);
+        assertEquals(c2.getNumberOfEntriesInBacklog(false), 3);
+        assertEquals(c3.getNumberOfEntriesInBacklog(false), 2);
+        assertEquals(c4.getNumberOfEntriesInBacklog(false), 1);
+        assertEquals(c5.getNumberOfEntriesInBacklog(false), 0);
     }
 
     @Test(timeOut = 20000)
@@ -552,6 +552,77 @@ void testResetCursor() throws Exception {
         ledger.close();
     }
 
+    @Test(timeOut = 20000)
+    void testResetCursor1() throws Exception {
+        ManagedLedger ledger = factory.open("my_test_move_cursor_ledger",
+            new ManagedLedgerConfig().setMaxEntriesPerLedger(2));
+        ManagedCursor cursor = ledger.openCursor("trc1");
+        PositionImpl actualEarliest = (PositionImpl) ledger.addEntry("dummy-entry-1".getBytes(Encoding));
+        ledger.addEntry("dummy-entry-2".getBytes(Encoding));
+        ledger.addEntry("dummy-entry-3".getBytes(Encoding));
+        PositionImpl lastInPrev = (PositionImpl) ledger.addEntry("dummy-entry-4".getBytes(Encoding));
+        PositionImpl firstInNext = (PositionImpl) ledger.addEntry("dummy-entry-5".getBytes(Encoding));
+        ledger.addEntry("dummy-entry-6".getBytes(Encoding));
+        ledger.addEntry("dummy-entry-7".getBytes(Encoding));
+        ledger.addEntry("dummy-entry-8".getBytes(Encoding));
+        ledger.addEntry("dummy-entry-9".getBytes(Encoding));
+        PositionImpl last = (PositionImpl) ledger.addEntry("dummy-entry-10".getBytes(Encoding));
+
+        final AtomicBoolean moveStatus = new AtomicBoolean(false);
+
+        // reset to earliest
+        PositionImpl earliest = PositionImpl.earliest;
+        try {
+            cursor.resetCursor(earliest);
+            moveStatus.set(true);
+        } catch (Exception e) {
+            log.warn("error in reset cursor", e.getCause());
+        }
+        assertTrue(moveStatus.get());
+        PositionImpl earliestPos = new PositionImpl(actualEarliest.getLedgerId(), -1);
+        assertEquals(earliestPos, cursor.getReadPosition());
+        moveStatus.set(false);
+
+        // reset to one after last entry in a ledger should point to the first entry in the next ledger
+        PositionImpl resetPosition = new PositionImpl(lastInPrev.getLedgerId(), lastInPrev.getEntryId() + 1);
+        try {
+            cursor.resetCursor(resetPosition);
+            moveStatus.set(true);
+        } catch (Exception e) {
+            log.warn("error in reset cursor", e.getCause());
+        }
+        assertTrue(moveStatus.get());
+        assertEquals(firstInNext, cursor.getReadPosition());
+        moveStatus.set(false);
+
+        // reset to a non exist larger ledger should point to the first non-exist entry in the last ledger
+        PositionImpl latest = new PositionImpl(last.getLedgerId() + 2, 0);
+        try {
+            cursor.resetCursor(latest);
+            moveStatus.set(true);
+        } catch (Exception e) {
+            log.warn("error in reset cursor", e.getCause());
+        }
+        assertTrue(moveStatus.get());
+        PositionImpl lastPos = new PositionImpl(last.getLedgerId(), last.getEntryId() + 1);
+        assertEquals(lastPos, cursor.getReadPosition());
+        moveStatus.set(false);
+
+        // reset to latest should point to the first non-exist entry in the last ledger
+        PositionImpl anotherLast = PositionImpl.latest;
+        try {
+            cursor.resetCursor(anotherLast);
+            moveStatus.set(true);
+        } catch (Exception e) {
+            log.warn("error in reset cursor", e.getCause());
+        }
+        assertTrue(moveStatus.get());
+        assertEquals(lastPos, cursor.getReadPosition());
+
+        cursor.close();
+        ledger.close();
+    }
+
     @Test(timeOut = 20000)
     void testasyncResetCursor() throws Exception {
         ManagedLedger ledger = factory.open("my_test_move_cursor_ledger",
@@ -740,34 +811,34 @@ void rewind() throws Exception {
         log.debug("p4: {}", p4);
 
         assertEquals(c1.getNumberOfEntries(), 4);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 4);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 4);
         c1.markDelete(p1);
         assertEquals(c1.getNumberOfEntries(), 3);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 3);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 3);
         List<Entry> entries = c1.readEntries(10);
         assertEquals(entries.size(), 3);
         entries.forEach(e -> e.release());
 
         assertEquals(c1.getNumberOfEntries(), 0);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 3);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 3);
         c1.rewind();
         assertEquals(c1.getNumberOfEntries(), 3);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 3);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 3);
         c1.markDelete(p2);
         assertEquals(c1.getNumberOfEntries(), 2);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 2);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 2);
 
         entries = c1.readEntries(10);
         assertEquals(entries.size(), 2);
         entries.forEach(e -> e.release());
 
         assertEquals(c1.getNumberOfEntries(), 0);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 2);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 2);
         c1.rewind();
         assertEquals(c1.getNumberOfEntries(), 2);
         c1.markDelete(p4);
         assertEquals(c1.getNumberOfEntries(), 0);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 0);
         c1.rewind();
         assertEquals(c1.getNumberOfEntries(), 0);
         ledger.addEntry("dummy-entry-5".getBytes(Encoding));
@@ -1253,26 +1324,26 @@ void testFilteringReadEntries() throws Exception {
         /* Position p6 = */ledger.addEntry("entry6".getBytes());
 
         assertEquals(cursor.getNumberOfEntries(), 6);
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 6);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 6);
 
         List<Entry> entries = cursor.readEntries(3);
         assertEquals(entries.size(), 3);
         entries.forEach(e -> e.release());
 
         assertEquals(cursor.getNumberOfEntries(), 3);
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 6);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 6);
 
         log.info("Deleting {}", p5);
         cursor.delete(p5);
 
         assertEquals(cursor.getNumberOfEntries(), 2);
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 5);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 5);
 
         entries = cursor.readEntries(3);
         assertEquals(entries.size(), 2);
         entries.forEach(e -> e.release());
         assertEquals(cursor.getNumberOfEntries(), 0);
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 5);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 5);
     }
 
     @Test(timeOut = 20000)
@@ -1313,21 +1384,21 @@ void testCountingWithDeletedEntries() throws Exception {
         Position p8 = ledger.addEntry("entry8".getBytes());
 
         assertEquals(cursor.getNumberOfEntries(), 8);
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 8);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 8);
 
         cursor.delete(p8);
         assertEquals(cursor.getNumberOfEntries(), 7);
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 7);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 7);
 
         cursor.delete(p1);
         assertEquals(cursor.getNumberOfEntries(), 6);
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 6);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 6);
 
         cursor.delete(p7);
         cursor.delete(p6);
         cursor.delete(p5);
         assertEquals(cursor.getNumberOfEntries(), 3);
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 3);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 3);
     }
 
     @Test(timeOut = 20000, dataProvider = "useOpenRangeSet")
@@ -1433,22 +1504,22 @@ void testClearBacklog(boolean useOpenRangeSet) throws Exception {
         ManagedCursor c3 = ledger.openCursor("c3");
         ledger.addEntry("dummy-entry-3".getBytes(Encoding));
 
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 3);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 3);
         assertEquals(c1.getNumberOfEntries(), 3);
         assertTrue(c1.hasMoreEntries());
 
         c1.clearBacklog();
         c3.clearBacklog();
 
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 0);
         assertEquals(c1.getNumberOfEntries(), 0);
         assertFalse(c1.hasMoreEntries());
 
-        assertEquals(c2.getNumberOfEntriesInBacklog(), 2);
+        assertEquals(c2.getNumberOfEntriesInBacklog(false), 2);
         assertEquals(c2.getNumberOfEntries(), 2);
         assertTrue(c2.hasMoreEntries());
 
-        assertEquals(c3.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(c3.getNumberOfEntriesInBacklog(false), 0);
         assertEquals(c3.getNumberOfEntries(), 0);
         assertFalse(c3.hasMoreEntries());
 
@@ -1459,15 +1530,15 @@ void testClearBacklog(boolean useOpenRangeSet) throws Exception {
         c2 = ledger.openCursor("c2");
         c3 = ledger.openCursor("c3");
 
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 0);
         assertEquals(c1.getNumberOfEntries(), 0);
         assertFalse(c1.hasMoreEntries());
 
-        assertEquals(c2.getNumberOfEntriesInBacklog(), 2);
+        assertEquals(c2.getNumberOfEntriesInBacklog(false), 2);
         assertEquals(c2.getNumberOfEntries(), 2);
         assertTrue(c2.hasMoreEntries());
 
-        assertEquals(c3.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(c3.getNumberOfEntriesInBacklog(false), 0);
         assertEquals(c3.getNumberOfEntries(), 0);
         assertFalse(c3.hasMoreEntries());
         factory2.shutdown();
@@ -1484,12 +1555,12 @@ void testRateLimitMarkDelete(boolean useOpenRangeSet) throws Exception {
         Position p2 = ledger.addEntry("dummy-entry-2".getBytes(Encoding));
         Position p3 = ledger.addEntry("dummy-entry-3".getBytes(Encoding));
 
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 3);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 3);
         c1.markDelete(p1);
         c1.markDelete(p2);
         c1.markDelete(p3);
 
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 0);
 
         // Re-open to recover from storage
         ManagedLedgerFactory factory2 = new ManagedLedgerFactoryImpl(bkc, bkc.getZkHandle());
@@ -1498,7 +1569,7 @@ void testRateLimitMarkDelete(boolean useOpenRangeSet) throws Exception {
         c1 = ledger.openCursor("c1");
 
         // Only the 1st mark-delete was persisted
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 2);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 2);
         factory2.shutdown();
     }
 
@@ -1514,57 +1585,57 @@ void deleteSingleMessageTwice(boolean useOpenRangeSet) throws Exception {
         Position p3 = ledger.addEntry("entry-3".getBytes(Encoding));
         Position p4 = ledger.addEntry("entry-4".getBytes(Encoding));
 
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 4);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 4);
         assertEquals(c1.getNumberOfEntries(), 4);
 
         c1.delete(p1);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 3);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 3);
         assertEquals(c1.getNumberOfEntries(), 3);
         assertEquals(c1.getMarkDeletedPosition(), p1);
         assertEquals(c1.getReadPosition(), p2);
 
         // Should have not effect since p1 is already deleted
         c1.delete(p1);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 3);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 3);
         assertEquals(c1.getNumberOfEntries(), 3);
         assertEquals(c1.getMarkDeletedPosition(), p1);
         assertEquals(c1.getReadPosition(), p2);
 
         c1.delete(p2);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 2);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 2);
         assertEquals(c1.getNumberOfEntries(), 2);
         assertEquals(c1.getMarkDeletedPosition(), p2);
         assertEquals(c1.getReadPosition(), p3);
 
         // Should have not effect since p2 is already deleted
         c1.delete(p2);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 2);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 2);
         assertEquals(c1.getNumberOfEntries(), 2);
         assertEquals(c1.getMarkDeletedPosition(), p2);
         assertEquals(c1.getReadPosition(), p3);
 
         c1.delete(p3);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 1);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 1);
         assertEquals(c1.getNumberOfEntries(), 1);
         assertEquals(c1.getMarkDeletedPosition(), p3);
         assertEquals(c1.getReadPosition(), p4);
 
         // Should have not effect since p3 is already deleted
         c1.delete(p3);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 1);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 1);
         assertEquals(c1.getNumberOfEntries(), 1);
         assertEquals(c1.getMarkDeletedPosition(), p3);
         assertEquals(c1.getReadPosition(), p4);
 
         c1.delete(p4);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 0);
         assertEquals(c1.getNumberOfEntries(), 0);
         assertEquals(c1.getMarkDeletedPosition(), p4);
         assertEquals(c1.getReadPosition(), p4.getNext());
 
         // Should have not effect since p4 is already deleted
         c1.delete(p4);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 0);
         assertEquals(c1.getNumberOfEntries(), 0);
         assertEquals(c1.getMarkDeletedPosition(), p4);
         assertEquals(c1.getReadPosition(), p4.getNext());
@@ -1654,7 +1725,7 @@ void testFindNewestMatching() throws Exception {
         ledger.addEntry("not-expired".getBytes(Encoding));
         ledger.addEntry("not-expired".getBytes(Encoding));
 
-        assertEquals(c1.readPosition,
+        assertNull(
                 c1.findNewestMatching(entry -> Arrays.equals(entry.getDataAndRelease(), "expired".getBytes(Encoding))));
     }
 
@@ -2117,7 +2188,7 @@ void internalTestFindNewestMatchingAllEntries(final String name, final int entri
         ManagedLedger ledger = factory.open(ledgerAndCursorName, config);
         ManagedCursorImpl c1 = (ManagedCursorImpl) ledger.openCursor(ledgerAndCursorName);
 
-        Position firstPosition = ledger.addEntry(getEntryPublishTime("retained1"));
+        ledger.addEntry(getEntryPublishTime("retained1"));
         // space apart message publish times
         Thread.sleep(100);
         ledger.addEntry(getEntryPublishTime("retained2"));
@@ -2146,7 +2217,7 @@ void internalTestFindNewestMatchingAllEntries(final String name, final int entri
         assertEquals(found.getEntryId(), expectedEntryId);
 
         found = (PositionImpl) findPositionFromAllEntries(c1, 0);
-        assertEquals(found, firstPosition);
+        assertNull(found);
     }
 
     @Test(timeOut = 20000)
@@ -2296,19 +2367,19 @@ void outOfOrderAcks() throws Exception {
             positions.add(ledger.addEntry("entry".getBytes()));
         }
 
-        assertEquals(c1.getNumberOfEntriesInBacklog(), N);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), N);
 
         c1.delete(positions.get(3));
-        assertEquals(c1.getNumberOfEntriesInBacklog(), N - 1);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), N - 1);
 
         c1.delete(positions.get(2));
-        assertEquals(c1.getNumberOfEntriesInBacklog(), N - 2);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), N - 2);
 
         c1.delete(positions.get(1));
-        assertEquals(c1.getNumberOfEntriesInBacklog(), N - 3);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), N - 3);
 
         c1.delete(positions.get(0));
-        assertEquals(c1.getNumberOfEntriesInBacklog(), N - 4);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), N - 4);
     }
 
     @Test(timeOut = 20000)
@@ -2323,17 +2394,17 @@ void randomOrderAcks() throws Exception {
             positions.add(ledger.addEntry("entry".getBytes()));
         }
 
-        assertEquals(c1.getNumberOfEntriesInBacklog(), N);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), N);
 
         // Randomize the ack sequence
         Collections.shuffle(positions);
 
         int toDelete = N;
         for (Position p : positions) {
-            assertEquals(c1.getNumberOfEntriesInBacklog(), toDelete);
+            assertEquals(c1.getNumberOfEntriesInBacklog(false), toDelete);
             c1.delete(p);
             --toDelete;
-            assertEquals(c1.getNumberOfEntriesInBacklog(), toDelete);
+            assertEquals(c1.getNumberOfEntriesInBacklog(false), toDelete);
         }
     }
 
@@ -2501,7 +2572,7 @@ public void testOutOfOrderDeletePersistenceWithClose() throws Exception {
         c1.delete(addedPositions.get(8));
         c1.delete(addedPositions.get(9));
 
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 20 - 5);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 20 - 5);
 
         ledger.close();
         factory.shutdown();
@@ -2510,7 +2581,7 @@ public void testOutOfOrderDeletePersistenceWithClose() throws Exception {
         factory = new ManagedLedgerFactoryImpl(bkc, bkc.getZkHandle());
         ledger = factory.open("my_test_ledger", new ManagedLedgerConfig());
         c1 = ledger.openCursor("c1");
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 20 - 5);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 20 - 5);
 
         List<Entry> entries = c1.readEntries(20);
         assertEquals(entries.size(), 20 - 5);
@@ -2546,13 +2617,13 @@ public void testOutOfOrderDeletePersistenceAfterCrash() throws Exception {
         c1.delete(addedPositions.get(8));
         c1.delete(addedPositions.get(9));
 
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 20 - 5);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 20 - 5);
 
         // Re-Open
         ManagedLedgerFactory factory2 = new ManagedLedgerFactoryImpl(bkc, bkc.getZkHandle());
         ledger = factory2.open("my_test_ledger", new ManagedLedgerConfig());
         c1 = ledger.openCursor("c1");
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 20 - 5);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 20 - 5);
 
         List<Entry> entries = c1.readEntries(20);
         assertEquals(entries.size(), 20 - 5);
@@ -2665,7 +2736,7 @@ public void testOutOfOrderDeletePersistenceIntoLedgerWithClose() throws Exceptio
             }
         }
 
-        assertEquals(c1.getNumberOfEntriesInBacklog(), totalAddEntries / 2);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), totalAddEntries / 2);
 
         // Close ledger to persist individual-deleted positions into cursor-ledger
         ledger.close();
@@ -2717,7 +2788,7 @@ public void operationFailed(MetaStoreException e) {
         ledger = (ManagedLedgerImpl) factory.open(ledgerName, managedLedgerConfig);
         c1 = (ManagedCursorImpl) ledger.openCursor("c1");
         // verify cursor has been recovered
-        assertEquals(c1.getNumberOfEntriesInBacklog(), totalAddEntries / 2);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), totalAddEntries / 2);
 
         // try to read entries which should only read non-deleted positions
         List<Entry> entries = c1.readEntries(totalAddEntries);
@@ -2749,7 +2820,7 @@ public void testOutOfOrderDeletePersistenceIntoZkWithClose() throws Exception {
             }
         }
 
-        assertEquals(c1.getNumberOfEntriesInBacklog(), totalAddEntries / 2);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), totalAddEntries / 2);
 
         // Close ledger to persist individual-deleted positions into cursor-ledger
         ledger.close();
@@ -2777,7 +2848,7 @@ public void operationFailed(MetaStoreException e) {
         ledger = (ManagedLedgerImpl) factory.open(ledgerName, managedLedgerConfig);
         c1 = (ManagedCursorImpl) ledger.openCursor(cursorName);
         // verify cursor has been recovered
-        assertEquals(c1.getNumberOfEntriesInBacklog(), totalAddEntries / 2);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), totalAddEntries / 2);
 
         // try to read entries which should only read non-deleted positions
         List<Entry> entries = c1.readEntries(totalAddEntries);
@@ -2873,7 +2944,7 @@ public void testRecoverCursorAheadOfLastPosition() throws Exception {
         final long markDeleteLedgerId = 2L;
         final long markDeleteEntryId = -1L;
 
-        MetaStoreImplZookeeper mockMetaStore = mock(MetaStoreImplZookeeper.class);
+        MetaStore mockMetaStore = mock(MetaStore.class);
         doAnswer(new Answer<Object>() {
             public Object answer(InvocationOnMock invocation) {
                 ManagedCursorInfo info = ManagedCursorInfo.newBuilder().setCursorsLedgerId(cursorsLedgerId)
@@ -2948,7 +3019,7 @@ public void deleteMessagesCheckhMarkDelete() throws Exception {
                 totalDeletedMessages += 1;
             }
         }
-        assertEquals(c1.getNumberOfEntriesInBacklog(), totalEntries - totalDeletedMessages);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), totalEntries - totalDeletedMessages);
         assertEquals(c1.getNumberOfEntries(), totalEntries - totalDeletedMessages);
         assertEquals(c1.getMarkDeletedPosition(), positions[0]);
         assertEquals(c1.getReadPosition(), positions[1]);
@@ -2962,11 +3033,11 @@ public void deleteMessagesCheckhMarkDelete() throws Exception {
             }
         }
         int markDelete = totalEntries / 2 - 1;
-        assertEquals(c1.getNumberOfEntriesInBacklog(), totalEntries - totalDeletedMessages);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), totalEntries - totalDeletedMessages);
         assertEquals(c1.getNumberOfEntries(), totalEntries - totalDeletedMessages);
         assertEquals(c1.getMarkDeletedPosition(), positions[markDelete]);
         assertEquals(c1.getReadPosition(), positions[markDelete + 1]);
     }
-    
+
     private static final Logger log = LoggerFactory.getLogger(ManagedCursorTest.class);
 }
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerBkTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerBkTest.java
index ea69c63f2c21c..5a9e8d4bafc7b 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerBkTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerBkTest.java
@@ -124,7 +124,7 @@ public void testBookieFailure() throws Exception {
         // Next add should succeed
         ledger.addEntry("entry-2".getBytes());
 
-        assertEquals(3, cursor.getNumberOfEntriesInBacklog());
+        assertEquals(3, cursor.getNumberOfEntriesInBacklog(false));
 
         List<Entry> entries = cursor.readEntries(1);
         assertEquals(1, entries.size());
@@ -357,13 +357,13 @@ public void ledgerFencedByAutoReplication() throws Exception {
         ledger.addEntry("entry-2".getBytes());
 
         assertEquals(2, c1.getNumberOfEntries());
-        assertEquals(2, c1.getNumberOfEntriesInBacklog());
+        assertEquals(2, c1.getNumberOfEntriesInBacklog(false));
 
         PositionImpl p3 = (PositionImpl) ledger.addEntry("entry-3".getBytes());
 
         // Now entry-2 should have been written before entry-3
         assertEquals(3, c1.getNumberOfEntries());
-        assertEquals(3, c1.getNumberOfEntriesInBacklog());
+        assertEquals(3, c1.getNumberOfEntriesInBacklog(false));
         assertTrue(p1.getLedgerId() != p3.getLedgerId());
         factory.shutdown();
     }
@@ -402,7 +402,7 @@ public void ledgerFencedByFailover() throws Exception {
             // Ok
         }
 
-        assertEquals(2, c2.getNumberOfEntriesInBacklog());
+        assertEquals(2, c2.getNumberOfEntriesInBacklog(false));
         factory1.shutdown();
         factory2.shutdown();
     }
@@ -459,12 +459,12 @@ void testResetCursorAfterRecovery() throws Exception {
 
         assertEquals(cursor.getMarkDeletedPosition(), p3);
         assertEquals(cursor.getReadPosition(), p4);
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 1);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 1);
 
         cursor.resetCursor(p2);
         assertEquals(cursor.getMarkDeletedPosition(), p1);
         assertEquals(cursor.getReadPosition(), p2);
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 3);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 3);
 
         factory2.shutdown();
         factory.shutdown();
@@ -531,7 +531,7 @@ public void testChangeCrcType() throws Exception {
         ledger.addEntry("entry-3".getBytes());
 
         assertEquals(c1.getNumberOfEntries(), 4);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 4);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 4);
 
         List<Entry> entries = c1.readEntries(4);
         assertEquals(entries.size(), 4);
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerErrorsTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerErrorsTest.java
index 3d47a6f5697d7..99b6bd59e91f8 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerErrorsTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerErrorsTest.java
@@ -343,7 +343,7 @@ public void recoverAfterZnodeVersionError() throws Exception {
             ledger.addEntry("entry".getBytes());
             fail("should fail");
         } catch (ManagedLedgerFencedException e) {
-            assertEquals(e.getCause().getCause().getClass(), org.apache.zookeeper.KeeperException.BadVersionException.class);
+            assertEquals(e.getCause().getClass(), ManagedLedgerException.BadVersionException.class);
             // ok
         }
 
@@ -366,7 +366,7 @@ public void recoverAfterWriteError() throws Exception {
         // With one single error, the write should succeed
         ledger.addEntry("entry-1".getBytes());
 
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 1);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 1);
 
         bkc.failNow(BKException.Code.BookieHandleNotAvailableException);
         zkc.failNow(Code.CONNECTIONLOSS);
@@ -385,7 +385,7 @@ public void recoverAfterWriteError() throws Exception {
             // ok
         }
 
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 1);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 1);
 
         // Signal that ManagedLedger has recovered from write error and will be availbe for writes again
         ledger.readyToCreateNewLedger();
@@ -393,7 +393,7 @@ public void recoverAfterWriteError() throws Exception {
         // Next add should succeed, and the previous write should not appear
         ledger.addEntry("entry-4".getBytes());
 
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 2);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 2);
 
         List<Entry> entries = cursor.readEntries(10);
         assertEquals(entries.size(), 2);
@@ -435,7 +435,7 @@ public void addFailed(ManagedLedgerException exception, Object ctx) {
         counter.await();
         assertNull(ex.get());
 
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 2);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 2);
 
         // Ensure that we are only creating one new ledger
         // even when there are multiple (here, 2) add entry failed ops
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java
index b954f654a9442..a31416f8dbd03 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java
@@ -97,7 +97,6 @@
 import org.apache.bookkeeper.mledger.ManagedLedgerFactoryConfig;
 import org.apache.bookkeeper.mledger.Position;
 import org.apache.bookkeeper.mledger.impl.MetaStore.MetaStoreCallback;
-import org.apache.bookkeeper.mledger.impl.MetaStore.Stat;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo.LedgerInfo;
 import org.apache.bookkeeper.test.MockedBookKeeperTestCase;
@@ -108,6 +107,8 @@
 import org.apache.pulsar.common.api.proto.PulsarApi.MessageMetadata;
 import org.apache.pulsar.common.protocol.ByteBufPair;
 import org.apache.pulsar.common.util.protobuf.ByteBufCodedOutputStream;
+import org.apache.pulsar.metadata.api.Stat;
+import org.apache.pulsar.metadata.impl.zookeeper.ZKMetadataStore;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException.Code;
 import org.apache.zookeeper.ZooDefs;
@@ -175,14 +176,14 @@ public void simple() throws Exception {
 
         assertFalse(cursor.hasMoreEntries());
         assertEquals(cursor.getNumberOfEntries(), 0);
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 0);
         assertEquals(cursor.readEntries(100), new ArrayList<Entry>());
 
         ledger.addEntry("dummy-entry-2".getBytes(Encoding));
 
         assertTrue(cursor.hasMoreEntries());
         assertEquals(cursor.getNumberOfEntries(), 1);
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 1);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 1);
         assertEquals(ledger.getNumberOfActiveEntries(), 1);
 
         List<Entry> entries = cursor.readEntries(100);
@@ -242,7 +243,7 @@ public void acknowledge1() throws Exception {
         assertEquals(entries.size(), 2);
 
         assertEquals(cursor.getNumberOfEntries(), 0);
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 2);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 2);
         assertFalse(cursor.hasMoreEntries());
 
         assertEquals(ledger.getNumberOfEntries(), 2);
@@ -251,7 +252,7 @@ public void acknowledge1() throws Exception {
         entries.forEach(e -> e.release());
 
         assertEquals(cursor.getNumberOfEntries(), 0);
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 1);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 1);
         assertFalse(cursor.hasMoreEntries());
         assertEquals(ledger.getNumberOfActiveEntries(), 1);
 
@@ -266,7 +267,7 @@ public void acknowledge1() throws Exception {
         assertEquals(ledger.getTotalSize(), "dummy-entry-1".getBytes(Encoding).length * 2);
 
         assertEquals(cursor.getNumberOfEntries(), 1);
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 1);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 1);
         assertTrue(cursor.hasMoreEntries());
 
         entries = cursor.readEntries(100);
@@ -1814,7 +1815,7 @@ public void testBackwardCompatiblityForMeta() throws Exception {
         ml.addEntry("msg2".getBytes());
         ml.close();
 
-        MetaStore store = new MetaStoreImplZookeeper(zkc, executor);
+        MetaStore store = new MetaStoreImpl(new ZKMetadataStore(zkc), executor);
         CountDownLatch l1 = new CountDownLatch(1);
 
         // obtain the ledger info
@@ -2313,7 +2314,7 @@ public void testConsumerSubscriptionInitializePosition() throws Exception{
         assertEquals(earliestPositionAndCounter.getLeft().getNext(), p2);
 
         assertEquals(latestPositionAndCounter.getRight().longValue(), totalInsertedEntries);
-        assertEquals(earliestPositionAndCounter.getRight().longValue(), totalInsertedEntries - earliestCursor.getNumberOfEntriesInBacklog());
+        assertEquals(earliestPositionAndCounter.getRight().longValue(), totalInsertedEntries - earliestCursor.getNumberOfEntriesInBacklog(false));
 
         ledger.close();
 
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/MetaStoreImplZookeeperTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/MetaStoreImplTest.java
similarity index 70%
rename from managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/MetaStoreImplZookeeperTest.java
rename to managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/MetaStoreImplTest.java
index 021e4c153dbc9..2337b4dd28b8b 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/MetaStoreImplZookeeperTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/MetaStoreImplTest.java
@@ -18,32 +18,30 @@
  */
 package org.apache.bookkeeper.mledger.impl;
 
-import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.fail;
 
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicReference;
+
 import org.apache.bookkeeper.mledger.ManagedLedgerException.MetaStoreException;
 import org.apache.bookkeeper.mledger.impl.MetaStore.MetaStoreCallback;
-import org.apache.bookkeeper.mledger.impl.MetaStore.Stat;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedCursorInfo;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo;
 import org.apache.bookkeeper.test.MockedBookKeeperTestCase;
+import org.apache.pulsar.metadata.api.Stat;
+import org.apache.pulsar.metadata.impl.zookeeper.ZKMetadataStore;
 import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
 import org.apache.zookeeper.ZooDefs;
 import org.testng.annotations.Test;
 
-public class MetaStoreImplZookeeperTest extends MockedBookKeeperTestCase {
+public class MetaStoreImplTest extends MockedBookKeeperTestCase {
 
     @Test
     void getMLList() throws Exception {
-        MetaStore store = new MetaStoreImplZookeeper(zkc, executor);
+        MetaStore store = new MetaStoreImpl(new ZKMetadataStore(zkc), executor);
 
         zkc.failNow(Code.CONNECTIONLOSS);
 
@@ -57,7 +55,7 @@ void getMLList() throws Exception {
 
     @Test
     void deleteNonExistingML() throws Exception {
-        MetaStore store = new MetaStoreImplZookeeper(zkc, executor);
+        MetaStore store = new MetaStoreImpl(new ZKMetadataStore(zkc), executor);
 
         AtomicReference<MetaStoreException> exception = new AtomicReference<>();
         CountDownLatch counter = new CountDownLatch(1);
@@ -82,7 +80,7 @@ public void operationFailed(MetaStoreException e) {
 
     @Test(timeOut = 20000)
     void readMalformedML() throws Exception {
-        MetaStore store = new MetaStoreImplZookeeper(zkc, executor);
+        MetaStore store = new MetaStoreImpl(new ZKMetadataStore(zkc), executor);
 
         zkc.create("/managed-ledgers/my_test", "non-valid".getBytes(), ZooDefs.Ids.OPEN_ACL_UNSAFE,
                 CreateMode.PERSISTENT);
@@ -105,7 +103,7 @@ public void operationComplete(ManagedLedgerInfo result, Stat version) {
 
     @Test(timeOut = 20000)
     void readMalformedCursorNode() throws Exception {
-        MetaStore store = new MetaStoreImplZookeeper(zkc, executor);
+        MetaStore store = new MetaStoreImpl(new ZKMetadataStore(zkc), executor);
 
         zkc.create("/managed-ledgers/my_test", "".getBytes(), ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         zkc.create("/managed-ledgers/my_test/c1", "non-valid".getBytes(), ZooDefs.Ids.OPEN_ACL_UNSAFE,
@@ -129,7 +127,7 @@ public void operationComplete(ManagedCursorInfo result, Stat version) {
 
     @Test(timeOut = 20000)
     void failInCreatingMLnode() throws Exception {
-        MetaStore store = new MetaStoreImplZookeeper(zkc, executor);
+        MetaStore store = new MetaStoreImpl(new ZKMetadataStore(zkc), executor);
 
         final CountDownLatch latch = new CountDownLatch(1);
 
@@ -151,7 +149,7 @@ public void operationComplete(ManagedLedgerInfo result, Stat version) {
 
     @Test(timeOut = 20000)
     void updatingCursorNode() throws Exception {
-        final MetaStore store = new MetaStoreImplZookeeper(zkc, executor);
+        MetaStore store = new MetaStoreImpl(new ZKMetadataStore(zkc), executor);
 
         zkc.create("/managed-ledgers/my_test", "".getBytes(), ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
@@ -187,7 +185,7 @@ public void operationComplete(Void result, Stat version) {
 
     @Test(timeOut = 20000)
     void updatingMLNode() throws Exception {
-        final MetaStore store = new MetaStoreImplZookeeper(zkc, executor);
+        MetaStore store = new MetaStoreImpl(new ZKMetadataStore(zkc), executor);
 
         zkc.create("/managed-ledgers/my_test", "".getBytes(), ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
@@ -218,55 +216,4 @@ public void operationComplete(Void result, Stat version) {
 
         latch.await();
     }
-
-    @Test(timeOut = 20000)
-    public void createOptimisticBaseNotExist() throws Exception {
-        CompletableFuture<Void> promise = new CompletableFuture<>();
-
-        MetaStoreImplZookeeper store = new MetaStoreImplZookeeper(zkc, executor);
-        store.asyncCreateFullPathOptimistic(
-                "/foo", "bar/zar/gar", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT,
-                (rc, path, ctx, name) -> {
-                    if (rc != KeeperException.Code.OK.intValue()) {
-                        promise.completeExceptionally(KeeperException.create(rc));
-                    } else {
-                        promise.complete(null);
-                    }
-                });
-        try {
-            promise.get();
-            fail("should have failed");
-        } catch (ExecutionException ee) {
-            assertEquals(ee.getCause().getClass(), KeeperException.NoNodeException.class);
-        }
-    }
-
-    @Test(timeOut = 20000)
-    public void createOptimisticBaseExists() throws Exception {
-        MetaStoreImplZookeeper store = new MetaStoreImplZookeeper(zkc, executor);
-        zkc.create("/foo", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-        CompletableFuture<Void> promise = new CompletableFuture<>();
-        store.asyncCreateFullPathOptimistic(
-                "/foo", "bar/zar/gar", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT,
-                (rc, path, ctx, name) -> {
-                    if (rc != KeeperException.Code.OK.intValue()) {
-                        promise.completeExceptionally(KeeperException.create(rc));
-                    } else {
-                        promise.complete(null);
-                    }
-                });
-        promise.get();
-
-        CompletableFuture<Void> promise2 = new CompletableFuture<>();
-        store.asyncCreateFullPathOptimistic(
-                "/foo", "blah", new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT,
-                (rc, path, ctx, name) -> {
-                    if (rc != KeeperException.Code.OK.intValue()) {
-                        promise2.completeExceptionally(KeeperException.create(rc));
-                    } else {
-                        promise2.complete(null);
-                    }
-                });
-        promise2.get();
-    }
 }
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorTest.java
index 957e63bfa3e6a..26cad0a02260f 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorTest.java
@@ -221,31 +221,31 @@ void testNumberOfEntriesInBacklog() throws Exception {
         Position p4 = ledger.addEntry("dummy-entry-4".getBytes(Encoding));
         ManagedCursor c5 = ledger.newNonDurableCursor(PositionImpl.latest);
 
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 4);
-        assertEquals(c2.getNumberOfEntriesInBacklog(), 3);
-        assertEquals(c3.getNumberOfEntriesInBacklog(), 2);
-        assertEquals(c4.getNumberOfEntriesInBacklog(), 1);
-        assertEquals(c5.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 4);
+        assertEquals(c2.getNumberOfEntriesInBacklog(false), 3);
+        assertEquals(c3.getNumberOfEntriesInBacklog(false), 2);
+        assertEquals(c4.getNumberOfEntriesInBacklog(false), 1);
+        assertEquals(c5.getNumberOfEntriesInBacklog(false), 0);
 
         List<Entry> entries = c1.readEntries(2);
         assertEquals(entries.size(), 2);
         entries.forEach(e -> e.release());
 
         assertEquals(c1.getNumberOfEntries(), 2);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 4);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 4);
 
         c1.markDelete(p1);
         assertEquals(c1.getNumberOfEntries(), 2);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 3);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 3);
 
         c1.delete(p3);
 
         assertEquals(c1.getNumberOfEntries(), 1);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 2);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 2);
 
         c1.markDelete(p4);
         assertEquals(c1.getNumberOfEntries(), 0);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 0);
     }
 
     @Test(timeOut = 20000)
@@ -371,34 +371,34 @@ void rewind() throws Exception {
         log.debug("p4: {}", p4);
 
         assertEquals(c1.getNumberOfEntries(), 4);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 4);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 4);
         c1.markDelete(p1);
         assertEquals(c1.getNumberOfEntries(), 3);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 3);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 3);
         List<Entry> entries = c1.readEntries(10);
         assertEquals(entries.size(), 3);
         entries.forEach(e -> e.release());
 
         assertEquals(c1.getNumberOfEntries(), 0);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 3);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 3);
         c1.rewind();
         assertEquals(c1.getNumberOfEntries(), 3);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 3);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 3);
         c1.markDelete(p2);
         assertEquals(c1.getNumberOfEntries(), 2);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 2);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 2);
 
         entries = c1.readEntries(10);
         assertEquals(entries.size(), 2);
         entries.forEach(e -> e.release());
 
         assertEquals(c1.getNumberOfEntries(), 0);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 2);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 2);
         c1.rewind();
         assertEquals(c1.getNumberOfEntries(), 2);
         c1.markDelete(p4);
         assertEquals(c1.getNumberOfEntries(), 0);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 0);
         c1.rewind();
         assertEquals(c1.getNumberOfEntries(), 0);
         ledger.addEntry("dummy-entry-5".getBytes(Encoding));
@@ -573,13 +573,13 @@ void subscribeToEarliestPositionWithDeferredDeletion() throws Exception {
         assertEquals(c1.getReadPosition(), p1);
         assertEquals(c1.getMarkDeletedPosition(), new PositionImpl(3, -1));
         assertEquals(c1.getNumberOfEntries(), 6);
-        assertEquals(c1.getNumberOfEntriesInBacklog(), 6);
+        assertEquals(c1.getNumberOfEntriesInBacklog(false), 6);
 
         ManagedCursor c2 = ledger.newNonDurableCursor(p1);
         assertEquals(c2.getReadPosition(), p2);
         assertEquals(c2.getMarkDeletedPosition(), p1);
         assertEquals(c2.getNumberOfEntries(), 5);
-        assertEquals(c2.getNumberOfEntriesInBacklog(), 5);
+        assertEquals(c2.getNumberOfEntriesInBacklog(false), 5);
     }
 
     @Test
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixReadTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixReadTest.java
index 17d54fa6e71f3..0a96a1fdc894e 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixReadTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixReadTest.java
@@ -54,6 +54,7 @@
 import org.apache.bookkeeper.mledger.ManagedLedgerConfig;
 import org.apache.bookkeeper.net.BookieSocketAddress;
 import org.apache.bookkeeper.test.MockedBookKeeperTestCase;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -145,6 +146,16 @@ public CompletableFuture<Void> deleteOffloaded(long ledgerId, UUID uuid,
             offloads.remove(uuid);
             return CompletableFuture.completedFuture(null);
         };
+
+        @Override
+        public OffloadPolicies getOffloadPolicies() {
+            return null;
+        }
+
+        @Override
+        public void close() {
+
+        }
     }
 
     static class MockOffloadReadHandle implements ReadHandle {
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java
index bf2f2e845d66b..997f3f66f3310 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadPrefixTest.java
@@ -51,6 +51,7 @@
 import org.apache.bookkeeper.test.MockedBookKeeperTestCase;
 import org.apache.commons.lang3.tuple.Pair;
 
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -1025,6 +1026,16 @@ public CompletableFuture<Void> deleteOffloaded(long ledgerId, UUID uuid,
             }
             return promise;
         };
+
+        @Override
+        public OffloadPolicies getOffloadPolicies() {
+            return null;
+        }
+
+        @Override
+        public void close() {
+
+        }
     }
 
     static class ErroringMockLedgerOffloader extends MockLedgerOffloader {
diff --git a/managed-ledger/src/test/java/org/apache/zookeeper/MockZooKeeper.java b/managed-ledger/src/test/java/org/apache/zookeeper/MockZooKeeper.java
index f4160edf3737b..11c84f85a93f3 100644
--- a/managed-ledger/src/test/java/org/apache/zookeeper/MockZooKeeper.java
+++ b/managed-ledger/src/test/java/org/apache/zookeeper/MockZooKeeper.java
@@ -354,7 +354,7 @@ public void getChildren(final String path, final Watcher watcher, final Children
                     }
 
                     String child = item.substring(path.length() + 1);
-                    if (!child.contains("/")) {
+                    if (item.charAt(path.length()) == '/' && !child.contains("/")) {
                         children.add(child);
                     }
                 }
diff --git a/pom.xml b/pom.xml
index 163be08196395..d6c3ea3e13e1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@ flexible messaging model and an intuitive client API.</description>
     <commons-compress.version>1.19</commons-compress.version>
 
     <bookkeeper.version>4.10.0</bookkeeper.version>
-    <zookeeper.version>3.5.6</zookeeper.version>
+    <zookeeper.version>3.5.7</zookeeper.version>
     <netty.version>4.1.43.Final</netty.version>
     <netty-tc-native.version>2.0.26.Final</netty-tc-native.version>
     <storm.version>2.0.0</storm.version>
@@ -179,7 +179,7 @@ flexible messaging model and an intuitive client API.</description>
     <sketches.version>0.8.3</sketches.version>
     <hbc-core.version>2.2.0</hbc-core.version>
     <cassandra-driver-core.version>3.6.0</cassandra-driver-core.version>
-    <aerospike-client.version>4.1.11</aerospike-client.version>
+    <aerospike-client.version>4.4.8</aerospike-client.version>
     <kafka-client.version>2.3.0</kafka-client.version>
     <rabbitmq-client.version>5.1.1</rabbitmq-client.version>
     <aws-sdk.version>1.11.297</aws-sdk.version>
@@ -215,6 +215,7 @@ flexible messaging model and an intuitive client API.</description>
     <powermock.version>2.0.2</powermock.version>
     <javassist.version>3.25.0-GA</javassist.version>
     <failsafe.version>2.3.1</failsafe.version>
+    <skyscreamer.version>1.5.0</skyscreamer.version>
 
     <!-- Plugin dependencies -->
     <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
@@ -473,12 +474,26 @@ flexible messaging model and an intuitive client API.</description>
         <groupId>io.netty</groupId>
         <artifactId>netty-transport-native-epoll</artifactId>
         <version>${netty.version}</version>
+        <classifier>linux-x86_64</classifier>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-transport-native-epoll</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-transport-native-unix-common</artifactId>
+        <version>${netty.version}</version>
       </dependency>
 
       <dependency>
         <groupId>io.netty</groupId>
         <artifactId>netty-transport-native-unix-common</artifactId>
         <version>${netty.version}</version>
+        <classifier>linux-x86_64</classifier>
       </dependency>
 
       <!-- `netty-codec-http2` is a dependency of grpc, set the version to
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
index 2771692b82f30..86da1027f34d6 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
@@ -19,6 +19,7 @@
 package org.apache.pulsar.broker;
 
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
 import io.netty.util.internal.PlatformDependent;
@@ -603,6 +604,23 @@ public class ServiceConfiguration implements PulsarConfiguration {
             doc = "Max number of snapshot to be cached per subscription.")
     private int replicatedSubscriptionsSnapshotMaxCachedPerSubscription = 10;
 
+    @FieldContext(
+        category = CATEGORY_SERVER,
+        doc = "Max memory size for broker handling messages sending from producers.\n\n"
+            + " If the processing message size exceed this value, broker will stop read data"
+            + " from the connection. The processing messages means messages are sends to broker"
+            + " but broker have not send response to client, usually waiting to write to bookies.\n\n"
+            + " It's shared across all the topics running in the same broker.\n\n"
+            + " Use -1 to disable the memory limitation. Default is 1/2 of direct memory.\n\n")
+    private int maxMessagePublishBufferSizeInMB = Math.max(64,
+        (int) (PlatformDependent.maxDirectMemory() / 2 / (1024 * 1024)));
+
+    @FieldContext(
+        category = CATEGORY_SERVER,
+        doc = "Interval between checks to see if message publish buffer size is exceed the max message publish buffer size"
+    )
+    private int messagePublishBufferCheckIntervalInMillis = 100;
+
     /**** --- Messaging Protocols --- ****/
 
     @FieldContext(
@@ -679,6 +697,12 @@ public class ServiceConfiguration implements PulsarConfiguration {
     )
     private Set<String> authenticationProviders = Sets.newTreeSet();
 
+    @FieldContext(
+        category = CATEGORY_AUTHENTICATION,
+        doc = "Interval of time for checking for expired authentication credentials"
+    )
+    private int authenticationRefreshCheckSeconds = 60;
+
     @FieldContext(
         category = CATEGORY_AUTHORIZATION,
         doc = "Enforce authorization"
@@ -742,6 +766,12 @@ public class ServiceConfiguration implements PulsarConfiguration {
     )
     private String anonymousUserRole = null;
 
+    @FieldContext(
+        category =  CATEGORY_HTTP,
+        doc = "If >0, it will reject all HTTP requests with bodies larged than the configured limit"
+    )
+    private long httpMaxRequestSize = -1;
+
     @FieldContext(
         category = CATEGORY_SASL_AUTH,
         doc = "This is a regexp, which limits the range of possible ids which can connect to the Broker using SASL.\n"
@@ -879,6 +909,9 @@ public class ServiceConfiguration implements PulsarConfiguration {
     @FieldContext(category = CATEGORY_STORAGE_BK, doc = "Enable/disable disk weight based placement. Default is false")
     private boolean bookkeeperDiskWeightBasedPlacementEnabled = false;
 
+    @FieldContext(category = CATEGORY_STORAGE_BK, doc = "Set the interval to check the need for sending an explicit LAC")
+    private int bookkeeperExplicitLacIntervalInMills = 0;
+
     /**** --- Managed Ledger --- ****/
     @FieldContext(
         minValue = 1,
@@ -1189,7 +1222,18 @@ public class ServiceConfiguration implements PulsarConfiguration {
         doc = "Name of load manager to use"
     )
     private String loadManagerClassName = "org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl";
-
+    @FieldContext(
+        dynamic = true,
+        category = CATEGORY_LOAD_BALANCER,
+        doc = "Supported algorithms name for namespace bundle split"
+    )
+    private List<String> supportedNamespaceBundleSplitAlgorithms = Lists.newArrayList("range_equally_divide", "topic_count_equally_divide");
+    @FieldContext(
+        dynamic = true,
+        category = CATEGORY_LOAD_BALANCER,
+        doc = "Default algorithm name for namespace bundle split"
+    )
+    private String defaultNamespaceBundleSplitAlgorithm = "range_equally_divide";
     @FieldContext(
         category = CATEGORY_LOAD_BALANCER,
         doc = "Option to override the auto-detected network interfaces max speed"
@@ -1332,6 +1376,14 @@ public class ServiceConfiguration implements PulsarConfiguration {
             doc = "Classname of Pluggable JVM GC metrics logger that can log GC specific metrics")
     private String jvmGCMetricsLoggerClassName;
 
+    @FieldContext(
+        category = CATEGORY_METRICS,
+        doc = "Enable expose the precise backlog stats.\n" +
+            " Set false to use published counter and consumed counter to calculate,\n" +
+            " this would be more efficient but may be inaccurate. Default is false."
+    )
+    private boolean exposePreciseBacklogInPrometheus = false;
+
     /**** --- Functions --- ****/
     @FieldContext(
         category = CATEGORY_FUNCTIONS,
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfigurationUtils.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfigurationUtils.java
index 9f79b53bdff0b..447b86207f02a 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfigurationUtils.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfigurationUtils.java
@@ -39,7 +39,8 @@ public static String getDefaultOrConfiguredAddress(String configuredAddress) {
 
     public static String unsafeLocalhostResolve() {
         try {
-            return InetAddress.getLocalHost().getHostName();
+            // Get the fully qualified hostname
+            return InetAddress.getLocalHost().getCanonicalHostName();
         } catch (UnknownHostException ex) {
             LOG.error(ex.getMessage(), ex);
             throw new IllegalStateException("Failed to resolve localhost name.", ex);
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java
index 7ad39fc716ca1..faf868ff7b9e6 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderToken.java
@@ -18,21 +18,26 @@
  */
 package org.apache.pulsar.broker.authentication;
 
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwt;
-import io.jsonwebtoken.JwtException;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.IOException;
+import java.net.SocketAddress;
 import java.security.Key;
 
 import javax.naming.AuthenticationException;
+import javax.net.ssl.SSLSession;
 
-import io.jsonwebtoken.security.SignatureException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pulsar.broker.ServiceConfiguration;
 import org.apache.pulsar.broker.authentication.utils.AuthTokenUtils;
+import org.apache.pulsar.common.api.AuthData;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwt;
+import io.jsonwebtoken.JwtException;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import io.jsonwebtoken.security.SignatureException;
 
 public class AuthenticationProviderToken implements AuthenticationProvider {
 
@@ -81,7 +86,13 @@ public String authenticate(AuthenticationDataSource authData) throws Authenticat
         String token = getToken(authData);
 
         // Parse Token by validating
-        return parseToken(token);
+        return getPrincipal(authenticateToken(token));
+    }
+
+    @Override
+    public AuthenticationState newAuthState(AuthData authData, SocketAddress remoteAddress, SSLSession sslSession)
+            throws AuthenticationException {
+        return new TokenAuthenticationState(this, authData, remoteAddress, sslSession);
     }
 
     public static String getToken(AuthenticationDataSource authData) throws AuthenticationException {
@@ -112,19 +123,21 @@ private static String validateToken(final String token) throws AuthenticationExc
         }
     }
 
-    private String parseToken(final String token) throws AuthenticationException {
+    @SuppressWarnings("unchecked")
+    private Jwt<?, Claims> authenticateToken(final String token) throws AuthenticationException {
         try {
-            @SuppressWarnings("unchecked")
-            Jwt<?, Claims> jwt = Jwts.parser()
+            return Jwts.parser()
                     .setSigningKey(validationKey)
                     .parse(token);
-
-            return jwt.getBody().get(roleClaim, String.class);
         } catch (JwtException e) {
             throw new AuthenticationException("Failed to authentication token: " + e.getMessage());
         }
     }
 
+    private String getPrincipal(Jwt<?, Claims> jwt) {
+        return jwt.getBody().get(roleClaim, String.class);
+    }
+
     /**
      * Try to get the validation key for tokens from several possible config options.
      */
@@ -166,4 +179,62 @@ private SignatureAlgorithm getPublicKeyAlgType(ServiceConfiguration conf) throws
             return SignatureAlgorithm.RS256;
         }
     }
+
+    private static final class TokenAuthenticationState implements AuthenticationState {
+        private final AuthenticationProviderToken provider;
+        private AuthenticationDataSource authenticationDataSource;
+        private Jwt<?, Claims> jwt;
+        private final SocketAddress remoteAddress;
+        private final SSLSession sslSession;
+        private long expiration;
+
+        TokenAuthenticationState(
+                AuthenticationProviderToken provider,
+                AuthData authData,
+                SocketAddress remoteAddress,
+                SSLSession sslSession) throws AuthenticationException {
+            this.provider = provider;
+            this.remoteAddress = remoteAddress;
+            this.sslSession = sslSession;
+            this.authenticate(authData);
+        }
+
+        @Override
+        public String getAuthRole() throws AuthenticationException {
+            return provider.getPrincipal(jwt);
+        }
+
+        @Override
+        public AuthData authenticate(AuthData authData) throws AuthenticationException {
+            String token = new String(authData.getBytes(), UTF_8);
+
+            this.jwt = provider.authenticateToken(token);
+            this.authenticationDataSource = new AuthenticationDataCommand(token, remoteAddress, sslSession);
+            if (jwt.getBody().getExpiration() != null) {
+                this.expiration = jwt.getBody().getExpiration().getTime();
+            } else {
+                // Disable expiration
+                this.expiration = Long.MAX_VALUE;
+            }
+
+            // There's no additional auth stage required
+            return null;
+        }
+
+        @Override
+        public AuthenticationDataSource getAuthDataSource() {
+            return authenticationDataSource;
+        }
+
+        @Override
+        public boolean isComplete() {
+            // The authentication of tokens is always done in one single stage
+            return true;
+        }
+
+        @Override
+        public boolean isExpired() {
+            return expiration < System.currentTimeMillis();
+        }
+    }
 }
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationState.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationState.java
index 5042ef881d098..ac881ac6aa222 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationState.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationState.java
@@ -20,7 +20,6 @@
 package org.apache.pulsar.broker.authentication;
 
 import javax.naming.AuthenticationException;
-import javax.servlet.http.HttpServletRequest;
 
 import org.apache.pulsar.common.api.AuthData;
 
@@ -59,4 +58,25 @@ public interface AuthenticationState {
     default long getStateId() {
         return -1L;
     }
+
+    /**
+     * If the authentication state is expired, it will force the connection to be re-authenticated.
+     */
+    default boolean isExpired() {
+        return false;
+    }
+
+    /**
+     * If the authentication state supports refreshing and the credentials are expired,
+     * the auth provider will call this method ot initiate the refresh process.
+     * <p>
+     * The auth state here will return the broker side data that will be used to send
+     * a challenge to the client.
+     *
+     * @return the {@link AuthData} for the broker challenge to client
+     * @throws AuthenticationException
+     */
+    default AuthData refreshAuthentication() throws AuthenticationException {
+        return null;
+    }
 }
diff --git a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTokenTest.java b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTokenTest.java
index b5183e34357a8..f26777683489b 100644
--- a/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTokenTest.java
+++ b/pulsar-broker-common/src/test/java/org/apache/pulsar/broker/authentication/AuthenticationProviderTokenTest.java
@@ -19,7 +19,10 @@
 package org.apache.pulsar.broker.authentication;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
 import io.jsonwebtoken.Claims;
@@ -28,6 +31,7 @@
 import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
+import lombok.Cleanup;
 
 import java.io.File;
 import java.io.IOException;
@@ -46,6 +50,7 @@
 
 import org.apache.pulsar.broker.ServiceConfiguration;
 import org.apache.pulsar.broker.authentication.utils.AuthTokenUtils;
+import org.apache.pulsar.common.api.AuthData;
 import org.testng.annotations.Test;
 
 public class AuthenticationProviderTokenTest {
@@ -533,4 +538,36 @@ public void testValidationWhenPublicKeyAlgIsInvalid() throws IOException {
 
         new AuthenticationProviderToken().initialize(conf);
     }
+
+
+    @Test
+    public void testExpiringToken() throws Exception {
+        SecretKey secretKey = AuthTokenUtils.createSecretKey(SignatureAlgorithm.HS256);
+
+        @Cleanup
+        AuthenticationProviderToken provider = new AuthenticationProviderToken();
+
+        Properties properties = new Properties();
+        properties.setProperty(AuthenticationProviderToken.CONF_TOKEN_SECRET_KEY,
+                AuthTokenUtils.encodeKeyBase64(secretKey));
+
+        ServiceConfiguration conf = new ServiceConfiguration();
+        conf.setProperties(properties);
+        provider.initialize(conf);
+
+        // Create a token that will expire in 3 seconds
+        String expiringToken = AuthTokenUtils.createToken(secretKey, SUBJECT,
+                Optional.of(new Date(System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(3))));
+
+        AuthenticationState authState = provider.newAuthState(AuthData.of(expiringToken.getBytes()), null, null);
+        assertTrue(authState.isComplete());
+        assertFalse(authState.isExpired());
+
+        Thread.sleep(TimeUnit.SECONDS.toMillis(6));
+        assertTrue(authState.isExpired());
+        assertTrue(authState.isComplete());
+
+        AuthData brokerData = authState.refreshAuthentication();
+        assertNull(brokerData);
+    }
 }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java
index c7b0bb7e9c605..37c5a1f7cb1b1 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarBrokerStarter.java
@@ -51,6 +51,7 @@
 import org.apache.pulsar.broker.ServiceConfiguration;
 import org.apache.pulsar.broker.ServiceConfigurationUtils;
 import org.apache.pulsar.common.allocator.PulsarByteBufAllocator;
+import org.apache.pulsar.common.naming.NamespaceBundleSplitAlgorithm;
 import org.apache.pulsar.common.protocol.Commands;
 import org.apache.pulsar.functions.worker.WorkerConfig;
 import org.apache.pulsar.functions.worker.WorkerService;
@@ -152,6 +153,15 @@ private static class BrokerStarter {
                 throw new IllegalArgumentException("Max message size need smaller than jvm directMemory");
             }
 
+            if (!NamespaceBundleSplitAlgorithm.availableAlgorithms.containsAll(brokerConfig.getSupportedNamespaceBundleSplitAlgorithms())) {
+                throw new IllegalArgumentException("The given supported namespace bundle split algorithm has unavailable algorithm. " +
+                    "Available algorithms are " + NamespaceBundleSplitAlgorithm.availableAlgorithms);
+            }
+
+            if (!brokerConfig.getSupportedNamespaceBundleSplitAlgorithms().contains(brokerConfig.getDefaultNamespaceBundleSplitAlgorithm())) {
+                throw new IllegalArgumentException("Supported namespace bundle split algorithms must contains the default namespace bundle split algorithm");
+            }
+
             // init functions worker
             if (starterArguments.runFunctionsWorker || brokerConfig.isFunctionsWorkerEnabled()) {
                 WorkerConfig workerConfig;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactoryImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactoryImpl.java
index f48c915de379d..0d1d7a8d6f8f9 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactoryImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/BookKeeperClientFactoryImpl.java
@@ -115,6 +115,7 @@ ClientConfiguration createBkClientConfiguration(ServiceConfiguration conf) {
         }
 
         bkConf.setReorderReadSequenceEnabled(conf.isBookkeeperClientReorderReadSequenceEnabled());
+        bkConf.setExplictLacInterval(conf.getBookkeeperExplicitLacIntervalInMills());
 
         return bkConf;
     }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
index fd169fe1d1d59..fe848b5e8b466 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
@@ -38,7 +38,9 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -98,6 +100,7 @@
 import org.apache.pulsar.common.naming.NamespaceName;
 import org.apache.pulsar.common.naming.TopicName;
 import org.apache.pulsar.common.policies.data.ClusterData;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.apache.pulsar.common.policies.data.Policies;
 import org.apache.pulsar.common.policies.data.RetentionPolicies;
 import org.apache.pulsar.common.policies.data.TenantInfo;
@@ -109,7 +112,6 @@
 import org.apache.pulsar.functions.worker.WorkerService;
 import org.apache.pulsar.functions.worker.WorkerUtils;
 import org.apache.pulsar.transaction.coordinator.TransactionMetadataStoreProvider;
-import org.apache.pulsar.transaction.coordinator.impl.InMemTransactionMetadataStoreProvider;
 import org.apache.pulsar.websocket.WebSocketConsumerServlet;
 import org.apache.pulsar.websocket.WebSocketProducerServlet;
 import org.apache.pulsar.websocket.WebSocketReaderServlet;
@@ -162,7 +164,8 @@ public class PulsarService implements AutoCloseable {
     private ScheduledExecutorService compactorExecutor;
     private OrderedScheduler offloaderScheduler;
     private Offloaders offloaderManager = new Offloaders();
-    private LedgerOffloader offloader;
+    private LedgerOffloader defaultOffloader;
+    private Map<NamespaceName, LedgerOffloader> ledgerOffloaderMap = new ConcurrentHashMap<>();
     private ScheduledFuture<?> loadReportTask = null;
     private ScheduledFuture<?> loadSheddingTask = null;
     private ScheduledFuture<?> loadResourceQuotaTask = null;
@@ -398,7 +401,8 @@ public void start() throws PulsarServerException {
             // Start load management service (even if load balancing is disabled)
             this.loadManager.set(LoadManager.create(this));
 
-            this.offloader = createManagedLedgerOffloader(this.getConfiguration());
+            this.defaultOffloader = createManagedLedgerOffloader(
+                    OffloadPolicies.create(this.getConfiguration().getProperties()));
 
             brokerService.start();
 
@@ -427,9 +431,7 @@ public Boolean get() {
 
             if (config.isWebSocketServiceEnabled()) {
                 // Use local broker address to avoid different IP address when using a VIP for service discovery
-                this.webSocketService = new WebSocketService(
-                        new ClusterData(webServiceAddress, webServiceAddressTls, brokerServiceUrl, brokerServiceUrlTls),
-                        config);
+                this.webSocketService = new WebSocketService(null, config);
                 this.webSocketService.start();
 
                 final WebSocketServlet producerWebSocketServlet = new WebSocketProducerServlet(webSocketService);
@@ -466,6 +468,12 @@ public Boolean get() {
             this.brokerServiceUrl = brokerUrl(config);
             this.brokerServiceUrlTls = brokerUrlTls(config);
 
+            if (null != this.webSocketService) {
+                ClusterData clusterData =
+                    new ClusterData(webServiceAddress, webServiceAddressTls, brokerServiceUrl, brokerServiceUrlTls);
+                this.webSocketService.setLocalCluster(clusterData);
+            }
+
             // needs load management service
             this.startNamespaceService();
 
@@ -760,28 +768,54 @@ public ManagedLedgerClientFactory getManagedLedgerClientFactory() {
         return managedLedgerClientFactory;
     }
 
-    public LedgerOffloader getManagedLedgerOffloader() {
-        return offloader;
+    /**
+     * First, get <code>LedgerOffloader</code> from local map cache, create new <code>LedgerOffloader</code> if not in cache or
+     * the <code>OffloadPolicies</code> changed, return the <code>LedgerOffloader</code> directly if exist in cache
+     * and the <code>OffloadPolicies</code> not changed.
+     *
+     * @param namespaceName NamespaceName
+     * @param offloadPolicies the OffloadPolicies
+     * @return LedgerOffloader
+     */
+    public LedgerOffloader getManagedLedgerOffloader(NamespaceName namespaceName, OffloadPolicies offloadPolicies) {
+        if (offloadPolicies == null) {
+            return getDefaultOffloader();
+        }
+        return ledgerOffloaderMap.compute(namespaceName, (ns, offloader) -> {
+            try {
+                if (offloader != null && Objects.equals(offloader.getOffloadPolicies(), offloadPolicies)) {
+                    return offloader;
+                } else {
+                    if (offloader != null) {
+                        offloader.close();
+                    }
+                    return createManagedLedgerOffloader(offloadPolicies);
+                }
+            } catch (PulsarServerException e) {
+                LOG.error("create ledgerOffloader failed for namespace {}", namespaceName.toString(), e);
+                return new NullLedgerOffloader();
+            }
+        });
     }
 
-    public synchronized LedgerOffloader createManagedLedgerOffloader(ServiceConfiguration conf)
+    public synchronized LedgerOffloader createManagedLedgerOffloader(OffloadPolicies offloadPolicies)
             throws PulsarServerException {
         try {
-            if (StringUtils.isNotBlank(conf.getManagedLedgerOffloadDriver())) {
-                checkNotNull(conf.getOffloadersDirectory(),
+            if (StringUtils.isNotBlank(offloadPolicies.getManagedLedgerOffloadDriver())) {
+                checkNotNull(offloadPolicies.getOffloadersDirectory(),
                     "Offloader driver is configured to be '%s' but no offloaders directory is configured.",
-                    conf.getManagedLedgerOffloadDriver());
-                this.offloaderManager = OffloaderUtils.searchForOffloaders(conf.getOffloadersDirectory());
+                        offloadPolicies.getManagedLedgerOffloadDriver());
+                this.offloaderManager = OffloaderUtils.searchForOffloaders(offloadPolicies.getOffloadersDirectory());
                 LedgerOffloaderFactory offloaderFactory = this.offloaderManager.getOffloaderFactory(
-                    conf.getManagedLedgerOffloadDriver());
+                        offloadPolicies.getManagedLedgerOffloadDriver());
                 try {
                     return offloaderFactory.create(
-                        conf.getProperties(),
+                        offloadPolicies,
                         ImmutableMap.of(
                             LedgerOffloader.METADATA_SOFTWARE_VERSION_KEY.toLowerCase(), PulsarVersion.getVersion(),
                             LedgerOffloader.METADATA_SOFTWARE_GITSHA_KEY.toLowerCase(), PulsarVersion.getGitSha()
                         ),
-                        getOffloaderScheduler(conf));
+                        getOffloaderScheduler(offloadPolicies));
                 } catch (IOException ioe) {
                     throw new PulsarServerException(ioe.getMessage(), ioe.getCause());
                 }
@@ -858,10 +892,10 @@ public synchronized Compactor getCompactor() throws PulsarServerException {
         return this.compactor;
     }
 
-    protected synchronized OrderedScheduler getOffloaderScheduler(ServiceConfiguration conf) {
+    protected synchronized OrderedScheduler getOffloaderScheduler(OffloadPolicies offloadPolicies) {
         if (this.offloaderScheduler == null) {
             this.offloaderScheduler = OrderedScheduler.newSchedulerBuilder()
-                .numThreads(conf.getManagedLedgerOffloadMaxThreads())
+                .numThreads(offloadPolicies.getManagedLedgerOffloadMaxThreads())
                 .name("offloader").build();
         }
         return this.offloaderScheduler;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
index e9d559ef014e6..722da4f49214c 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/AdminResource.java
@@ -113,8 +113,8 @@ protected void zkCreateOptimistic(String path, byte[] content) throws Exception
         ZkUtils.createFullPathOptimistic(globalZk(), path, content, ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
     }
 
-    protected void zkCreateOptimisticAsync(String path, byte[] content, AsyncCallback.StringCallback callback) {
-        ZkUtils.asyncCreateFullPathOptimistic(globalZk(), path, content, ZooDefs.Ids.OPEN_ACL_UNSAFE,
+    protected void zkCreateOptimisticAsync(ZooKeeper zk, String path, byte[] content, AsyncCallback.StringCallback callback) {
+        ZkUtils.asyncCreateFullPathOptimistic(zk, path, content, ZooDefs.Ids.OPEN_ACL_UNSAFE,
                 CreateMode.PERSISTENT, callback, null);
     }
 
@@ -265,7 +265,7 @@ protected void tryCreatePartitionsAsync(int numPartitions) {
     }
 
     private void tryCreatePartitionAsync(final int partition) {
-        zkCreateOptimisticAsync(ZkAdminPaths.managedLedgerPath(topicName.getPartition(partition)), new byte[0],
+        zkCreateOptimisticAsync(localZk(), ZkAdminPaths.managedLedgerPath(topicName.getPartition(partition)), new byte[0],
             (rc, s, o, s1) -> {
                 if (KeeperException.Code.OK.intValue() == rc) {
                     if (log.isDebugEnabled()) {
@@ -454,6 +454,14 @@ protected void mergeNamespaceWithDefaults(Policies policies, String namespace, S
             policies.max_consumers_per_subscription = config.getMaxConsumersPerSubscription();
         }
 
+        if (policies.max_unacked_messages_per_consumer == -1) {
+            policies.max_unacked_messages_per_consumer = config.getMaxUnackedMessagesPerConsumer();
+        }
+
+        if (policies.max_unacked_messages_per_subscription == -1) {
+            policies.max_unacked_messages_per_subscription = config.getMaxUnackedMessagesPerSubscription();
+        }
+
         final String cluster = config.getClusterName();
         // attach default dispatch rate polices
         if (policies.topicDispatchRate.isEmpty()) {
@@ -522,10 +530,9 @@ protected ZooKeeperChildrenCache managedLedgerListCache() {
 
     protected Set<String> clusters() {
         try {
-            Set<String> clusters = pulsar().getConfigurationCache().clustersListCache().get();
-
             // Remove "global" cluster from returned list
-            clusters.remove(Constants.GLOBAL_CLUSTER);
+            Set<String> clusters = pulsar().getConfigurationCache().clustersListCache().get().stream()
+                    .filter(cluster -> !Constants.GLOBAL_CLUSTER.equals(cluster)).collect(Collectors.toSet());
             return clusters;
         } catch (Exception e) {
             throw new RestException(e);
@@ -552,6 +559,32 @@ protected ZooKeeperChildrenCache failureDomainListCache() {
         return pulsar().getConfigurationCache().failureDomainListCache();
     }
 
+    protected CompletableFuture<PartitionedTopicMetadata> getPartitionedTopicMetadataAsync(
+            TopicName topicName, boolean authoritative, boolean checkAllowAutoCreation) {
+        validateClusterOwnership(topicName.getCluster());
+        // validates global-namespace contains local/peer cluster: if peer/local cluster present then lookup can
+        // serve/redirect request else fail partitioned-metadata-request so, client fails while creating
+        // producer/consumer
+        validateGlobalNamespaceOwnership(topicName.getNamespaceObject());
+
+        try {
+            checkConnect(topicName);
+        } catch (WebApplicationException e) {
+            validateAdminAccessForTenant(topicName.getTenant());
+        } catch (Exception e) {
+            // unknown error marked as internal server error
+            log.warn("Unexpected error while authorizing lookup. topic={}, role={}. Error: {}", topicName,
+                    clientAppId(), e.getMessage(), e);
+            return FutureUtil.failedFuture(e);
+        }
+
+        if (checkAllowAutoCreation) {
+            return pulsar().getBrokerService().fetchPartitionedTopicMetadataCheckAllowAutoCreationAsync(topicName);
+        } else {
+            return pulsar().getBrokerService().fetchPartitionedTopicMetadataAsync(topicName);
+        }
+    }
+
     protected PartitionedTopicMetadata getPartitionedTopicMetadata(TopicName topicName,
             boolean authoritative, boolean checkAllowAutoCreation) {
         validateClusterOwnership(topicName.getCluster());
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokersBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokersBase.java
index 92c8620f6a2e8..1c3b7ca7369e3 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokersBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/BrokersBase.java
@@ -81,6 +81,7 @@ public class BrokersBase extends AdminResource {
         responseContainer = "Set")
     @ApiResponses(
         value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve this cluster"),
             @ApiResponse(code = 401, message = "Authentication required"),
             @ApiResponse(code = 403, message = "This operation requires super-user access"),
             @ApiResponse(code = 404, message = "Cluster does not exist: cluster={clustername}") })
@@ -92,7 +93,7 @@ public Set<String> getActiveBrokers(@PathParam("cluster") String cluster) throws
             // Add Native brokers
             return pulsar().getLocalZkCache().getChildren(LoadManager.LOADBALANCE_BROKERS_ROOT);
         } catch (Exception e) {
-            LOG.error(String.format("[%s] Failed to get active broker list: cluster=%s", clientAppId(), cluster), e);
+            LOG.error("[{}] Failed to get active broker list: cluster={}", clientAppId(), cluster, e);
             throw new RestException(e);
         }
     }
@@ -101,6 +102,7 @@ public Set<String> getActiveBrokers(@PathParam("cluster") String cluster) throws
     @Path("/{clusterName}/{broker-webserviceurl}/ownedNamespaces")
     @ApiOperation(value = "Get the list of namespaces served by the specific broker", response = NamespaceOwnershipStatus.class, responseContainer = "Map")
     @ApiResponses(value = {
+        @ApiResponse(code = 307, message = "Current broker doesn't serve the cluster"),
         @ApiResponse(code = 403, message = "Don't have admin permission"),
         @ApiResponse(code = 404, message = "Cluster doesn't exist") })
     public Map<String, NamespaceOwnershipStatus> getOwnedNamespaces(@PathParam("clusterName") String cluster,
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ClustersBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ClustersBase.java
index 417a68b427109..e6d2b6ba7d863 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ClustersBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/ClustersBase.java
@@ -84,10 +84,9 @@ public class ClustersBase extends AdminResource {
     })
     public Set<String> getClusters() throws Exception {
         try {
-            Set<String> clusters = clustersListCache().get();
-
             // Remove "global" cluster from returned list
-            clusters.remove(Constants.GLOBAL_CLUSTER);
+            Set<String> clusters = clustersListCache().get().stream()
+                    .filter(cluster -> !Constants.GLOBAL_CLUSTER.equals(cluster)).collect(Collectors.toSet());
             return clusters;
         } catch (Exception e) {
             log.error("[{}] Failed to get clusters list", clientAppId(), e);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java
index 8679ed52d9657..0529c0489f2cb 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java
@@ -332,6 +332,7 @@ public FunctionConfig getFunctionInfo(
             response = FunctionStatus.FunctionInstanceStatus.FunctionInstanceStatusData.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 404, message = "The Pulsar Function doesn't exist")
@@ -356,6 +357,7 @@ public FunctionStatus.FunctionInstanceStatus.FunctionInstanceStatusData getFunct
             response = FunctionStatus.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 404, message = "The Pulsar Function doesn't exist")
@@ -378,6 +380,7 @@ public FunctionStatus getFunctionStatus(
             response = FunctionStats.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 404, message = "The Pulsar Function doesn't exist")
@@ -400,6 +403,7 @@ public FunctionStats getFunctionStats(
             response = FunctionStats.FunctionInstanceStats.FunctionInstanceStatsData.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 404, message = "The Pulsar Function doesn't exist")
@@ -513,6 +517,7 @@ public void putFunctionState(final @PathParam("tenant") String tenant,
     @POST
     @ApiOperation(value = "Restart an instance of a Pulsar Function", response = Void.class)
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 404, message = "The Pulsar Function does not exist"),
             @ApiResponse(code = 500, message = "Internal server error")
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
index adc7bd4d502b6..c0ce1e090ab40 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
@@ -64,6 +64,7 @@
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.common.naming.NamespaceBundle;
 import org.apache.pulsar.common.naming.NamespaceBundleFactory;
+import org.apache.pulsar.common.naming.NamespaceBundleSplitAlgorithm;
 import org.apache.pulsar.common.naming.NamespaceBundles;
 import org.apache.pulsar.common.naming.NamespaceName;
 import org.apache.pulsar.common.naming.TopicDomain;
@@ -75,7 +76,9 @@
 import org.apache.pulsar.common.policies.data.BundlesData;
 import org.apache.pulsar.common.policies.data.ClusterData;
 import org.apache.pulsar.common.policies.data.DispatchRate;
+import org.apache.pulsar.common.policies.data.DelayedDeliveryPolicies;
 import org.apache.pulsar.common.policies.data.LocalPolicies;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.apache.pulsar.common.policies.data.PersistencePolicies;
 import org.apache.pulsar.common.policies.data.Policies;
 import org.apache.pulsar.common.policies.data.PublishRate;
@@ -773,7 +776,7 @@ public void internalUnloadNamespaceBundle(String bundleRange, boolean authoritat
     }
 
     @SuppressWarnings("deprecation")
-    protected void internalSplitNamespaceBundle(String bundleRange, boolean authoritative, boolean unload) {
+    protected void internalSplitNamespaceBundle(String bundleRange, boolean authoritative, boolean unload, String splitAlgorithmName) {
         log.info("[{}] Split namespace bundle {}/{}", clientAppId(), namespaceName, bundleRange);
 
         validateSuperUserAccess();
@@ -791,19 +794,41 @@ protected void internalSplitNamespaceBundle(String bundleRange, boolean authorit
         NamespaceBundle nsBundle = validateNamespaceBundleOwnership(namespaceName, policies.bundles, bundleRange,
                 authoritative, true);
 
+        List<String> supportedNamespaceBundleSplitAlgorithms = pulsar().getConfig().getSupportedNamespaceBundleSplitAlgorithms();
+        if (StringUtils.isNotBlank(splitAlgorithmName) && !supportedNamespaceBundleSplitAlgorithms.contains(splitAlgorithmName)) {
+            throw new RestException(Status.PRECONDITION_FAILED,
+                "Unsupported namespace bundle split algorithm, supported algorithms are " + supportedNamespaceBundleSplitAlgorithms);
+        }
+
         try {
-            pulsar().getNamespaceService().splitAndOwnBundle(nsBundle, unload).get();
+            pulsar().getNamespaceService().splitAndOwnBundle(nsBundle, unload, getNamespaceBundleSplitAlgorithmByName(splitAlgorithmName)).get();
             log.info("[{}] Successfully split namespace bundle {}", clientAppId(), nsBundle.toString());
-        } catch (IllegalArgumentException e) {
-            log.error("[{}] Failed to split namespace bundle {}/{} due to {}", clientAppId(), namespaceName,
+        } catch (ExecutionException e) {
+            if (e.getCause() instanceof IllegalArgumentException) {
+                log.error("[{}] Failed to split namespace bundle {}/{} due to {}", clientAppId(), namespaceName,
                     bundleRange, e.getMessage());
-            throw new RestException(Status.PRECONDITION_FAILED, "Split bundle failed due to invalid request");
+                throw new RestException(Status.PRECONDITION_FAILED, "Split bundle failed due to invalid request");
+            } else {
+                log.error("[{}] Failed to split namespace bundle {}/{}", clientAppId(), namespaceName, bundleRange, e);
+                throw new RestException(e.getCause());
+            }
         } catch (Exception e) {
             log.error("[{}] Failed to split namespace bundle {}/{}", clientAppId(), namespaceName, bundleRange, e);
             throw new RestException(e);
         }
     }
 
+    private NamespaceBundleSplitAlgorithm getNamespaceBundleSplitAlgorithmByName(String algorithmName) {
+        NamespaceBundleSplitAlgorithm algorithm = NamespaceBundleSplitAlgorithm.of(algorithmName);
+        if (algorithm == null) {
+            algorithm = NamespaceBundleSplitAlgorithm.of(pulsar().getConfig().getDefaultNamespaceBundleSplitAlgorithm());
+        }
+        if (algorithm == null) {
+            algorithm = NamespaceBundleSplitAlgorithm.rangeEquallyDivide;
+        }
+        return algorithm;
+    }
+
     protected void internalSetPublishRate(PublishRate maxPublishMessageRate) {
         log.info("[{}] Set namespace publish-rate {}/{}", clientAppId(), namespaceName, maxPublishMessageRate);
         validateSuperUserAccess();
@@ -854,6 +879,7 @@ protected PublishRate internalGetPublishRate() {
         }
     }
 
+    @SuppressWarnings("deprecation")
     protected void internalSetTopicDispatchRate(DispatchRate dispatchRate) {
         log.info("[{}] Set namespace dispatch-rate {}/{}", clientAppId(), namespaceName, dispatchRate);
         validateSuperUserAccess();
@@ -866,6 +892,7 @@ protected void internalSetTopicDispatchRate(DispatchRate dispatchRate) {
             policiesNode = policiesCache().getWithStat(path).orElseThrow(
                     () -> new RestException(Status.NOT_FOUND, "Namespace " + namespaceName + " does not exist"));
             policiesNode.getKey().topicDispatchRate.put(pulsar().getConfiguration().getClusterName(), dispatchRate);
+            policiesNode.getKey().clusterDispatchRate.put(pulsar().getConfiguration().getClusterName(), dispatchRate);
 
             // Write back the new policies into zookeeper
             globalZk().setData(path, jsonMapper().writeValueAsBytes(policiesNode.getKey()),
@@ -891,11 +918,15 @@ protected void internalSetTopicDispatchRate(DispatchRate dispatchRate) {
         }
     }
 
+    @SuppressWarnings("deprecation")
     protected DispatchRate internalGetTopicDispatchRate() {
         validateAdminAccessForTenant(namespaceName.getTenant());
 
         Policies policies = getNamespacePolicies(namespaceName);
         DispatchRate dispatchRate = policies.topicDispatchRate.get(pulsar().getConfiguration().getClusterName());
+        if (dispatchRate == null) {
+            dispatchRate = policies.clusterDispatchRate.get(pulsar().getConfiguration().getClusterName());
+        }
         if (dispatchRate != null) {
             return dispatchRate;
         } else {
@@ -1475,6 +1506,51 @@ protected void internalModifyEncryptionRequired(boolean encryptionRequired) {
         }
     }
 
+    protected DelayedDeliveryPolicies internalGetDelayedDelivery() {
+        validateAdminAccessForTenant(namespaceName.getTenant());
+
+        Policies policies = getNamespacePolicies(namespaceName);
+        if (policies.delayed_delivery_policies == null) {
+            return new DelayedDeliveryPolicies(config().getDelayedDeliveryTickTimeMillis(),
+                    config().isDelayedDeliveryEnabled());
+        } else {
+            return policies.delayed_delivery_policies;
+        }
+    }
+
+    protected void internalSetDelayedDelivery(DelayedDeliveryPolicies delayedDeliveryPolicies) {
+        validateSuperUserAccess();
+        validateAdminAccessForTenant(namespaceName.getTenant());
+        validatePoliciesReadOnlyAccess();
+
+        try {
+            Stat nodeStat = new Stat();
+            final String path = path(POLICIES, namespaceName.toString());
+            byte[] content = globalZk().getData(path, null, nodeStat);
+            Policies policies = jsonMapper().readValue(content, Policies.class);
+
+            policies.delayed_delivery_policies = delayedDeliveryPolicies;
+            globalZk().setData(path, jsonMapper().writeValueAsBytes(policies), nodeStat.getVersion());
+            policiesCache().invalidate(path(POLICIES, namespaceName.toString()));
+            log.info("[{}] Successfully updated delayed delivery messages configuration: namespace={}, map={}", clientAppId(),
+                    namespaceName, jsonMapper().writeValueAsString(policies.retention_policies));
+
+        } catch (KeeperException.NoNodeException e) {
+            log.warn("[{}] Failed to update delayed delivery messages configuration for namespace {}: does not exist", clientAppId(),
+                    namespaceName);
+            throw new RestException(Status.NOT_FOUND, "Namespace does not exist");
+        } catch (KeeperException.BadVersionException e) {
+            log.warn("[{}] Failed to update delayed delivery messages configuration for namespace {}: concurrent modification",
+                    clientAppId(), namespaceName);
+            throw new RestException(Status.CONFLICT, "Concurrent modification");
+        } catch (RestException pfe) {
+            throw pfe;
+        } catch (Exception e) {
+            log.error("[{}] Failed to update delayed delivery messages configuration for namespace {}", clientAppId(), namespaceName,
+                    e);
+            throw new RestException(e);
+        }
+    }
 
     protected void internalSetNamespaceAntiAffinityGroup(String antiAffinityGroup) {
         validateAdminAccessForTenant(namespaceName.getTenant());
@@ -1700,7 +1776,7 @@ private void unsubscribe(NamespaceName nsName, String bundleRange, String subscr
      *
      * @param clusterName:
      *            given cluster whose peer-clusters can't be present into replication-cluster list
-     * @param clusters:
+     * @param replicationClusters:
      *            replication-cluster list
      */
     private void validatePeerClusterConflict(String clusterName, Set<String> replicationClusters) {
@@ -1921,6 +1997,88 @@ protected void internalSetMaxConsumersPerSubscription(int maxConsumersPerSubscri
         }
     }
 
+    protected int internalGetMaxUnackedMessagesPerConsumer() {
+        validateAdminAccessForTenant(namespaceName.getTenant());
+        return getNamespacePolicies(namespaceName).max_unacked_messages_per_consumer;
+    }
+
+    protected void internalSetMaxUnackedMessagesPerConsumer(int maxUnackedMessagesPerConsumer) {
+        validateSuperUserAccess();
+        validatePoliciesReadOnlyAccess();
+
+        try {
+            Stat nodeStat = new Stat();
+            final String path = path(POLICIES, namespaceName.toString());
+            byte[] content = globalZk().getData(path, null, nodeStat);
+            Policies policies = jsonMapper().readValue(content, Policies.class);
+            if (maxUnackedMessagesPerConsumer < 0) {
+                throw new RestException(Status.PRECONDITION_FAILED,
+                        "maxUnackedMessagesPerConsumer must be 0 or more");
+            }
+            policies.max_unacked_messages_per_consumer = maxUnackedMessagesPerConsumer;
+            globalZk().setData(path, jsonMapper().writeValueAsBytes(policies), nodeStat.getVersion());
+            policiesCache().invalidate(path(POLICIES, namespaceName.toString()));
+            log.info("[{}] Successfully updated maxUnackedMessagesPerConsumer configuration: namespace={}, value={}", clientAppId(),
+                    namespaceName, policies.max_unacked_messages_per_consumer);
+
+        } catch (KeeperException.NoNodeException e) {
+            log.warn("[{}] Failed to update maxUnackedMessagesPerConsumer configuration for namespace {}: does not exist", clientAppId(),
+                    namespaceName);
+            throw new RestException(Status.NOT_FOUND, "Namespace does not exist");
+        } catch (KeeperException.BadVersionException e) {
+            log.warn("[{}] Failed to update maxUnackedMessagesPerConsumer configuration for namespace {}: concurrent modification",
+                    clientAppId(), namespaceName);
+            throw new RestException(Status.CONFLICT, "Concurrent modification");
+        } catch (RestException pfe) {
+            throw pfe;
+        } catch (Exception e) {
+            log.error("[{}] Failed to update maxUnackedMessagesPerConsumer configuration for namespace {}", clientAppId(), namespaceName,
+                    e);
+            throw new RestException(e);
+        }
+    }
+
+    protected int internalGetMaxUnackedMessagesPerSubscription() {
+        validateAdminAccessForTenant(namespaceName.getTenant());
+        return getNamespacePolicies(namespaceName).max_unacked_messages_per_subscription;
+    }
+
+    protected void internalSetMaxUnackedMessagesPerSubscription(int maxUnackedMessagesPerSubscription) {
+        validateSuperUserAccess();
+        validatePoliciesReadOnlyAccess();
+
+        try {
+            Stat nodeStat = new Stat();
+            final String path = path(POLICIES, namespaceName.toString());
+            byte[] content = globalZk().getData(path, null, nodeStat);
+            Policies policies = jsonMapper().readValue(content, Policies.class);
+            if (maxUnackedMessagesPerSubscription < 0) {
+                throw new RestException(Status.PRECONDITION_FAILED,
+                        "maxUnackedMessagesPerSubscription must be 0 or more");
+            }
+            policies.max_unacked_messages_per_subscription = maxUnackedMessagesPerSubscription;
+            globalZk().setData(path, jsonMapper().writeValueAsBytes(policies), nodeStat.getVersion());
+            policiesCache().invalidate(path(POLICIES, namespaceName.toString()));
+            log.info("[{}] Successfully updated maxUnackedMessagesPerSubscription configuration: namespace={}, value={}", clientAppId(),
+                    namespaceName, policies.max_unacked_messages_per_subscription);
+
+        } catch (KeeperException.NoNodeException e) {
+            log.warn("[{}] Failed to update maxUnackedMessagesPerSubscription configuration for namespace {}: does not exist", clientAppId(),
+                    namespaceName);
+            throw new RestException(Status.NOT_FOUND, "Namespace does not exist");
+        } catch (KeeperException.BadVersionException e) {
+            log.warn("[{}] Failed to update maxUnackedMessagesPerSubscription configuration for namespace {}: concurrent modification",
+                    clientAppId(), namespaceName);
+            throw new RestException(Status.CONFLICT, "Concurrent modification");
+        } catch (RestException pfe) {
+            throw pfe;
+        } catch (Exception e) {
+            log.error("[{}] Failed to update maxUnackedMessagesPerSubscription configuration for namespace {}", clientAppId(), namespaceName,
+                    e);
+            throw new RestException(e);
+        }
+    }
+
     protected long internalGetCompactionThreshold() {
         validateAdminAccessForTenant(namespaceName.getTenant());
         return getNamespacePolicies(namespaceName).compaction_threshold;
@@ -2142,5 +2300,74 @@ private <T> void mutatePolicy(Function<Policies, Policies> policyTransformation,
         }
     }
 
+    protected void internalSetOffloadPolicies(AsyncResponse asyncResponse, OffloadPolicies offloadPolicies) {
+        validateAdminAccessForTenant(namespaceName.getTenant());
+        validatePoliciesReadOnlyAccess();
+        validateOffloadPolicies(offloadPolicies);
+
+        try {
+            Stat nodeStat = new Stat();
+            final String path = path(POLICIES, namespaceName.toString());
+            byte[] content = globalZk().getData(path, null, nodeStat);
+            Policies policies = jsonMapper().readValue(content, Policies.class);
+            policies.offload_policies = offloadPolicies;
+            globalZk().setData(path, jsonMapper().writeValueAsBytes(policies), nodeStat.getVersion(),
+                    (rc, path1, ctx, stat) -> {
+                        if (rc == KeeperException.Code.OK.intValue()) {
+                            policiesCache().invalidate(path(POLICIES, namespaceName.toString()));
+                        } else {
+                            String errorMsg = String.format(
+                                    "[%s] Failed to update offload configuration for namespace %s",
+                                    clientAppId(), namespaceName);
+                            if (rc == KeeperException.Code.NONODE.intValue()) {
+                                log.warn("{} : does not exist", errorMsg);
+                                asyncResponse.resume(new RestException(Status.NOT_FOUND, "Namespace does not exist"));
+                            } else if (rc == KeeperException.Code.BADVERSION.intValue()) {
+                                log.warn("{} : concurrent modification", errorMsg);
+                                asyncResponse.resume(new RestException(Status.CONFLICT, "Concurrent modification"));
+                            } else {
+                                asyncResponse.resume(KeeperException.create(KeeperException.Code.get(rc), errorMsg));
+                            }
+                        }
+                    }, null);
+            log.info("[{}] Successfully updated offload configuration: namespace={}, map={}", clientAppId(),
+                    namespaceName, jsonMapper().writeValueAsString(policies.offload_policies));
+            asyncResponse.resume(Response.noContent().build());
+        } catch (Exception e) {
+            log.error("[{}] Failed to update offload configuration for namespace {}", clientAppId(), namespaceName,
+                    e);
+            asyncResponse.resume(new RestException(e));
+        }
+    }
+
+    private void validateOffloadPolicies(OffloadPolicies offloadPolicies) {
+        if (offloadPolicies == null) {
+            log.warn("[{}] Failed to update offload configuration for namespace {}: offloadPolicies is null",
+                    clientAppId(), namespaceName);
+            throw new RestException(Status.PRECONDITION_FAILED,
+                    "The offloadPolicies must be specified for namespace offload.");
+        }
+        if (!offloadPolicies.driverSupported()) {
+            log.warn("[{}] Failed to update offload configuration for namespace {}: " +
+                            "driver is not supported, support value: {}",
+                    clientAppId(), namespaceName, OffloadPolicies.getSupportedDriverNames());
+            throw new RestException(Status.PRECONDITION_FAILED,
+                    "The driver is not supported, support value: " + OffloadPolicies.getSupportedDriverNames());
+        }
+        if (!offloadPolicies.bucketValid()) {
+            log.warn("[{}] Failed to update offload configuration for namespace {}: bucket must be specified",
+                    clientAppId(), namespaceName);
+            throw new RestException(Status.PRECONDITION_FAILED,
+                    "The bucket must be specified for namespace offload.");
+        }
+    }
+
+    protected OffloadPolicies internalGetOffloadPolicies() {
+        validateAdminAccessForTenant(namespaceName.getTenant());
+
+        Policies policies = getNamespacePolicies(namespaceName);
+        return policies.offload_policies;
+    }
+
     private static final Logger log = LoggerFactory.getLogger(NamespacesBase.class);
 }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
index 0add56e311cc4..503b21b430d58 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
@@ -638,29 +638,84 @@ protected void internalDeletePartitionedTopic(AsyncResponse asyncResponse, boole
                 zkSync(path);
                 log.info("[{}] Deleted partitioned topic {}", clientAppId(), topicName);
                 asyncResponse.resume(Response.noContent().build());
-                return;
             } catch (KeeperException.NoNodeException nne) {
                 asyncResponse.resume(new RestException(Status.NOT_FOUND, "Partitioned topic does not exist"));
-                return;
             } catch (KeeperException.BadVersionException e) {
                 log.warn("[{}] Failed to delete partitioned topic {}: concurrent modification", clientAppId(),
                         topicName);
                 asyncResponse.resume(new RestException(Status.CONFLICT, "Concurrent modification"));
-                return;
             } catch (Exception e) {
                 log.error("[{}] Failed to delete partitioned topic {}", clientAppId(), topicName, e);
                 asyncResponse.resume(new RestException(e));
-                return;
             }
         });
     }
 
-    protected void internalUnloadTopic(boolean authoritative) {
+    protected void internalUnloadTopic(AsyncResponse asyncResponse, boolean authoritative) {
         log.info("[{}] Unloading topic {}", clientAppId(), topicName);
         if (topicName.isGlobal()) {
             validateGlobalNamespaceOwnership(namespaceName);
         }
-        unloadTopic(topicName, authoritative);
+        // If the topic name is a partition name, no need to get partition topic metadata again
+        if (topicName.isPartitioned()) {
+            internalUnloadNonPartitionedTopic(asyncResponse, authoritative);
+        } else {
+            getPartitionedTopicMetadataAsync(topicName, authoritative, false).whenComplete((meta, t) -> {
+                if (meta.partitions > 0) {
+                    final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+
+                    for (int i = 0; i < meta.partitions; i++) {
+                        TopicName topicNamePartition = topicName.getPartition(i);
+                        try {
+                            futures.add(pulsar().getAdminClient().topics().unloadAsync(topicNamePartition.toString()));
+                        } catch (Exception e) {
+                            log.error("[{}] Failed to unload topic {}", clientAppId(), topicNamePartition, e);
+                            asyncResponse.resume(new RestException(e));
+                            return;
+                        }
+                    }
+
+                    FutureUtil.waitForAll(futures).handle((result, exception) -> {
+                        if (exception != null) {
+                            Throwable th = exception.getCause();
+                            if (th instanceof NotFoundException) {
+                                asyncResponse.resume(new RestException(Status.NOT_FOUND, th.getMessage()));
+                            } else {
+                                log.error("[{}] Failed to unload topic {}", clientAppId(), topicName, exception);
+                                asyncResponse.resume(new RestException(exception));
+                            }
+                            return null;
+                        }
+
+                        asyncResponse.resume(Response.noContent().build());
+                        return null;
+                    });
+                } else {
+                    internalUnloadNonPartitionedTopic(asyncResponse, authoritative);
+                }
+            }).exceptionally(t -> {
+                Throwable th = t.getCause();
+                asyncResponse.resume(new RestException(th));
+                return null;
+            });
+        }
+    }
+
+    private void internalUnloadNonPartitionedTopic(AsyncResponse asyncResponse, boolean authoritative) {
+        validateAdminAccessForTenant(topicName.getTenant());
+        validateTopicOwnership(topicName, authoritative);
+
+        Topic topic = getTopicReference(topicName);
+        topic.close(false).whenComplete((r, ex) -> {
+            if (ex != null) {
+                log.error("[{}] Failed to unload topic {}, {}", clientAppId(), topicName, ex.getMessage(), ex);
+                asyncResponse.resume(new RestException(ex));
+
+            } else {
+                log.info("[{}] Successfully unloaded topic {}", clientAppId(), topicName);
+                asyncResponse.resume(Response.noContent().build());
+            }
+        });
     }
 
     protected void internalDeleteTopic(boolean authoritative, boolean force) {
@@ -702,25 +757,26 @@ protected void internalGetSubscriptions(AsyncResponse asyncResponse, boolean aut
         if (topicName.isGlobal()) {
             validateGlobalNamespaceOwnership(namespaceName);
         }
-
-        final List<String> subscriptions = Lists.newArrayList();
-
-        PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
-        if (partitionMetadata.partitions > 0) {
-            try {
-                // get the subscriptions only from the 1st partition since all the other partitions will have the same
-                // subscriptions
-                pulsar().getAdminClient().topics().getSubscriptionsAsync(topicName.getPartition(0).toString())
+        // If the topic name is a partition name, no need to get partition topic metadata again
+        if (topicName.isPartitioned()) {
+            internalGetSubscriptionsForNonPartitionedTopic(asyncResponse, authoritative);
+        } else {
+            PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
+            if (partitionMetadata.partitions > 0) {
+                try {
+                    // get the subscriptions only from the 1st partition since all the other partitions will have the same
+                    // subscriptions
+                    pulsar().getAdminClient().topics().getSubscriptionsAsync(topicName.getPartition(0).toString())
                         .whenComplete((r, ex) -> {
                             if (ex != null) {
                                 log.warn("[{}] Failed to get list of subscriptions for {}: {}", clientAppId(),
-                                        topicName, ex.getMessage());
+                                    topicName, ex.getMessage());
 
                                 if (ex instanceof PulsarAdminException) {
                                     PulsarAdminException pae = (PulsarAdminException) ex;
                                     if (pae.getStatusCode() == Status.NOT_FOUND.getStatusCode()) {
                                         asyncResponse.resume(new RestException(Status.NOT_FOUND,
-                                                "Internal topics have not been generated yet"));
+                                            "Internal topics have not been generated yet"));
                                         return;
                                     } else {
                                         asyncResponse.resume(new RestException(pae));
@@ -731,40 +787,45 @@ protected void internalGetSubscriptions(AsyncResponse asyncResponse, boolean aut
                                     return;
                                 }
                             }
-
+                            final List<String> subscriptions = Lists.newArrayList();
                             subscriptions.addAll(r);
                             asyncResponse.resume(subscriptions);
                             return;
                         });
-            } catch (Exception e) {
-                log.error("[{}] Failed to get list of subscriptions for {}", clientAppId(), topicName, e);
-                asyncResponse.resume(e);
-                return;
+                } catch (Exception e) {
+                    log.error("[{}] Failed to get list of subscriptions for {}", clientAppId(), topicName, e);
+                    asyncResponse.resume(e);
+                    return;
+                }
+            } else {
+                internalGetSubscriptionsForNonPartitionedTopic(asyncResponse, authoritative);
             }
-        } else {
-            validateAdminOperationOnTopic(authoritative);
-            Topic topic = getTopicReference(topicName);
+        }
+    }
 
-            try {
-                topic.getSubscriptions().forEach((subName, sub) -> subscriptions.add(subName));
-                asyncResponse.resume(subscriptions);
-                return;
-            } catch (Exception e) {
-                log.error("[{}] Failed to get list of subscriptions for {}", clientAppId(), topicName, e);
-                asyncResponse.resume(new RestException(e));
-                return;
-            }
+    private void internalGetSubscriptionsForNonPartitionedTopic(AsyncResponse asyncResponse, boolean authoritative) {
+        validateAdminOperationOnTopic(authoritative);
+        Topic topic = getTopicReference(topicName);
+        try {
+            final List<String> subscriptions = Lists.newArrayList();
+            topic.getSubscriptions().forEach((subName, sub) -> subscriptions.add(subName));
+            asyncResponse.resume(subscriptions);
+            return;
+        } catch (Exception e) {
+            log.error("[{}] Failed to get list of subscriptions for {}", clientAppId(), topicName, e);
+            asyncResponse.resume(new RestException(e));
+            return;
         }
     }
 
-    protected TopicStats internalGetStats(boolean authoritative) {
+    protected TopicStats internalGetStats(boolean authoritative, boolean getPreciseBacklog) {
         validateAdminAndClientPermission();
         if (topicName.isGlobal()) {
             validateGlobalNamespaceOwnership(namespaceName);
         }
         validateTopicOwnership(topicName, authoritative);
         Topic topic = getTopicReference(topicName);
-        return topic.getStats();
+        return topic.getStats(getPreciseBacklog);
     }
 
     protected PersistentTopicInternalStats internalGetInternalStats(boolean authoritative) {
@@ -799,7 +860,7 @@ public void getInfoFailed(ManagedLedgerException exception, Object ctx) {
     }
 
     protected void internalGetPartitionedStats(AsyncResponse asyncResponse, boolean authoritative,
-            boolean perPartition) {
+            boolean perPartition, boolean getPreciseBacklog) {
         PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
         if (partitionMetadata.partitions == 0) {
             throw new RestException(Status.NOT_FOUND, "Partitioned Topic not found");
@@ -813,7 +874,7 @@ protected void internalGetPartitionedStats(AsyncResponse asyncResponse, boolean
         for (int i = 0; i < partitionMetadata.partitions; i++) {
             try {
                 topicStatsFutureList
-                        .add(pulsar().getAdminClient().topics().getStatsAsync((topicName.getPartition(i).toString())));
+                        .add(pulsar().getAdminClient().topics().getStatsAsync((topicName.getPartition(i).toString()), getPreciseBacklog));
             } catch (PulsarServerException e) {
                 asyncResponse.resume(new RestException(e));
                 return;
@@ -901,67 +962,72 @@ protected void internalDeleteSubscription(AsyncResponse asyncResponse, String su
         if (topicName.isGlobal()) {
             validateGlobalNamespaceOwnership(namespaceName);
         }
-        PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
-        if (partitionMetadata.partitions > 0) {
-            final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+        // If the topic name is a partition name, no need to get partition topic metadata again
+        if (topicName.isPartitioned()) {
+            internalDeleteSubscriptionForNonPartitionedTopic(asyncResponse, subName, authoritative);
+        } else {
+            PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
+            if (partitionMetadata.partitions > 0) {
+                final List<CompletableFuture<Void>> futures = Lists.newArrayList();
 
-            for (int i = 0; i < partitionMetadata.partitions; i++) {
-                TopicName topicNamePartition = topicName.getPartition(i);
-                try {
-                    futures.add(pulsar().getAdminClient().topics()
+                for (int i = 0; i < partitionMetadata.partitions; i++) {
+                    TopicName topicNamePartition = topicName.getPartition(i);
+                    try {
+                        futures.add(pulsar().getAdminClient().topics()
                             .deleteSubscriptionAsync(topicNamePartition.toString(), subName));
-                } catch (Exception e) {
-                    log.error("[{}] Failed to delete subscription {} {}", clientAppId(), topicNamePartition, subName,
+                    } catch (Exception e) {
+                        log.error("[{}] Failed to delete subscription {} {}", clientAppId(), topicNamePartition, subName,
                             e);
-                    asyncResponse.resume(new RestException(e));
-                    return;
+                        asyncResponse.resume(new RestException(e));
+                        return;
+                    }
                 }
-            }
 
-            FutureUtil.waitForAll(futures).handle((result, exception) -> {
-                if (exception != null) {
-                    Throwable t = exception.getCause();
-                    if (t instanceof NotFoundException) {
-                        asyncResponse.resume(new RestException(Status.NOT_FOUND, "Subscription not found"));
-                        return null;
-                    } else if (t instanceof PreconditionFailedException) {
-                        asyncResponse.resume(new RestException(Status.PRECONDITION_FAILED,
+                FutureUtil.waitForAll(futures).handle((result, exception) -> {
+                    if (exception != null) {
+                        Throwable t = exception.getCause();
+                        if (t instanceof NotFoundException) {
+                            asyncResponse.resume(new RestException(Status.NOT_FOUND, "Subscription not found"));
+                            return null;
+                        } else if (t instanceof PreconditionFailedException) {
+                            asyncResponse.resume(new RestException(Status.PRECONDITION_FAILED,
                                 "Subscription has active connected consumers"));
-                        return null;
-                    } else {
-                        log.error("[{}] Failed to delete subscription {} {}", clientAppId(), topicName, subName, t);
-                        asyncResponse.resume(new RestException(t));
-                        return null;
+                            return null;
+                        } else {
+                            log.error("[{}] Failed to delete subscription {} {}", clientAppId(), topicName, subName, t);
+                            asyncResponse.resume(new RestException(t));
+                            return null;
+                        }
                     }
-                }
 
-                asyncResponse.resume(Response.noContent().build());
-                return null;
-            });
-        } else {
-            validateAdminAccessForSubscriber(subName, authoritative);
-            Topic topic = getTopicReference(topicName);
-            try {
-                Subscription sub = topic.getSubscription(subName);
-                checkNotNull(sub);
-                sub.delete().get();
-                log.info("[{}][{}] Deleted subscription {}", clientAppId(), topicName, subName);
-                asyncResponse.resume(Response.noContent().build());
-                return;
-            } catch (Exception e) {
-                Throwable t = e.getCause();
-                if (e instanceof NullPointerException) {
-                    asyncResponse.resume(new RestException(Status.NOT_FOUND, "Subscription not found"));
-                    return;
-                } else if (t instanceof SubscriptionBusyException) {
-                    asyncResponse.resume(new RestException(Status.PRECONDITION_FAILED,
-                            "Subscription has active connected consumers"));
-                    return;
-                } else {
-                    log.error("[{}] Failed to delete subscription {} {}", clientAppId(), topicName, subName, e);
-                    asyncResponse.resume(new RestException(t));
-                    return;
-                }
+                    asyncResponse.resume(Response.noContent().build());
+                    return null;
+                });
+            } else {
+                internalDeleteSubscriptionForNonPartitionedTopic(asyncResponse, subName, authoritative);
+            }
+        }
+    }
+
+    private void internalDeleteSubscriptionForNonPartitionedTopic(AsyncResponse asyncResponse, String subName, boolean authoritative) {
+        validateAdminAccessForSubscriber(subName, authoritative);
+        Topic topic = getTopicReference(topicName);
+        try {
+            Subscription sub = topic.getSubscription(subName);
+            checkNotNull(sub);
+            sub.delete().get();
+            log.info("[{}][{}] Deleted subscription {}", clientAppId(), topicName, subName);
+            asyncResponse.resume(Response.noContent().build());
+        } catch (Exception e) {
+            Throwable t = e.getCause();
+            if (e instanceof NullPointerException) {
+                asyncResponse.resume(new RestException(Status.NOT_FOUND, "Subscription not found"));
+            } else if (t instanceof SubscriptionBusyException) {
+                asyncResponse.resume(new RestException(Status.PRECONDITION_FAILED,
+                    "Subscription has active connected consumers"));
+            } else {
+                log.error("[{}] Failed to delete subscription {} {}", clientAppId(), topicName, subName, e);
+                asyncResponse.resume(new RestException(t));
             }
         }
     }
@@ -970,67 +1036,76 @@ protected void internalSkipAllMessages(AsyncResponse asyncResponse, String subNa
         if (topicName.isGlobal()) {
             validateGlobalNamespaceOwnership(namespaceName);
         }
-        PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
-        if (partitionMetadata.partitions > 0) {
-            final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+        // If the topic name is a partition name, no need to get partition topic metadata again
+        if (topicName.isPartitioned()) {
+            internalSkipAllMessagesForNonPartitionedTopic(asyncResponse, subName, authoritative);
+        } else {
+            PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
+            if (partitionMetadata.partitions > 0) {
+                final List<CompletableFuture<Void>> futures = Lists.newArrayList();
 
-            for (int i = 0; i < partitionMetadata.partitions; i++) {
-                TopicName topicNamePartition = topicName.getPartition(i);
-                try {
-                    futures.add(pulsar().getAdminClient().topics().skipAllMessagesAsync(topicNamePartition.toString(),
+                for (int i = 0; i < partitionMetadata.partitions; i++) {
+                    TopicName topicNamePartition = topicName.getPartition(i);
+                    try {
+                        futures.add(pulsar().getAdminClient().topics().skipAllMessagesAsync(topicNamePartition.toString(),
                             subName));
-                } catch (Exception e) {
-                    log.error("[{}] Failed to skip all messages {} {}", clientAppId(), topicNamePartition, subName, e);
-                    asyncResponse.resume(new RestException(e));
-                    return;
+                    } catch (Exception e) {
+                        log.error("[{}] Failed to skip all messages {} {}", clientAppId(), topicNamePartition, subName, e);
+                        asyncResponse.resume(new RestException(e));
+                        return;
+                    }
                 }
-            }
 
-            FutureUtil.waitForAll(futures).handle((result, exception) -> {
-                if (exception != null) {
-                    Throwable t = exception.getCause();
-                    if (t instanceof NotFoundException) {
-                        asyncResponse.resume(new RestException(Status.NOT_FOUND, "Subscription not found"));
-                        return null;
-                    } else {
-                        log.error("[{}] Failed to skip all messages {} {}", clientAppId(), topicName, subName, t);
-                        asyncResponse.resume(new RestException(t));
-                        return null;
+                FutureUtil.waitForAll(futures).handle((result, exception) -> {
+                    if (exception != null) {
+                        Throwable t = exception.getCause();
+                        if (t instanceof NotFoundException) {
+                            asyncResponse.resume(new RestException(Status.NOT_FOUND, "Subscription not found"));
+                            return null;
+                        } else {
+                            log.error("[{}] Failed to skip all messages {} {}", clientAppId(), topicName, subName, t);
+                            asyncResponse.resume(new RestException(t));
+                            return null;
+                        }
                     }
-                }
 
-                asyncResponse.resume(Response.noContent().build());
-                return null;
-            });
-        } else {
-            validateAdminAccessForSubscriber(subName, authoritative);
-            PersistentTopic topic = (PersistentTopic) getTopicReference(topicName);
-            BiConsumer<Void, Throwable> biConsumer = (v, ex) -> {
-                if (ex != null) {
-                    asyncResponse.resume(new RestException(ex));
-                    log.error("[{}] Failed to skip all messages {} {}", clientAppId(), topicName, subName, ex);
-                } else {
                     asyncResponse.resume(Response.noContent().build());
-                    log.info("[{}] Cleared backlog on {} {}", clientAppId(), topicName, subName);
-                }
-            };
-            try {
-                if (subName.startsWith(topic.getReplicatorPrefix())) {
-                    String remoteCluster = PersistentReplicator.getRemoteCluster(subName);
-                    PersistentReplicator repl = (PersistentReplicator) topic.getPersistentReplicator(remoteCluster);
-                    checkNotNull(repl);
-                    repl.clearBacklog().whenComplete(biConsumer);
-                } else {
-                    PersistentSubscription sub = topic.getSubscription(subName);
-                    checkNotNull(sub);
-                    sub.clearBacklog().whenComplete(biConsumer);
-                }
-            } catch (Exception e) {
-                if (e instanceof NullPointerException) {
-                    asyncResponse.resume(new RestException(Status.NOT_FOUND, "Subscription not found"));
-                } else {
-                    asyncResponse.resume(new RestException(e));
-                }
+                    return null;
+                });
+            } else {
+                internalSkipAllMessagesForNonPartitionedTopic(asyncResponse, subName, authoritative);
+            }
+        }
+    }
+
+    private void internalSkipAllMessagesForNonPartitionedTopic(AsyncResponse asyncResponse, String subName, boolean authoritative) {
+        validateAdminAccessForSubscriber(subName, authoritative);
+        PersistentTopic topic = (PersistentTopic) getTopicReference(topicName);
+        BiConsumer<Void, Throwable> biConsumer = (v, ex) -> {
+            if (ex != null) {
+                asyncResponse.resume(new RestException(ex));
+                log.error("[{}] Failed to skip all messages {} {}", clientAppId(), topicName, subName, ex);
+            } else {
+                asyncResponse.resume(Response.noContent().build());
+                log.info("[{}] Cleared backlog on {} {}", clientAppId(), topicName, subName);
+            }
+        };
+        try {
+            if (subName.startsWith(topic.getReplicatorPrefix())) {
+                String remoteCluster = PersistentReplicator.getRemoteCluster(subName);
+                PersistentReplicator repl = (PersistentReplicator) topic.getPersistentReplicator(remoteCluster);
+                checkNotNull(repl);
+                repl.clearBacklog().whenComplete(biConsumer);
+            } else {
+                PersistentSubscription sub = topic.getSubscription(subName);
+                checkNotNull(sub);
+                sub.clearBacklog().whenComplete(biConsumer);
+            }
+        } catch (Exception e) {
+            if (e instanceof NullPointerException) {
+                asyncResponse.resume(new RestException(Status.NOT_FOUND, "Subscription not found"));
+            } else {
+                asyncResponse.resume(new RestException(e));
             }
         }
     }
@@ -1071,73 +1146,82 @@ protected void internalExpireMessagesForAllSubscriptions(AsyncResponse asyncResp
         if (topicName.isGlobal()) {
             validateGlobalNamespaceOwnership(namespaceName);
         }
-        PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
-        if (partitionMetadata.partitions > 0) {
-            final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+        // If the topic name is a partition name, no need to get partition topic metadata again
+        if (topicName.isPartitioned()) {
+            internalExpireMessagesForAllSubscriptionsForNonPartitionedTopic(asyncResponse, expireTimeInSeconds, authoritative);
+        } else {
+            PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
+            if (partitionMetadata.partitions > 0) {
+                final List<CompletableFuture<Void>> futures = Lists.newArrayList();
 
-            // expire messages for each partition topic
-            for (int i = 0; i < partitionMetadata.partitions; i++) {
-                TopicName topicNamePartition = topicName.getPartition(i);
-                try {
-                    futures.add(pulsar().getAdminClient().topics().expireMessagesForAllSubscriptionsAsync(
+                // expire messages for each partition topic
+                for (int i = 0; i < partitionMetadata.partitions; i++) {
+                    TopicName topicNamePartition = topicName.getPartition(i);
+                    try {
+                        futures.add(pulsar().getAdminClient().topics().expireMessagesForAllSubscriptionsAsync(
                             topicNamePartition.toString(), expireTimeInSeconds));
-                } catch (Exception e) {
-                    log.error("[{}] Failed to expire messages up to {} on {}", clientAppId(), expireTimeInSeconds,
+                    } catch (Exception e) {
+                        log.error("[{}] Failed to expire messages up to {} on {}", clientAppId(), expireTimeInSeconds,
                             topicNamePartition, e);
-                    asyncResponse.resume(new RestException(e));
-                    return;
+                        asyncResponse.resume(new RestException(e));
+                        return;
+                    }
                 }
-            }
 
-            FutureUtil.waitForAll(futures).handle((result, exception) -> {
-                if (exception != null) {
-                    Throwable t = exception.getCause();
-                    log.error("[{}] Failed to expire messages up to {} on {}", clientAppId(), expireTimeInSeconds,
+                FutureUtil.waitForAll(futures).handle((result, exception) -> {
+                    if (exception != null) {
+                        Throwable t = exception.getCause();
+                        log.error("[{}] Failed to expire messages up to {} on {}", clientAppId(), expireTimeInSeconds,
                             topicName, t);
-                    asyncResponse.resume(new RestException(t));
-                    return null;
-                }
+                        asyncResponse.resume(new RestException(t));
+                        return null;
+                    }
 
-                asyncResponse.resume(Response.noContent().build());
-                return null;
-            });
-        } else {
-            // validate ownership and redirect if current broker is not owner
-            validateAdminOperationOnTopic(authoritative);
+                    asyncResponse.resume(Response.noContent().build());
+                    return null;
+                });
+            } else {
+                internalExpireMessagesForAllSubscriptionsForNonPartitionedTopic(asyncResponse, expireTimeInSeconds, authoritative);
+            }
+        }
+    }
 
-            PersistentTopic topic = (PersistentTopic) getTopicReference(topicName);
-            final AtomicReference<Throwable> exception = new AtomicReference<>();
+    private void internalExpireMessagesForAllSubscriptionsForNonPartitionedTopic(AsyncResponse asyncResponse, int expireTimeInSeconds,
+            boolean authoritative) {
+        // validate ownership and redirect if current broker is not owner
+        validateAdminOperationOnTopic(authoritative);
 
-            topic.getReplicators().forEach((subName, replicator) -> {
-                try {
-                    internalExpireMessagesForSinglePartition(subName, expireTimeInSeconds, authoritative);
-                } catch (Throwable t) {
-                    exception.set(t);
-                }
-            });
+        PersistentTopic topic = (PersistentTopic) getTopicReference(topicName);
+        final AtomicReference<Throwable> exception = new AtomicReference<>();
 
-            topic.getSubscriptions().forEach((subName, subscriber) -> {
-                try {
-                    internalExpireMessagesForSinglePartition(subName, expireTimeInSeconds, authoritative);
-                } catch (Throwable t) {
-                    exception.set(t);
-                }
-            });
+        topic.getReplicators().forEach((subName, replicator) -> {
+            try {
+                internalExpireMessagesForSinglePartition(subName, expireTimeInSeconds, authoritative);
+            } catch (Throwable t) {
+                exception.set(t);
+            }
+        });
 
-            if (exception.get() != null) {
-                if (exception.get() instanceof WebApplicationException) {
-                    WebApplicationException wae = (WebApplicationException) exception.get();
-                    asyncResponse.resume(wae);
-                    return;
-                } else {
-                    asyncResponse.resume(new RestException(exception.get()));
-                    return;
-                }
+        topic.getSubscriptions().forEach((subName, subscriber) -> {
+            try {
+                internalExpireMessagesForSinglePartition(subName, expireTimeInSeconds, authoritative);
+            } catch (Throwable t) {
+                exception.set(t);
             }
+        });
 
-            asyncResponse.resume(Response.noContent().build());
-            return;
+        if (exception.get() != null) {
+            if (exception.get() instanceof WebApplicationException) {
+                WebApplicationException wae = (WebApplicationException) exception.get();
+                asyncResponse.resume(wae);
+                return;
+            } else {
+                asyncResponse.resume(new RestException(exception.get()));
+                return;
+            }
         }
+
+        asyncResponse.resume(Response.noContent().build());
     }
 
     protected void internalResetCursor(AsyncResponse asyncResponse, String subName, long timestamp,
@@ -1145,108 +1229,111 @@ protected void internalResetCursor(AsyncResponse asyncResponse, String subName,
         if (topicName.isGlobal()) {
             validateGlobalNamespaceOwnership(namespaceName);
         }
-
-        PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
-        final int numPartitions = partitionMetadata.partitions;
-        if (numPartitions > 0) {
-            final CompletableFuture<Void> future = new CompletableFuture<>();
-            final AtomicInteger count = new AtomicInteger(numPartitions);
-            final AtomicInteger failureCount = new AtomicInteger(0);
-            final AtomicReference<Throwable> partitionException = new AtomicReference<>();
-
-            for (int i = 0; i < numPartitions; i++) {
-                TopicName topicNamePartition = topicName.getPartition(i);
-                try {
-                    pulsar().getAdminClient().topics()
+        // If the topic name is a partition name, no need to get partition topic metadata again
+        if (topicName.isPartitioned()) {
+            internalResetCursorForNonPartitionedTopic(asyncResponse, subName, timestamp, authoritative);
+        } else {
+            PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
+            final int numPartitions = partitionMetadata.partitions;
+            if (numPartitions > 0) {
+                final CompletableFuture<Void> future = new CompletableFuture<>();
+                final AtomicInteger count = new AtomicInteger(numPartitions);
+                final AtomicInteger failureCount = new AtomicInteger(0);
+                final AtomicReference<Throwable> partitionException = new AtomicReference<>();
+
+                for (int i = 0; i < numPartitions; i++) {
+                    TopicName topicNamePartition = topicName.getPartition(i);
+                    try {
+                        pulsar().getAdminClient().topics()
                             .resetCursorAsync(topicNamePartition.toString(), subName, timestamp).handle((r, ex) -> {
-                                if (ex != null) {
-                                    if (ex instanceof PreconditionFailedException) {
-                                        // throw the last exception if all partitions get this error
-                                        // any other exception on partition is reported back to user
-                                        failureCount.incrementAndGet();
-                                        partitionException.set(ex);
-                                    } else {
-                                        log.warn("[{}] [{}] Failed to reset cursor on subscription {} to time {}",
-                                                clientAppId(), topicNamePartition, subName, timestamp, ex);
-                                        future.completeExceptionally(ex);
-                                        return null;
-                                    }
+                            if (ex != null) {
+                                if (ex instanceof PreconditionFailedException) {
+                                    // throw the last exception if all partitions get this error
+                                    // any other exception on partition is reported back to user
+                                    failureCount.incrementAndGet();
+                                    partitionException.set(ex);
+                                } else {
+                                    log.warn("[{}] [{}] Failed to reset cursor on subscription {} to time {}",
+                                        clientAppId(), topicNamePartition, subName, timestamp, ex);
+                                    future.completeExceptionally(ex);
+                                    return null;
                                 }
+                            }
 
-                                if (count.decrementAndGet() == 0) {
-                                    future.complete(null);
-                                }
+                            if (count.decrementAndGet() == 0) {
+                                future.complete(null);
+                            }
 
-                                return null;
-                            });
-                } catch (Exception e) {
-                    log.warn("[{}] [{}] Failed to reset cursor on subscription {} to time {}", clientAppId(),
+                            return null;
+                        });
+                    } catch (Exception e) {
+                        log.warn("[{}] [{}] Failed to reset cursor on subscription {} to time {}", clientAppId(),
                             topicNamePartition, subName, timestamp, e);
-                    future.completeExceptionally(e);
+                        future.completeExceptionally(e);
+                    }
                 }
-            }
 
-            future.whenComplete((r, ex) -> {
-                if (ex != null) {
-                    if (ex instanceof PulsarAdminException) {
-                        asyncResponse.resume(new RestException((PulsarAdminException) ex));
-                        return;
-                    } else {
-                        asyncResponse.resume(new RestException(ex));
-                        return;
+                future.whenComplete((r, ex) -> {
+                    if (ex != null) {
+                        if (ex instanceof PulsarAdminException) {
+                            asyncResponse.resume(new RestException((PulsarAdminException) ex));
+                            return;
+                        } else {
+                            asyncResponse.resume(new RestException(ex));
+                            return;
+                        }
                     }
-                }
 
-                // report an error to user if unable to reset for all partitions
-                if (failureCount.get() == numPartitions) {
-                    log.warn("[{}] [{}] Failed to reset cursor on subscription {} to time {}", clientAppId(), topicName,
+                    // report an error to user if unable to reset for all partitions
+                    if (failureCount.get() == numPartitions) {
+                        log.warn("[{}] [{}] Failed to reset cursor on subscription {} to time {}", clientAppId(), topicName,
                             subName, timestamp, partitionException.get());
-                    asyncResponse.resume(
+                        asyncResponse.resume(
                             new RestException(Status.PRECONDITION_FAILED, partitionException.get().getMessage()));
-                    return;
-                } else if (failureCount.get() > 0) {
-                    log.warn("[{}] [{}] Partial errors for reset cursor on subscription {} to time {}", clientAppId(),
+                        return;
+                    } else if (failureCount.get() > 0) {
+                        log.warn("[{}] [{}] Partial errors for reset cursor on subscription {} to time {}", clientAppId(),
                             topicName, subName, timestamp, partitionException.get());
-                }
+                    }
 
-                asyncResponse.resume(Response.noContent().build());
-                return;
-            });
-        } else {
-            validateAdminAccessForSubscriber(subName, authoritative);
-            log.info("[{}] [{}] Received reset cursor on subscription {} to time {}", clientAppId(), topicName, subName,
-                    timestamp);
-            PersistentTopic topic = (PersistentTopic) getTopicReference(topicName);
-            if (topic == null) {
-                asyncResponse.resume(new RestException(Status.NOT_FOUND, "Topic not found"));
-                return;
+                    asyncResponse.resume(Response.noContent().build());
+                });
+            } else {
+                internalResetCursorForNonPartitionedTopic(asyncResponse, subName, timestamp, authoritative);
             }
-            try {
-                PersistentSubscription sub = topic.getSubscription(subName);
-                checkNotNull(sub);
-                sub.resetCursor(timestamp).get();
-                log.info("[{}] [{}] Reset cursor on subscription {} to time {}", clientAppId(), topicName, subName,
-                        timestamp);
-                asyncResponse.resume(Response.noContent().build());
-                return;
-            } catch (Exception e) {
-                Throwable t = e.getCause();
-                log.warn("[{}] [{}] Failed to reset cursor on subscription {} to time {}", clientAppId(), topicName,
-                        subName, timestamp, e);
-                if (e instanceof NullPointerException) {
-                    asyncResponse.resume(new RestException(Status.NOT_FOUND, "Subscription not found"));
-                    return;
-                } else if (e instanceof NotAllowedException) {
-                    asyncResponse.resume(new RestException(Status.METHOD_NOT_ALLOWED, e.getMessage()));
-                    return;
-                } else if (t instanceof SubscriptionInvalidCursorPosition) {
-                    asyncResponse.resume(new RestException(Status.PRECONDITION_FAILED,
-                            "Unable to find position for timestamp specified -" + t.getMessage()));
-                    return;
-                } else {
-                    asyncResponse.resume(new RestException(e));
-                    return;
-                }
+        }
+    }
+
+    private void internalResetCursorForNonPartitionedTopic(AsyncResponse asyncResponse, String subName, long timestamp,
+                                       boolean authoritative) {
+        validateAdminAccessForSubscriber(subName, authoritative);
+        log.info("[{}] [{}] Received reset cursor on subscription {} to time {}", clientAppId(), topicName, subName,
+            timestamp);
+        PersistentTopic topic = (PersistentTopic) getTopicReference(topicName);
+        if (topic == null) {
+            asyncResponse.resume(new RestException(Status.NOT_FOUND, "Topic not found"));
+            return;
+        }
+        try {
+            PersistentSubscription sub = topic.getSubscription(subName);
+            checkNotNull(sub);
+            sub.resetCursor(timestamp).get();
+            log.info("[{}] [{}] Reset cursor on subscription {} to time {}", clientAppId(), topicName, subName,
+                timestamp);
+            asyncResponse.resume(Response.noContent().build());
+        } catch (Exception e) {
+            Throwable t = e.getCause();
+            log.warn("[{}] [{}] Failed to reset cursor on subscription {} to time {}", clientAppId(), topicName,
+                subName, timestamp, e);
+            if (e instanceof NullPointerException) {
+                asyncResponse.resume(new RestException(Status.NOT_FOUND, "Subscription not found"));
+            } else if (e instanceof NotAllowedException) {
+                asyncResponse.resume(new RestException(Status.METHOD_NOT_ALLOWED, e.getMessage()));
+            } else if (t instanceof SubscriptionInvalidCursorPosition) {
+                asyncResponse.resume(new RestException(Status.PRECONDITION_FAILED,
+                    "Unable to find position for timestamp specified -" + t.getMessage()));
+            } else {
+                asyncResponse.resume(new RestException(e));
             }
         }
     }
@@ -1259,27 +1346,30 @@ protected void internalCreateSubscription(AsyncResponse asyncResponse, String su
         final MessageIdImpl targetMessageId = messageId == null ? (MessageIdImpl) MessageId.earliest : messageId;
         log.info("[{}][{}] Creating subscription {} at message id {}", clientAppId(), topicName, subscriptionName,
                 targetMessageId);
-
-        PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
-        final int numPartitions = partitionMetadata.partitions;
-        if (numPartitions > 0) {
-            final CompletableFuture<Void> future = new CompletableFuture<>();
-            final AtomicInteger count = new AtomicInteger(numPartitions);
-            final AtomicInteger failureCount = new AtomicInteger(0);
-            final AtomicReference<Throwable> partitionException = new AtomicReference<>();
-
-            // Create the subscription on each partition
-            for (int i = 0; i < numPartitions; i++) {
-                TopicName topicNamePartition = topicName.getPartition(i);
-                try {
-                    pulsar().getAdminClient().topics()
+        // If the topic name is a partition name, no need to get partition topic metadata again
+        if (topicName.isPartitioned()) {
+            internalCreateSubscriptionForNonPartitionedTopic(asyncResponse, subscriptionName, targetMessageId, authoritative, replicated);
+        } else {
+            PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
+            final int numPartitions = partitionMetadata.partitions;
+            if (numPartitions > 0) {
+                final CompletableFuture<Void> future = new CompletableFuture<>();
+                final AtomicInteger count = new AtomicInteger(numPartitions);
+                final AtomicInteger failureCount = new AtomicInteger(0);
+                final AtomicReference<Throwable> partitionException = new AtomicReference<>();
+
+                // Create the subscription on each partition
+                for (int i = 0; i < numPartitions; i++) {
+                    TopicName topicNamePartition = topicName.getPartition(i);
+                    try {
+                        pulsar().getAdminClient().topics()
                             .createSubscriptionAsync(topicNamePartition.toString(), subscriptionName, targetMessageId)
                             .handle((r, ex) -> {
                                 if (ex != null) {
                                     // fail the operation on unknown exception or if all the partitioned failed due to
                                     // subscription-already-exist
                                     if (failureCount.incrementAndGet() == numPartitions
-                                            || !(ex instanceof PulsarAdminException.ConflictException)) {
+                                        || !(ex instanceof PulsarAdminException.ConflictException)) {
                                         partitionException.set(ex);
                                     }
                                 }
@@ -1290,75 +1380,79 @@ protected void internalCreateSubscription(AsyncResponse asyncResponse, String su
 
                                 return null;
                             });
-                } catch (Exception e) {
-                    log.warn("[{}] [{}] Failed to create subscription {} at message id {}", clientAppId(),
+                    } catch (Exception e) {
+                        log.warn("[{}] [{}] Failed to create subscription {} at message id {}", clientAppId(),
                             topicNamePartition, subscriptionName, targetMessageId, e);
-                    future.completeExceptionally(e);
+                        future.completeExceptionally(e);
+                    }
                 }
-            }
 
-            future.whenComplete((r, ex) -> {
-                if (ex != null) {
-                    if (ex instanceof PulsarAdminException) {
-                        asyncResponse.resume(new RestException((PulsarAdminException) ex));
-                        return;
-                    } else {
-                        asyncResponse.resume(new RestException(ex));
-                        return;
+                future.whenComplete((r, ex) -> {
+                    if (ex != null) {
+                        if (ex instanceof PulsarAdminException) {
+                            asyncResponse.resume(new RestException((PulsarAdminException) ex));
+                            return;
+                        } else {
+                            asyncResponse.resume(new RestException(ex));
+                            return;
+                        }
                     }
-                }
 
-                if (partitionException.get() != null) {
-                    log.warn("[{}] [{}] Failed to create subscription {} at message id {}", clientAppId(), topicName,
+                    if (partitionException.get() != null) {
+                        log.warn("[{}] [{}] Failed to create subscription {} at message id {}", clientAppId(), topicName,
                             subscriptionName, targetMessageId, partitionException.get());
-                    if (partitionException.get() instanceof PulsarAdminException) {
-                        asyncResponse.resume(new RestException((PulsarAdminException) partitionException.get()));
-                        return;
-                    } else {
-                        asyncResponse.resume(new RestException(partitionException.get()));
-                        return;
+                        if (partitionException.get() instanceof PulsarAdminException) {
+                            asyncResponse.resume(new RestException((PulsarAdminException) partitionException.get()));
+                            return;
+                        } else {
+                            asyncResponse.resume(new RestException(partitionException.get()));
+                            return;
+                        }
                     }
-                }
-
-                asyncResponse.resume(Response.noContent().build());
-                return;
-            });
-        } else {
-            validateAdminAccessForSubscriber(subscriptionName, authoritative);
 
-            PersistentTopic topic = (PersistentTopic) getOrCreateTopic(topicName);
-
-            if (topic.getSubscriptions().containsKey(subscriptionName)) {
-                asyncResponse.resume(new RestException(Status.CONFLICT, "Subscription already exists for topic"));
-                return;
+                    asyncResponse.resume(Response.noContent().build());
+                });
+            } else {
+                internalCreateSubscriptionForNonPartitionedTopic(asyncResponse, subscriptionName, targetMessageId, authoritative, replicated);
             }
+        }
+    }
 
-            try {
-                PersistentSubscription subscription = (PersistentSubscription) topic
-                        .createSubscription(subscriptionName, InitialPosition.Latest, replicated).get();
-                // Mark the cursor as "inactive" as it was created without a real consumer connected
-                subscription.deactivateCursor();
-                subscription.resetCursor(PositionImpl.get(targetMessageId.getLedgerId(), targetMessageId.getEntryId()))
-                        .get();
-            } catch (Throwable e) {
-                Throwable t = e.getCause();
-                log.warn("[{}] [{}] Failed to create subscription {} at message id {}", clientAppId(), topicName,
-                        subscriptionName, targetMessageId, e);
-                if (t instanceof SubscriptionInvalidCursorPosition) {
-                    asyncResponse.resume(new RestException(Status.PRECONDITION_FAILED,
-                            "Unable to find position for position specified: " + t.getMessage()));
-                    return;
-                } else {
-                    asyncResponse.resume(new RestException(e));
-                    return;
-                }
-            }
+    private void internalCreateSubscriptionForNonPartitionedTopic(AsyncResponse asyncResponse, String subscriptionName,
+              MessageIdImpl targetMessageId, boolean authoritative, boolean replicated) {
+        validateAdminAccessForSubscriber(subscriptionName, authoritative);
 
-            log.info("[{}][{}] Successfully created subscription {} at message id {}", clientAppId(), topicName,
-                    subscriptionName, targetMessageId);
-            asyncResponse.resume(Response.noContent().build());
+        PersistentTopic topic = (PersistentTopic) getOrCreateTopic(topicName);
+
+        if (topic.getSubscriptions().containsKey(subscriptionName)) {
+            asyncResponse.resume(new RestException(Status.CONFLICT, "Subscription already exists for topic"));
             return;
         }
+
+        try {
+            PersistentSubscription subscription = (PersistentSubscription) topic
+                .createSubscription(subscriptionName, InitialPosition.Latest, replicated).get();
+            // Mark the cursor as "inactive" as it was created without a real consumer connected
+            subscription.deactivateCursor();
+            subscription.resetCursor(PositionImpl.get(targetMessageId.getLedgerId(), targetMessageId.getEntryId()))
+                .get();
+        } catch (Throwable e) {
+            Throwable t = e.getCause();
+            log.warn("[{}] [{}] Failed to create subscription {} at message id {}", clientAppId(), topicName,
+                subscriptionName, targetMessageId, e);
+            if (t instanceof SubscriptionInvalidCursorPosition) {
+                asyncResponse.resume(new RestException(Status.PRECONDITION_FAILED,
+                    "Unable to find position for position specified: " + t.getMessage()));
+                return;
+            } else {
+                asyncResponse.resume(new RestException(e));
+                return;
+            }
+        }
+
+        log.info("[{}][{}] Successfully created subscription {} at message id {}", clientAppId(), topicName,
+            subscriptionName, targetMessageId);
+        asyncResponse.resume(Response.noContent().build());
     }
 
     protected void internalResetCursorOnPosition(String subName, boolean authoritative, MessageIdImpl messageId) {
@@ -1367,10 +1461,8 @@ protected void internalResetCursorOnPosition(String subName, boolean authoritati
         }
         log.info("[{}][{}] received reset cursor on subscription {} to position {}", clientAppId(), topicName,
                 subName, messageId);
-
-        PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
-
-        if (partitionMetadata.partitions > 0) {
+        // If the topic name is a partition name, no need to get partition topic metadata again
+        if (!topicName.isPartitioned() && getPartitionedTopicMetadata(topicName, authoritative, false).partitions > 0) {
             log.warn("[{}] Not supported operation on partitioned-topic {} {}", clientAppId(), topicName,
                     subName);
             throw new RestException(Status.METHOD_NOT_ALLOWED,
@@ -1407,8 +1499,8 @@ protected Response internalPeekNthMessage(String subName, int messagePosition, b
         if (topicName.isGlobal()) {
             validateGlobalNamespaceOwnership(namespaceName);
         }
-        PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
-        if (partitionMetadata.partitions > 0) {
+        // If the topic name is a partition name, no need to get partition topic metadata again
+        if (!topicName.isPartitioned() && getPartitionedTopicMetadata(topicName, authoritative, false).partitions > 0) {
             throw new RestException(Status.METHOD_NOT_ALLOWED, "Peek messages on a partitioned topic is not allowed");
         }
         validateAdminAccessForSubscriber(subName, authoritative);
@@ -1551,43 +1643,8 @@ protected void internalExpireMessages(AsyncResponse asyncResponse, String subNam
         if (topicName.isGlobal()) {
             validateGlobalNamespaceOwnership(namespaceName);
         }
-
-        PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
-        if (partitionMetadata.partitions > 0) {
-            final List<CompletableFuture<Void>> futures = Lists.newArrayList();
-
-            // expire messages for each partition topic
-            for (int i = 0; i < partitionMetadata.partitions; i++) {
-                TopicName topicNamePartition = topicName.getPartition(i);
-                try {
-                    futures.add(pulsar().getAdminClient().topics().expireMessagesAsync(topicNamePartition.toString(),
-                            subName, expireTimeInSeconds));
-                } catch (Exception e) {
-                    log.error("[{}] Failed to expire messages up to {} on {}", clientAppId(), expireTimeInSeconds,
-                            topicNamePartition, e);
-                    asyncResponse.resume(new RestException(e));
-                    return;
-                }
-            }
-
-            FutureUtil.waitForAll(futures).handle((result, exception) -> {
-                if (exception != null) {
-                    Throwable t = exception.getCause();
-                    if (t instanceof NotFoundException) {
-                        asyncResponse.resume(new RestException(Status.NOT_FOUND, "Subscription not found"));
-                        return null;
-                    } else {
-                        log.error("[{}] Failed to expire messages up to {} on {}", clientAppId(), expireTimeInSeconds,
-                                topicName, t);
-                        asyncResponse.resume(new RestException(t));
-                        return null;
-                    }
-                }
-
-                asyncResponse.resume(Response.noContent().build());
-                return null;
-            });
-        } else {
+        // If the topic name is a partition name, no need to get partition topic metadata again
+        if (topicName.isPartitioned()) {
             try {
                 internalExpireMessagesForSinglePartition(subName, expireTimeInSeconds, authoritative);
             } catch (WebApplicationException wae) {
@@ -1598,7 +1655,54 @@ protected void internalExpireMessages(AsyncResponse asyncResponse, String subNam
                 return;
             }
             asyncResponse.resume(Response.noContent().build());
-            return;
+        } else {
+            PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
+            if (partitionMetadata.partitions > 0) {
+                final List<CompletableFuture<Void>> futures = Lists.newArrayList();
+
+                // expire messages for each partition topic
+                for (int i = 0; i < partitionMetadata.partitions; i++) {
+                    TopicName topicNamePartition = topicName.getPartition(i);
+                    try {
+                        futures.add(pulsar().getAdminClient().topics().expireMessagesAsync(topicNamePartition.toString(),
+                            subName, expireTimeInSeconds));
+                    } catch (Exception e) {
+                        log.error("[{}] Failed to expire messages up to {} on {}", clientAppId(), expireTimeInSeconds,
+                            topicNamePartition, e);
+                        asyncResponse.resume(new RestException(e));
+                        return;
+                    }
+                }
+
+                FutureUtil.waitForAll(futures).handle((result, exception) -> {
+                    if (exception != null) {
+                        Throwable t = exception.getCause();
+                        if (t instanceof NotFoundException) {
+                            asyncResponse.resume(new RestException(Status.NOT_FOUND, "Subscription not found"));
+                            return null;
+                        } else {
+                            log.error("[{}] Failed to expire messages up to {} on {}", clientAppId(), expireTimeInSeconds,
+                                topicName, t);
+                            asyncResponse.resume(new RestException(t));
+                            return null;
+                        }
+                    }
+
+                    asyncResponse.resume(Response.noContent().build());
+                    return null;
+                });
+            } else {
+                try {
+                    internalExpireMessagesForSinglePartition(subName, expireTimeInSeconds, authoritative);
+                } catch (WebApplicationException wae) {
+                    asyncResponse.resume(wae);
+                    return;
+                } catch (Exception e) {
+                    asyncResponse.resume(new RestException(e));
+                    return;
+                }
+                asyncResponse.resume(Response.noContent().build());
+            }
         }
     }
 
@@ -1607,9 +1711,8 @@ private void internalExpireMessagesForSinglePartition(String subName, int expire
         if (topicName.isGlobal()) {
             validateGlobalNamespaceOwnership(namespaceName);
         }
-
-        PartitionedTopicMetadata partitionMetadata = getPartitionedTopicMetadata(topicName, authoritative, false);
-        if (partitionMetadata.partitions > 0) {
+        // If the topic name is a partition name, no need to get partition topic metadata again
+        if (!topicName.isPartitioned() && getPartitionedTopicMetadata(topicName, authoritative, false).partitions > 0) {
             String msg = "This method should not be called for partitioned topic";
             log.error("[{}] {} {} {}", clientAppId(), msg, topicName, subName);
             throw new IllegalStateException(msg);
@@ -1893,22 +1996,6 @@ private CompletableFuture<Void> createSubscriptions(TopicName topicName, int num
         return result;
     }
 
-    protected void unloadTopic(TopicName topicName, boolean authoritative) {
-        validateSuperUserAccess();
-        validateTopicOwnership(topicName, authoritative);
-        try {
-            Topic topic = getTopicReference(topicName);
-            topic.close(false).get();
-            log.info("[{}] Successfully unloaded topic {}", clientAppId(), topicName);
-        } catch (NullPointerException e) {
-            log.error("[{}] topic {} not found", clientAppId(), topicName);
-            throw new RestException(Status.NOT_FOUND, "Topic does not exist");
-        } catch (Exception e) {
-            log.error("[{}] Failed to unload topic {}, {}", clientAppId(), topicName, e.getMessage(), e);
-            throw new RestException(e);
-        }
-    }
-
     // as described at : (PR: #836) CPP-client old client lib should not be allowed to connect on partitioned-topic.
     // So, all requests from old-cpp-client (< v1.21) must be rejected.
     // Pulsar client-java lib always passes user-agent as X-Java-$version.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SinksBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SinksBase.java
index 260f58acdad15..416f390396dee 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SinksBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SinksBase.java
@@ -276,6 +276,7 @@ public SinkConfig getSinkInfo(@ApiParam(value = "The tenant of a Pulsar Sink")
             response = SinkStatus.SinkInstanceStatus.SinkInstanceStatusData.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this sink"),
             @ApiResponse(code = 400, message = "The Pulsar Sink instance does not exist"),
             @ApiResponse(code = 404, message = "The Pulsar Sink does not exist"),
             @ApiResponse(code = 500, message = "Internal Server Error (got exception while getting status, etc.)"),
@@ -302,6 +303,7 @@ public SinkStatus.SinkInstanceStatus.SinkInstanceStatusData getSinkInstanceStatu
             response = SinkStatus.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this sink"),
             @ApiResponse(code = 400, message = "Invalid get status request"),
             @ApiResponse(code = 401, message = "The client is not authorized to perform this operation"),
             @ApiResponse(code = 404, message = "The Pulsar Sink does not exist"),
@@ -341,6 +343,7 @@ public List<String> listSinks(@ApiParam(value = "The tenant of a Pulsar Sink")
     @POST
     @ApiOperation(value = "Restart an instance of a Pulsar Sink", response = Void.class)
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this sink"),
             @ApiResponse(code = 400, message = "Invalid restart request"),
             @ApiResponse(code = 401, message = "The client is not authorized to perform this operation"),
             @ApiResponse(code = 404, message = "The Pulsar Sink does not exist"),
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SourcesBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SourcesBase.java
index fe180ac5e9782..d2ddc9e3786a8 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SourcesBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/SourcesBase.java
@@ -257,6 +257,7 @@ public SourceConfig getSourceInfo(
             response = SourceStatus.SourceInstanceStatus.SourceInstanceStatusData.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this source"),
             @ApiResponse(code = 500, message = "Internal Server Error"),
             @ApiResponse(code = 503, message = "Function worker service is now initializing. Please try again later.")
     })
@@ -281,6 +282,7 @@ public SourceStatus.SourceInstanceStatus.SourceInstanceStatusData getSourceInsta
             response = SourceStatus.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this source"),
             @ApiResponse(code = 500, message = "Internal Server Error"),
             @ApiResponse(code = 503, message = "Function worker service is now initializing. Please try again later.")
     })
@@ -321,6 +323,7 @@ public List<String> listSources(
     @POST
     @ApiOperation(value = "Restart an instance of a Pulsar Source", response = Void.class)
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this source"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 401, message = "Client is not authorize to perform operation"),
             @ApiResponse(code = 404, message = "Not Found(The Pulsar Source doesn't exist)"),
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TenantsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TenantsBase.java
index 223b06aab8fa8..b7b64ddd91a08 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TenantsBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/TenantsBase.java
@@ -18,7 +18,6 @@
  */
 package org.apache.pulsar.broker.admin.impl;
 
-import io.swagger.annotations.ApiParam;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -31,8 +30,10 @@
 import javax.ws.rs.PathParam;
 import javax.ws.rs.core.Response.Status;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.pulsar.broker.admin.AdminResource;
 import org.apache.pulsar.broker.web.RestException;
+import org.apache.pulsar.common.naming.Constants;
 import org.apache.pulsar.common.naming.NamedEntity;
 import org.apache.pulsar.common.policies.data.TenantInfo;
 import org.apache.zookeeper.KeeperException;
@@ -41,7 +42,9 @@
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import static org.apache.pulsar.broker.cache.ConfigurationCacheService.POLICIES;
@@ -90,6 +93,7 @@ public TenantInfo getTenantAdmin(
     @ApiResponses(value = { @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 409, message = "Tenant already exists"),
             @ApiResponse(code = 412, message = "Tenant name is not valid"),
+            @ApiResponse(code = 412, message = "Clusters can not be empty"),
             @ApiResponse(code = 412, message = "Clusters do not exist") })
     public void createTenant(
         @ApiParam(value = "The tenant name")
@@ -101,9 +105,6 @@ public void createTenant(
 
         try {
             NamedEntity.checkName(tenant);
-            if (config == null) {
-                config = new TenantInfo();
-            }
             zkCreate(path(POLICIES, tenant), jsonMapper().writeValueAsBytes(config));
             log.info("[{}] Created tenant {}", clientAppId(), tenant);
         } catch (KeeperException.NodeExistsException e) {
@@ -124,6 +125,7 @@ public void createTenant(
     @ApiResponses(value = { @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 404, message = "Tenant does not exist"),
             @ApiResponse(code = 409, message = "Tenant already exists"),
+            @ApiResponse(code = 412, message = "Clusters can not be empty"),
             @ApiResponse(code = 412, message = "Clusters do not exist") })
     public void updateTenant(
         @ApiParam(value = "The tenant name")
@@ -143,6 +145,9 @@ public void updateTenant(
                 oldTenantAdmin.getAllowedClusters().removeAll(newTenantAdmin.getAllowedClusters());
                 log.debug("Following clusters are being removed : [{}]", oldTenantAdmin.getAllowedClusters());
                 for (String cluster : oldTenantAdmin.getAllowedClusters()) {
+                    if (Constants.GLOBAL_CLUSTER.equals(cluster)) {
+                        continue;
+                    }
                     List<String> activeNamespaces = Lists.newArrayList();
                     try {
                         activeNamespaces = globalZk().getChildren(path(POLICIES, tenant, cluster), false);
@@ -221,15 +226,19 @@ public void deleteTenant(
     }
 
     private void validateClusters(TenantInfo info) {
+        // empty cluster shouldn't be allowed
+        if (info == null || info.getAllowedClusters().stream().filter(c -> !StringUtils.isBlank(c)).collect(Collectors.toSet()).isEmpty()
+            || info.getAllowedClusters().stream().anyMatch(ac -> StringUtils.isBlank(ac))) {
+            log.warn("[{}] Failed to validate due to clusters are empty", clientAppId());
+            throw new RestException(Status.PRECONDITION_FAILED, "Clusters can not be empty");
+        }
+
         List<String> nonexistentClusters;
         try {
-            if (info == null) {
-                info = new TenantInfo();
-            }
             Set<String> availableClusters = clustersListCache().get();
             Set<String> allowedClusters = info.getAllowedClusters();
             nonexistentClusters = allowedClusters.stream()
-                .filter(cluster -> !availableClusters.contains(cluster))
+                .filter(cluster -> !(availableClusters.contains(cluster) || Constants.GLOBAL_CLUSTER.equals(cluster)))
                 .collect(Collectors.toList());
         } catch (Exception e) {
             log.error("[{}] Failed to get available clusters", clientAppId(), e);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Functions.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Functions.java
index 0591279ceef0b..39cd9d64abb68 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Functions.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Functions.java
@@ -25,8 +25,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 
-import org.apache.pulsar.broker.admin.impl.FunctionsBase;
-
 @Path("/functions")
 @Api(value = "/functions", description = "Functions admin apis", tags = "functions", hidden = true)
 @Produces(MediaType.APPLICATION_JSON)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Namespaces.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Namespaces.java
index 99bbcd305c8de..8cd0ba7afd14b 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Namespaces.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/Namespaces.java
@@ -26,6 +26,7 @@
 import org.apache.pulsar.broker.admin.impl.NamespacesBase;
 import org.apache.pulsar.broker.web.RestException;
 import org.apache.pulsar.common.api.proto.PulsarApi.CommandGetTopicsOfNamespace.Mode;
+import org.apache.pulsar.common.naming.NamespaceBundleSplitAlgorithm;
 import org.apache.pulsar.common.policies.data.AuthAction;
 import org.apache.pulsar.common.policies.data.BacklogQuota;
 import org.apache.pulsar.common.policies.data.BookieAffinityGroupData;
@@ -183,7 +184,9 @@ public void createNamespace(@PathParam("property") String property, @PathParam("
     @DELETE
     @Path("/{property}/{cluster}/{namespace}")
     @ApiOperation(hidden = true, value = "Delete a namespace and all the topics under it.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Property or cluster or namespace doesn't exist"),
             @ApiResponse(code = 409, message = "Namespace is not empty") })
     public void deleteNamespace(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property,
@@ -202,7 +205,9 @@ public void deleteNamespace(@Suspended final AsyncResponse asyncResponse, @PathP
     @DELETE
     @Path("/{property}/{cluster}/{namespace}/{bundle}")
     @ApiOperation(hidden = true, value = "Delete a namespace bundle and all the topics under it.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Property or cluster or namespace doesn't exist"),
             @ApiResponse(code = 409, message = "Namespace bundle is not empty") })
     public void deleteNamespaceBundle(@PathParam("property") String property,
@@ -411,7 +416,9 @@ public BundlesData getBundlesData(@PathParam("property") String property, @PathP
             + "their persistent store). During that operation, the namespace is marked as tentatively unavailable until the"
             + "broker completes the unloading action. This operation requires strictly super user privileges, since it would"
             + "result in non-persistent message loss and unexpected connection closure to the clients.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Property or cluster or namespace doesn't exist"),
             @ApiResponse(code = 412, message = "Namespace is already unloaded or Namespace has bundles activated") })
     public void unloadNamespace(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property,
@@ -429,7 +436,9 @@ public void unloadNamespace(@Suspended final AsyncResponse asyncResponse, @PathP
     @PUT
     @Path("/{property}/{cluster}/{namespace}/{bundle}/unload")
     @ApiOperation(hidden = true, value = "Unload a namespace bundle")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission") })
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission") })
     public void unloadNamespaceBundle(@PathParam("property") String property, @PathParam("cluster") String cluster,
             @PathParam("namespace") String namespace, @PathParam("bundle") String bundleRange,
             @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
@@ -440,13 +449,15 @@ public void unloadNamespaceBundle(@PathParam("property") String property, @PathP
     @PUT
     @Path("/{property}/{cluster}/{namespace}/{bundle}/split")
     @ApiOperation(hidden = true, value = "Split a namespace bundle")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission") })
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission") })
     public void splitNamespaceBundle(@PathParam("property") String property, @PathParam("cluster") String cluster,
             @PathParam("namespace") String namespace, @PathParam("bundle") String bundleRange,
             @QueryParam("authoritative") @DefaultValue("false") boolean authoritative,
             @QueryParam("unload") @DefaultValue("false") boolean unload) {
         validateNamespaceName(property, cluster, namespace);
-        internalSplitNamespaceBundle(bundleRange, authoritative, unload);
+        internalSplitNamespaceBundle(bundleRange, authoritative, unload, NamespaceBundleSplitAlgorithm.rangeEquallyDivideName);
     }
 
     @POST
@@ -596,7 +607,9 @@ public void setPersistence(@PathParam("property") String property, @PathParam("c
     @POST
     @Path("/{property}/{cluster}/{namespace}/persistence/bookieAffinity")
     @ApiOperation(hidden = true, value = "Set the bookie-affinity-group to namespace-local policy.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace does not exist"),
             @ApiResponse(code = 409, message = "Concurrent modification") })
     public void setBookieAffinityGroup(@PathParam("property") String property, @PathParam("cluster") String cluster,
@@ -608,7 +621,9 @@ public void setBookieAffinityGroup(@PathParam("property") String property, @Path
     @GET
     @Path("/{property}/{cluster}/{namespace}/persistence/bookieAffinity")
     @ApiOperation(hidden = true, value = "Get the bookie-affinity-group from namespace-local policy.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace does not exist"),
             @ApiResponse(code = 409, message = "Concurrent modification") })
     public BookieAffinityGroupData getBookieAffinityGroup(@PathParam("property") String property,
@@ -620,7 +635,9 @@ public BookieAffinityGroupData getBookieAffinityGroup(@PathParam("property") Str
     @DELETE
     @Path("/{property}/{cluster}/{namespace}/persistence/bookieAffinity")
     @ApiOperation(hidden = true, value = "Delete the bookie-affinity-group from namespace-local policy.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace does not exist"),
             @ApiResponse(code = 409, message = "Concurrent modification") })
     public void deleteBookieAffinityGroup(@PathParam("property") String property, @PathParam("cluster") String cluster,
@@ -663,7 +680,9 @@ public void clearNamespaceBacklog(@Suspended final AsyncResponse asyncResponse,
     @POST
     @Path("/{property}/{cluster}/{namespace}/{bundle}/clearBacklog")
     @ApiOperation(hidden = true, value = "Clear backlog for all topics on a namespace bundle.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace does not exist") })
     public void clearNamespaceBundleBacklog(@PathParam("property") String property,
             @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
@@ -695,7 +714,9 @@ public void clearNamespaceBacklogForSubscription(@Suspended final AsyncResponse
     @POST
     @Path("/{property}/{cluster}/{namespace}/{bundle}/clearBacklog/{subscription}")
     @ApiOperation(hidden = true, value = "Clear backlog for a given subscription on all topics on a namespace bundle.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace does not exist") })
     public void clearNamespaceBundleBacklogForSubscription(@PathParam("property") String property,
             @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java
index 0179847590bb7..4bc0ddfd154d9 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/NonPersistentTopics.java
@@ -73,7 +73,9 @@ public class NonPersistentTopics extends PersistentTopics {
     @GET
     @Path("/{property}/{cluster}/{namespace}/{topic}/partitions")
     @ApiOperation(hidden = true, value = "Get partitioned topic metadata.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission") })
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission") })
     public PartitionedTopicMetadata getPartitionedMetadata(@PathParam("property") String property,
             @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
             @PathParam("topic") @Encoded String encodedTopic,
@@ -86,7 +88,9 @@ public PartitionedTopicMetadata getPartitionedMetadata(@PathParam("property") St
     @GET
     @Path("{property}/{cluster}/{namespace}/{topic}/stats")
     @ApiOperation(hidden = true, value = "Get the stats for the topic.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist") })
     public NonPersistentTopicStats getStats(@PathParam("property") String property,
             @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
@@ -95,13 +99,15 @@ public NonPersistentTopicStats getStats(@PathParam("property") String property,
         validateTopicName(property, cluster, namespace, encodedTopic);
         validateAdminOperationOnTopic(authoritative);
         Topic topic = getTopicReference(topicName);
-        return ((NonPersistentTopic) topic).getStats();
+        return ((NonPersistentTopic) topic).getStats(false);
     }
 
     @GET
     @Path("{property}/{cluster}/{namespace}/{topic}/internalStats")
     @ApiOperation(hidden = true, value = "Get the internal stats for the topic.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist") })
     public PersistentTopicInternalStats getInternalStats(@PathParam("property") String property,
             @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
@@ -159,24 +165,30 @@ public void createPartitionedTopic(@PathParam("property") String property, @Path
     @PUT
     @Path("/{property}/{cluster}/{namespace}/{topic}/unload")
     @ApiOperation(hidden = true, value = "Unload a topic")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist") })
-    public void unloadTopic(@PathParam("property") String property, @PathParam("cluster") String cluster,
-            @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic,
+    public void unloadTopic(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property,
+            @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
+            @PathParam("topic") @Encoded String encodedTopic,
             @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
-        validateTopicName(property, cluster, namespace, encodedTopic);
-        log.info("[{}] Unloading topic {}", clientAppId(), topicName);
-
-        if (topicName.isGlobal()) {
-            validateGlobalNamespaceOwnership(namespaceName);
+        try {
+            validateTopicName(property, cluster, namespace, encodedTopic);
+            internalUnloadTopic(asyncResponse, authoritative);
+        } catch (WebApplicationException wae) {
+            asyncResponse.resume(wae);
+        } catch (Exception e) {
+            asyncResponse.resume(new RestException(e));
         }
-        unloadTopic(topicName, authoritative);
     }
 
     @GET
     @Path("/{property}/{cluster}/{namespace}")
     @ApiOperation(value = "Get the list of non-persistent topics under a namespace.", response = String.class, responseContainer = "List")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace doesn't exist") })
     public void getList(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property,
             @PathParam("cluster") String cluster, @PathParam("namespace") String namespace) {
@@ -241,7 +253,9 @@ public void getList(@Suspended final AsyncResponse asyncResponse, @PathParam("pr
     @GET
     @Path("/{property}/{cluster}/{namespace}/{bundle}")
     @ApiOperation(value = "Get the list of non-persistent topics under a namespace bundle.", response = String.class, responseContainer = "List")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace doesn't exist") })
     public List<String> getListFromBundle(@PathParam("property") String property, @PathParam("cluster") String cluster,
                                           @PathParam("namespace") String namespace, @PathParam("bundle") String bundleRange) {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/PersistentTopics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/PersistentTopics.java
index f4fbbe0a4ad8f..836ca14282781 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/PersistentTopics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/PersistentTopics.java
@@ -111,7 +111,9 @@ public Map<String, Set<AuthAction>> getPermissionsOnTopic(@PathParam("property")
     @POST
     @Path("/{property}/{cluster}/{namespace}/{topic}/permissions/{role}")
     @ApiOperation(hidden = true, value = "Grant a new permission to a role on a single topic.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace doesn't exist"),
             @ApiResponse(code = 409, message = "Concurrent modification") })
     public void grantPermissionsOnTopic(@PathParam("property") String property,
@@ -126,7 +128,9 @@ public void grantPermissionsOnTopic(@PathParam("property") String property,
     @Path("/{property}/{cluster}/{namespace}/{topic}/permissions/{role}")
     @ApiOperation(hidden = true, value = "Revoke permissions on a topic.", notes = "Revoke permissions to a role on a single topic. If the permission was not set at the topic"
             + "level, but rather at the namespace level, this operation will return an error (HTTP status code 412).")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace doesn't exist"),
             @ApiResponse(code = 412, message = "Permissions are not set at the topic level") })
     public void revokePermissionsOnTopic(@PathParam("property") String property,
@@ -139,7 +143,9 @@ public void revokePermissionsOnTopic(@PathParam("property") String property,
     @PUT
     @Path("/{property}/{cluster}/{namespace}/{topic}/partitions")
     @ApiOperation(hidden = true, value = "Create a partitioned topic.", notes = "It needs to be called before creating a producer on a partitioned topic.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 409, message = "Partitioned topic already exist") })
     public void createPartitionedTopic(@PathParam("property") String property, @PathParam("cluster") String cluster,
             @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic,
@@ -165,7 +171,9 @@ public void createPartitionedTopic(@PathParam("property") String property, @Path
     @POST
     @Path("/{property}/{cluster}/{namespace}/{topic}/partitions")
     @ApiOperation(hidden = true, value = "Increment partitons of an existing partitioned topic.", notes = "It only increments partitions of existing non-global partitioned-topic")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 409, message = "Partitioned topic does not exist") })
     public void updatePartitionedTopic(@PathParam("property") String property, @PathParam("cluster") String cluster,
             @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic,
@@ -178,7 +186,9 @@ public void updatePartitionedTopic(@PathParam("property") String property, @Path
     @GET
     @Path("/{property}/{cluster}/{namespace}/{topic}/partitions")
     @ApiOperation(hidden = true, value = "Get partitioned topic metadata.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission") })
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission") })
     public PartitionedTopicMetadata getPartitionedMetadata(@PathParam("property") String property,
             @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
             @PathParam("topic") @Encoded String encodedTopic,
@@ -191,7 +201,9 @@ public PartitionedTopicMetadata getPartitionedMetadata(@PathParam("property") St
     @DELETE
     @Path("/{property}/{cluster}/{namespace}/{topic}/partitions")
     @ApiOperation(hidden = true, value = "Delete a partitioned topic.", notes = "It will also delete all the partitions of the topic if it exists.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Partitioned topic does not exist") })
     public void deletePartitionedTopic(@Suspended final AsyncResponse asyncResponse,
             @PathParam("property") String property, @PathParam("cluster") String cluster,
@@ -213,18 +225,21 @@ public void deletePartitionedTopic(@Suspended final AsyncResponse asyncResponse,
     @ApiOperation(hidden = true, value = "Unload a topic")
     @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist") })
-    public void unloadTopic(@PathParam("property") String property, @PathParam("cluster") String cluster,
-            @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic,
+    public void unloadTopic(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property,
+            @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
+            @PathParam("topic") @Encoded String encodedTopic,
             @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
         validateTopicName(property, cluster, namespace, encodedTopic);
-        internalUnloadTopic(authoritative);
+        internalUnloadTopic(asyncResponse, authoritative);
     }
 
     @DELETE
     @Path("/{property}/{cluster}/{namespace}/{topic}")
     @ApiOperation(hidden = true, value = "Delete a topic.", notes = "The topic cannot be deleted if delete is not forcefully and there's any active "
             + "subscription or producer connected to the it. Force delete ignores connected clients and deletes topic by explicitly closing them.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist"),
             @ApiResponse(code = 412, message = "Topic has active producers/subscriptions") })
     public void deleteTopic(@PathParam("property") String property, @PathParam("cluster") String cluster,
@@ -238,7 +253,9 @@ public void deleteTopic(@PathParam("property") String property, @PathParam("clus
     @GET
     @Path("/{property}/{cluster}/{namespace}/{topic}/subscriptions")
     @ApiOperation(hidden = true, value = "Get the list of persistent subscriptions for a given topic.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist") })
     public void getSubscriptions(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property,
             @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
@@ -257,19 +274,23 @@ public void getSubscriptions(@Suspended final AsyncResponse asyncResponse, @Path
     @GET
     @Path("{property}/{cluster}/{namespace}/{topic}/stats")
     @ApiOperation(hidden = true, value = "Get the stats for the topic.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist") })
     public TopicStats getStats(@PathParam("property") String property, @PathParam("cluster") String cluster,
             @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic,
             @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
         validateTopicName(property, cluster, namespace, encodedTopic);
-        return internalGetStats(authoritative);
+        return internalGetStats(authoritative, false);
     }
 
     @GET
     @Path("{property}/{cluster}/{namespace}/{topic}/internalStats")
     @ApiOperation(hidden = true, value = "Get the internal stats for the topic.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist") })
     public PersistentTopicInternalStats getInternalStats(@PathParam("property") String property,
             @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
@@ -294,7 +315,9 @@ public void getManagedLedgerInfo(@PathParam("property") String property, @PathPa
     @GET
     @Path("{property}/{cluster}/{namespace}/{topic}/partitioned-stats")
     @ApiOperation(hidden = true, value = "Get the stats for the partitioned topic.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist") })
     public void getPartitionedStats(@Suspended final AsyncResponse asyncResponse,
             @PathParam("property") String property,
@@ -304,7 +327,7 @@ public void getPartitionedStats(@Suspended final AsyncResponse asyncResponse,
             @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
         try {
             validateTopicName(property, cluster, namespace, encodedTopic);
-            internalGetPartitionedStats(asyncResponse, authoritative, perPartition);
+            internalGetPartitionedStats(asyncResponse, authoritative, perPartition, false);
         } catch (WebApplicationException wae) {
             asyncResponse.resume(wae);
         } catch (Exception e) {
@@ -316,7 +339,9 @@ public void getPartitionedStats(@Suspended final AsyncResponse asyncResponse,
     @GET
     @Path("{property}/{cluster}/{namespace}/{topic}/partitioned-internalStats")
     @ApiOperation(hidden = true, value = "Get the stats-internal for the partitioned topic.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist") })
     public void getPartitionedStatsInternal(
             @Suspended final AsyncResponse asyncResponse,
@@ -337,7 +362,9 @@ public void getPartitionedStatsInternal(
     @DELETE
     @Path("/{property}/{cluster}/{namespace}/{topic}/subscription/{subName}")
     @ApiOperation(hidden = true, value = "Delete a subscription.", notes = "There should not be any active consumers on the subscription.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist"),
             @ApiResponse(code = 412, message = "Subscription has active consumers") })
     public void deleteSubscription(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property,
@@ -357,7 +384,9 @@ public void deleteSubscription(@Suspended final AsyncResponse asyncResponse, @Pa
     @POST
     @Path("/{property}/{cluster}/{namespace}/{topic}/subscription/{subName}/skip_all")
     @ApiOperation(hidden = true, value = "Skip all messages on a topic subscription.", notes = "Completely clears the backlog on the subscription.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 405, message = "Operation not allowed on non-persistent topic"),
             @ApiResponse(code = 404, message = "Topic or subscription does not exist") })
     public void skipAllMessages(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property,
@@ -377,7 +406,9 @@ public void skipAllMessages(@Suspended final AsyncResponse asyncResponse, @PathP
     @POST
     @Path("/{property}/{cluster}/{namespace}/{topic}/subscription/{subName}/skip/{numMessages}")
     @ApiOperation(hidden = true, value = "Skip messages on a topic subscription.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic or subscription does not exist") })
     public void skipMessages(@PathParam("property") String property, @PathParam("cluster") String cluster,
             @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic,
@@ -390,7 +421,9 @@ public void skipMessages(@PathParam("property") String property, @PathParam("clu
     @POST
     @Path("/{property}/{cluster}/{namespace}/{topic}/subscription/{subName}/expireMessages/{expireTimeInSeconds}")
     @ApiOperation(hidden = true, value = "Expire messages on a topic subscription.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic or subscription does not exist") })
     public void expireTopicMessages(@Suspended final AsyncResponse asyncResponse,
             @PathParam("property") String property, @PathParam("cluster") String cluster,
@@ -410,7 +443,9 @@ public void expireTopicMessages(@Suspended final AsyncResponse asyncResponse,
     @POST
     @Path("/{property}/{cluster}/{namespace}/{topic}/all_subscription/expireMessages/{expireTimeInSeconds}")
     @ApiOperation(hidden = true, value = "Expire messages on all subscriptions of topic.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic or subscription does not exist") })
     public void expireMessagesForAllSubscriptions(@Suspended final AsyncResponse asyncResponse,
             @PathParam("property") String property, @PathParam("cluster") String cluster,
@@ -430,7 +465,9 @@ public void expireMessagesForAllSubscriptions(@Suspended final AsyncResponse asy
     @POST
     @Path("/{property}/{cluster}/{namespace}/{topic}/subscription/{subName}/resetcursor/{timestamp}")
     @ApiOperation(hidden = true, value = "Reset subscription to message position closest to absolute timestamp (in ms).", notes = "It fence cursor and disconnects all active consumers before reseting cursor.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic/Subscription does not exist") })
     public void resetCursor(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property,
             @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
@@ -450,7 +487,9 @@ public void resetCursor(@Suspended final AsyncResponse asyncResponse, @PathParam
     @POST
     @Path("/{property}/{cluster}/{namespace}/{topic}/subscription/{subName}/resetcursor")
     @ApiOperation(hidden = true, value = "Reset subscription to message position closest to given position.", notes = "It fence cursor and disconnects all active consumers before reseting cursor.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic/Subscription does not exist"),
             @ApiResponse(code = 405, message = "Not supported for partitioned topics") })
     public void resetCursorOnPosition(@PathParam("property") String property, @PathParam("cluster") String cluster,
@@ -464,7 +503,9 @@ public void resetCursorOnPosition(@PathParam("property") String property, @PathP
     @PUT
     @Path("/{property}/{cluster}/{namespace}/{topic}/subscription/{subscriptionName}")
     @ApiOperation(value = "Reset subscription to message position closest to given position.", notes = "Creates a subscription on the topic at the specified message id")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic/Subscription does not exist"),
             @ApiResponse(code = 405, message = "Not supported for partitioned topics") })
     public void createSubscription(@Suspended final AsyncResponse asyncResponse, @PathParam("property") String property,
@@ -485,7 +526,9 @@ public void createSubscription(@Suspended final AsyncResponse asyncResponse, @Pa
     @GET
     @Path("/{property}/{cluster}/{namespace}/{topic}/subscription/{subName}/position/{messagePosition}")
     @ApiOperation(hidden = true, value = "Peek nth message on a topic subscription.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic, subscription or the message position does not exist") })
     public Response peekNthMessage(@PathParam("property") String property, @PathParam("cluster") String cluster,
             @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic,
@@ -512,7 +555,9 @@ public PersistentOfflineTopicStats getBacklog(@PathParam("property") String prop
     @Path("/{property}/{cluster}/{namespace}/{topic}/terminate")
     @ApiOperation(hidden = true, value = "Terminate a topic. A topic that is terminated will not accept any more "
             + "messages to be published and will let consumer to drain existing messages in backlog")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 405, message = "Operation not allowed on non-persistent topic"),
             @ApiResponse(code = 404, message = "Topic does not exist") })
     public MessageId terminate(@PathParam("property") String property, @PathParam("cluster") String cluster,
@@ -525,10 +570,12 @@ public MessageId terminate(@PathParam("property") String property, @PathParam("c
     @PUT
     @Path("/{property}/{cluster}/{namespace}/{topic}/compaction")
     @ApiOperation(value = "Trigger a compaction operation on a topic.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
-                            @ApiResponse(code = 405, message = "Operation not allowed on persistent topic"),
-                            @ApiResponse(code = 404, message = "Topic does not exist"),
-                            @ApiResponse(code = 409, message = "Compaction already running")})
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
+            @ApiResponse(code = 405, message = "Operation not allowed on persistent topic"),
+            @ApiResponse(code = 404, message = "Topic does not exist"),
+            @ApiResponse(code = 409, message = "Compaction already running")})
     public void compact(@PathParam("property") String property, @PathParam("cluster") String cluster,
                         @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic,
                         @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
@@ -539,9 +586,11 @@ public void compact(@PathParam("property") String property, @PathParam("cluster"
     @GET
     @Path("/{property}/{cluster}/{namespace}/{topic}/compaction")
     @ApiOperation(value = "Get the status of a compaction operation for a topic.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
-                            @ApiResponse(code = 405, message = "Operation not allowed on persistent topic"),
-                            @ApiResponse(code = 404, message = "Topic does not exist, or compaction hasn't run") })
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
+            @ApiResponse(code = 405, message = "Operation not allowed on persistent topic"),
+            @ApiResponse(code = 404, message = "Topic does not exist, or compaction hasn't run") })
     public LongRunningProcessStatus compactionStatus(
             @PathParam("property") String property, @PathParam("cluster") String cluster,
             @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic,
@@ -553,10 +602,12 @@ public LongRunningProcessStatus compactionStatus(
     @PUT
     @Path("/{tenant}/{cluster}/{namespace}/{topic}/offload")
     @ApiOperation(value = "Offload a prefix of a topic to long term storage")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
-                            @ApiResponse(code = 405, message = "Operation not allowed on persistent topic"),
-                            @ApiResponse(code = 404, message = "Topic does not exist"),
-                            @ApiResponse(code = 409, message = "Offload already running")})
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
+            @ApiResponse(code = 405, message = "Operation not allowed on persistent topic"),
+            @ApiResponse(code = 404, message = "Topic does not exist"),
+            @ApiResponse(code = 409, message = "Offload already running")})
     public void triggerOffload(@PathParam("tenant") String tenant,
                                @PathParam("cluster") String cluster,
                                @PathParam("namespace") String namespace,
@@ -570,9 +621,11 @@ public void triggerOffload(@PathParam("tenant") String tenant,
     @GET
     @Path("/{tenant}/{cluster}/{namespace}/{topic}/offload")
     @ApiOperation(value = "Offload a prefix of a topic to long term storage")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
-                            @ApiResponse(code = 405, message = "Operation not allowed on persistent topic"),
-                            @ApiResponse(code = 404, message = "Topic does not exist")})
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
+            @ApiResponse(code = 405, message = "Operation not allowed on persistent topic"),
+            @ApiResponse(code = 404, message = "Topic does not exist")})
     public OffloadProcessStatus offloadStatus(@PathParam("tenant") String tenant,
                                               @PathParam("cluster") String cluster,
                                               @PathParam("namespace") String namespace,
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/ResourceQuotas.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/ResourceQuotas.java
index 6fcf14eb57075..78410625b5683 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/ResourceQuotas.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v1/ResourceQuotas.java
@@ -44,7 +44,9 @@ public class ResourceQuotas extends ResourceQuotasBase {
     @GET
     @Path("/{property}/{cluster}/{namespace}/{bundle}")
     @ApiOperation(hidden = true, value = "Get resource quota of a namespace bundle.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace does not exist") })
     public ResourceQuota getNamespaceBundleResourceQuota(@PathParam("property") String property,
             @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
@@ -56,7 +58,9 @@ public ResourceQuota getNamespaceBundleResourceQuota(@PathParam("property") Stri
     @POST
     @Path("/{property}/{cluster}/{namespace}/{bundle}")
     @ApiOperation(hidden = true, value = "Set resource quota on a namespace.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 409, message = "Concurrent modification") })
     public void setNamespaceBundleResourceQuota(@PathParam("property") String property,
             @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
@@ -68,7 +72,9 @@ public void setNamespaceBundleResourceQuota(@PathParam("property") String proper
     @DELETE
     @Path("/{property}/{cluster}/{namespace}/{bundle}")
     @ApiOperation(hidden = true, value = "Remove resource quota for a namespace.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 409, message = "Concurrent modification") })
     public void removeNamespaceBundleResourceQuota(@PathParam("property") String property,
             @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Functions.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Functions.java
index 4779461645e26..6c4b367f0cea5 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Functions.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Functions.java
@@ -151,6 +151,7 @@ public Response getFunctionInfo(final @PathParam("tenant") String tenant,
             response = FunctionStatus.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 404, message = "The function doesn't exist")
@@ -171,6 +172,7 @@ public Response getFunctionInstanceStatus(final @PathParam("tenant") String tena
             response = FunctionStatus.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions")
     })
@@ -241,7 +243,9 @@ public Response getFunctionState(final @PathParam("tenant") String tenant,
 
     @POST
     @ApiOperation(value = "Restart function instance", response = Void.class)
-    @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
+            @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 404, message = "The function does not exist"),
             @ApiResponse(code = 500, message = "Internal server error") })
     @Path("/{tenant}/{namespace}/{functionName}/{instanceId}/restart")
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Namespaces.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Namespaces.java
index 5bc71fc84ebf1..56f07d67a6e98 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Namespaces.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Namespaces.java
@@ -51,6 +51,7 @@
 import org.apache.pulsar.common.policies.data.BookieAffinityGroupData;
 import org.apache.pulsar.common.policies.data.BundlesData;
 import org.apache.pulsar.common.policies.data.DispatchRate;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.apache.pulsar.common.policies.data.PersistencePolicies;
 import org.apache.pulsar.common.policies.data.Policies;
 import org.apache.pulsar.common.policies.data.PublishRate;
@@ -59,6 +60,7 @@
 import org.apache.pulsar.common.policies.data.SchemaAutoUpdateCompatibilityStrategy;
 import org.apache.pulsar.common.policies.data.SubscribeRate;
 import org.apache.pulsar.common.policies.data.SubscriptionAuthMode;
+import org.apache.pulsar.common.policies.data.DelayedDeliveryPolicies;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -133,7 +135,9 @@ public void createNamespace(@PathParam("tenant") String tenant, @PathParam("name
     @DELETE
     @Path("/{tenant}/{namespace}")
     @ApiOperation(value = "Delete a namespace and all the topics under it.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Tenant or cluster or namespace doesn't exist"),
             @ApiResponse(code = 409, message = "Namespace is not empty") })
     public void deleteNamespace(@Suspended final AsyncResponse asyncResponse, @PathParam("tenant") String tenant,
@@ -152,7 +156,9 @@ public void deleteNamespace(@Suspended final AsyncResponse asyncResponse, @PathP
     @DELETE
     @Path("/{tenant}/{namespace}/{bundle}")
     @ApiOperation(value = "Delete a namespace bundle and all the topics under it.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Tenant or cluster or namespace doesn't exist"),
             @ApiResponse(code = 409, message = "Namespace bundle is not empty") })
     public void deleteNamespaceBundle(@PathParam("tenant") String tenant, @PathParam("namespace") String namespace,
@@ -169,7 +175,7 @@ public void deleteNamespaceBundle(@PathParam("tenant") String tenant, @PathParam
             @ApiResponse(code = 404, message = "Tenant or cluster or namespace doesn't exist"),
             @ApiResponse(code = 409, message = "Namespace is not empty") })
     public Map<String, Set<AuthAction>> getPermissions(@PathParam("tenant") String tenant,
-            @PathParam("cluster") String cluster, @PathParam("namespace") String namespace) {
+            @PathParam("namespace") String namespace) {
         validateAdminAccessForTenant(tenant);
         validateNamespaceName(tenant, namespace);
 
@@ -316,7 +322,9 @@ public BundlesData getBundlesData(@PathParam("tenant") String tenant,
             + "their persistent store). During that operation, the namespace is marked as tentatively unavailable until the"
             + "broker completes the unloading action. This operation requires strictly super user privileges, since it would"
             + "result in non-persistent message loss and unexpected connection closure to the clients.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Tenant or namespace doesn't exist"),
             @ApiResponse(code = 412, message = "Namespace is already unloaded or Namespace has bundles activated") })
     public void unloadNamespace(@Suspended final AsyncResponse asyncResponse, @PathParam("tenant") String tenant,
@@ -334,7 +342,9 @@ public void unloadNamespace(@Suspended final AsyncResponse asyncResponse, @PathP
     @PUT
     @Path("/{tenant}/{namespace}/{bundle}/unload")
     @ApiOperation(value = "Unload a namespace bundle")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission") })
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission") })
     public void unloadNamespaceBundle(@PathParam("tenant") String tenant, @PathParam("namespace") String namespace,
             @PathParam("bundle") String bundleRange,
             @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
@@ -345,13 +355,16 @@ public void unloadNamespaceBundle(@PathParam("tenant") String tenant, @PathParam
     @PUT
     @Path("/{tenant}/{namespace}/{bundle}/split")
     @ApiOperation(value = "Split a namespace bundle")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission") })
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission") })
     public void splitNamespaceBundle(@PathParam("tenant") String tenant, @PathParam("namespace") String namespace,
             @PathParam("bundle") String bundleRange,
             @QueryParam("authoritative") @DefaultValue("false") boolean authoritative,
-            @QueryParam("unload") @DefaultValue("false") boolean unload) {
+            @QueryParam("unload") @DefaultValue("false") boolean unload,
+            @QueryParam("splitAlgorithmName") String splitAlgorithmName) {
         validateNamespaceName(tenant, namespace);
-        internalSplitNamespaceBundle(bundleRange, authoritative, unload);
+        internalSplitNamespaceBundle(bundleRange, authoritative, unload, splitAlgorithmName);
     }
 
     @POST
@@ -539,7 +552,9 @@ public void setPersistence(@PathParam("tenant") String tenant, @PathParam("names
     @POST
     @Path("/{tenant}/{namespace}/persistence/bookieAffinity")
     @ApiOperation(value = "Set the bookie-affinity-group to namespace-persistent policy.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace does not exist"),
             @ApiResponse(code = 409, message = "Concurrent modification") })
     public void setBookieAffinityGroup(@PathParam("tenant") String tenant, @PathParam("namespace") String namespace,
@@ -551,7 +566,9 @@ public void setBookieAffinityGroup(@PathParam("tenant") String tenant, @PathPara
     @GET
     @Path("/{property}/{namespace}/persistence/bookieAffinity")
     @ApiOperation(value = "Get the bookie-affinity-group from namespace-local policy.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace does not exist"),
             @ApiResponse(code = 409, message = "Concurrent modification") })
     public BookieAffinityGroupData getBookieAffinityGroup(@PathParam("property") String property,
@@ -605,7 +622,9 @@ public void clearNamespaceBacklog(@Suspended final AsyncResponse asyncResponse,
     @POST
     @Path("/{tenant}/{namespace}/{bundle}/clearBacklog")
     @ApiOperation(value = "Clear backlog for all topics on a namespace bundle.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace does not exist") })
     public void clearNamespaceBundleBacklog(@PathParam("tenant") String tenant,
             @PathParam("namespace") String namespace, @PathParam("bundle") String bundleRange,
@@ -636,7 +655,9 @@ public void clearNamespaceBacklogForSubscription(@Suspended final AsyncResponse
     @POST
     @Path("/{tenant}/{namespace}/{bundle}/clearBacklog/{subscription}")
     @ApiOperation(value = "Clear backlog for a given subscription on all topics on a namespace bundle.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace does not exist") })
     public void clearNamespaceBundleBacklogForSubscription(@PathParam("tenant") String tenant,
             @PathParam("namespace") String namespace, @PathParam("subscription") String subscription,
@@ -652,7 +673,7 @@ public void clearNamespaceBundleBacklogForSubscription(@PathParam("tenant") Stri
     @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace does not exist") })
     public void unsubscribeNamespace(@Suspended final AsyncResponse asyncResponse, @PathParam("tenant") String tenant,
-            @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
+            @PathParam("namespace") String namespace,
             @PathParam("subscription") String subscription,
             @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
         try {
@@ -702,6 +723,29 @@ public void modifyEncryptionRequired(@PathParam("tenant") String tenant,
         internalModifyEncryptionRequired(encryptionRequired);
     }
 
+    @GET
+    @Path("/{tenant}/{namespace}/delayedDelivery")
+    @ApiOperation(value = "Get delayed delivery messages config on a namespace.")
+    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+            @ApiResponse(code = 404, message = "Tenant or cluster or namespace doesn't exist"),
+            @ApiResponse(code = 409, message = "Concurrent modification"), })
+    public DelayedDeliveryPolicies getDelayedDeliveryPolicies(@PathParam("tenant") String tenant,
+                                         @PathParam("namespace") String namespace) {
+        validateNamespaceName(tenant, namespace);
+        return internalGetDelayedDelivery();
+    }
+
+    @POST
+    @Path("/{tenant}/{namespace}/delayedDelivery")
+    @ApiOperation(value = "Set delayed delivery messages config on a namespace.")
+    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+            @ApiResponse(code = 404, message = "Tenant or cluster or namespace doesn't exist"), })
+    public void setDelayedDeliveryPolicies(@PathParam("tenant") String tenant,
+                                           @PathParam("namespace") String namespace, DelayedDeliveryPolicies deliveryPolicies) {
+        validateNamespaceName(tenant, namespace);
+        internalSetDelayedDelivery(deliveryPolicies);
+    }
+
     @GET
     @Path("/{tenant}/{namespace}/maxProducersPerTopic")
     @ApiOperation(value = "Get maxProducersPerTopic config on a namespace.")
@@ -774,6 +818,54 @@ public void setMaxConsumersPerSubscription(@PathParam("tenant") String tenant, @
         internalSetMaxConsumersPerSubscription(maxConsumersPerSubscription);
     }
 
+    @GET
+    @Path("/{tenant}/{namespace}/maxUnackedMessagesPerConsumer")
+    @ApiOperation(value = "Get maxUnackedMessagesPerConsumer config on a namespace.")
+    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+            @ApiResponse(code = 404, message = "Namespace does not exist") })
+    public int getMaxUnackedMessagesPerConsumer(@PathParam("tenant") String tenant,
+                                       @PathParam("namespace") String namespace) {
+        validateNamespaceName(tenant, namespace);
+        return internalGetMaxUnackedMessagesPerConsumer();
+    }
+
+    @POST
+    @Path("/{tenant}/{namespace}/maxUnackedMessagesPerConsumer")
+    @ApiOperation(value = " Set maxConsumersPerTopic configuration on a namespace.")
+    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+            @ApiResponse(code = 404, message = "Namespace does not exist"),
+            @ApiResponse(code = 409, message = "Concurrent modification"),
+            @ApiResponse(code = 412, message = "maxUnackedMessagesPerConsumer value is not valid") })
+    public void setMaxUnackedMessagesPerConsumer(@PathParam("tenant") String tenant, @PathParam("namespace") String namespace,
+                                        int maxUnackedMessagesPerConsumer) {
+        validateNamespaceName(tenant, namespace);
+        internalSetMaxUnackedMessagesPerConsumer(maxUnackedMessagesPerConsumer);
+    }
+
+    @GET
+    @Path("/{tenant}/{namespace}/maxUnackedMessagesPerSubscription")
+    @ApiOperation(value = "Get maxUnackedMessagesPerSubscription config on a namespace.")
+    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+            @ApiResponse(code = 404, message = "Namespace does not exist") })
+    public int getMaxUnackedmessagesPerSubscription(@PathParam("tenant") String tenant,
+                                              @PathParam("namespace") String namespace) {
+        validateNamespaceName(tenant, namespace);
+        return internalGetMaxUnackedMessagesPerSubscription();
+    }
+
+    @POST
+    @Path("/{tenant}/{namespace}/maxUnackedMessagesPerSubscription")
+    @ApiOperation(value = " Set maxUnackedMessagesPerSubscription configuration on a namespace.")
+    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+            @ApiResponse(code = 404, message = "Namespace does not exist"),
+            @ApiResponse(code = 409, message = "Concurrent modification"),
+            @ApiResponse(code = 412, message = "maxUnackedMessagesPerSubscription value is not valid") })
+    public void setMaxUnackedMessagesPerSubscription(@PathParam("tenant") String tenant, @PathParam("namespace") String namespace,
+                                               int maxUnackedMessagesPerSubscription) {
+        validateNamespaceName(tenant, namespace);
+        internalSetMaxUnackedMessagesPerSubscription(maxUnackedMessagesPerSubscription);
+    }
+
     @POST
     @Path("/{tenant}/{namespace}/antiAffinity")
     @ApiOperation(value = "Set anti-affinity group for a namespace")
@@ -1052,5 +1144,37 @@ public void setSchemaValidtionEnforced(@PathParam("tenant") String tenant,
         internalSetSchemaValidationEnforced(schemaValidationEnforced);
     }
 
+    @POST
+    @Path("/{tenant}/{namespace}/offloadPolicies")
+    @ApiOperation(value = " Set offload configuration on a namespace.")
+    @ApiResponses(value = {
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
+            @ApiResponse(code = 404, message = "Namespace does not exist"),
+            @ApiResponse(code = 409, message = "Concurrent modification"),
+            @ApiResponse(code = 412, message = "OffloadPolicies is empty or driver is not supported or bucket is not valid") })
+    public void setOffloadPolicies(@PathParam("tenant") String tenant, @PathParam("namespace") String namespace,
+                           OffloadPolicies offload, @Suspended final AsyncResponse asyncResponse) {
+        try {
+            validateNamespaceName(tenant, namespace);
+            internalSetOffloadPolicies(asyncResponse, offload);
+        } catch (WebApplicationException wae) {
+            asyncResponse.resume(wae);
+        } catch (Exception e) {
+            asyncResponse.resume(new RestException(e));
+        }
+    }
+
+    @GET
+    @Path("/{tenant}/{namespace}/offloadPolicies")
+    @ApiOperation(value = "Get offload configuration on a namespace.")
+    @ApiResponses(value = {
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
+            @ApiResponse(code = 404, message = "Namespace does not exist") })
+    public OffloadPolicies getOffloadPolicies(@PathParam("tenant") String tenant,
+                                        @PathParam("namespace") String namespace) {
+        validateNamespaceName(tenant, namespace);
+        return internalGetOffloadPolicies();
+    }
+
     private static final Logger log = LoggerFactory.getLogger(Namespaces.class);
 }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java
index a41db33b9f19c..7e88eed2fe5ab 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/NonPersistentTopics.java
@@ -73,6 +73,7 @@ public class NonPersistentTopics extends PersistentTopics {
     @Path("/{tenant}/{namespace}/{topic}/partitions")
     @ApiOperation(value = "Get partitioned topic metadata.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to manage resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "The tenant/namespace/topic does not exist"),
@@ -99,6 +100,7 @@ public PartitionedTopicMetadata getPartitionedMetadata(
     @Path("{tenant}/{namespace}/{topic}/stats")
     @ApiOperation(value = "Get the stats for the topic.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to manage resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "The tenant/namespace/topic does not exist"),
@@ -113,17 +115,20 @@ public NonPersistentTopicStats getStats(
             @ApiParam(value = "Specify topic name", required = true)
             @PathParam("topic") @Encoded String encodedTopic,
             @ApiParam(value = "Is authentication required to perform this operation")
-            @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
+            @QueryParam("authoritative") @DefaultValue("false") boolean authoritative,
+            @ApiParam(value = "Is return precise backlog or imprecise backlog")
+            @QueryParam("getPreciseBacklog") @DefaultValue("false") boolean getPreciseBacklog) {
         validateTopicName(tenant, namespace, encodedTopic);
         validateAdminOperationOnTopic(topicName, authoritative);
         Topic topic = getTopicReference(topicName);
-        return ((NonPersistentTopic) topic).getStats();
+        return ((NonPersistentTopic) topic).getStats(getPreciseBacklog);
     }
 
     @GET
     @Path("{tenant}/{namespace}/{topic}/internalStats")
     @ApiOperation(value = "Get the internal stats for the topic.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to manage resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "The tenant/namespace/topic does not exist"),
@@ -149,6 +154,7 @@ public PersistentTopicInternalStats getInternalStats(
     @Path("/{tenant}/{namespace}/{topic}/partitions")
     @ApiOperation(value = "Create a partitioned topic.", notes = "It needs to be called before creating a producer on a partitioned topic.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to manage resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "The tenant/namespace does not exist"),
@@ -206,6 +212,7 @@ public void createPartitionedTopic(
     @Path("/{tenant}/{namespace}/{topic}/unload")
     @ApiOperation(value = "Unload a topic")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "This operation requires super-user access"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "The tenant/namespace/topic does not exist"),
@@ -214,6 +221,7 @@ public void createPartitionedTopic(
             @ApiResponse(code = 503, message = "Failed to validate global cluster configuration"),
     })
     public void unloadTopic(
+            @Suspended final AsyncResponse asyncResponse,
             @ApiParam(value = "Specify the tenant", required = true)
             @PathParam("tenant") String tenant,
             @ApiParam(value = "Specify the namespace", required = true)
@@ -222,12 +230,14 @@ public void unloadTopic(
             @PathParam("topic") @Encoded String encodedTopic,
             @ApiParam(value = "Is authentication required to perform this operation")
             @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
-        validateTopicName(tenant, namespace, encodedTopic);
-        log.info("[{}] Unloading topic {}", clientAppId(), topicName);
-        if (topicName.isGlobal()) {
-            validateGlobalNamespaceOwnership(namespaceName);
+        try {
+            validateTopicName(tenant, namespace, encodedTopic);
+            internalUnloadTopic(asyncResponse, authoritative);
+        } catch (WebApplicationException wae) {
+            asyncResponse.resume(wae);
+        } catch (Exception e) {
+            asyncResponse.resume(new RestException(e));
         }
-        unloadTopic(topicName, authoritative);
     }
 
     @GET
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java
index 08411dd5a33d7..8c59fa5b6b079 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/PersistentTopics.java
@@ -46,8 +46,6 @@
 import org.apache.pulsar.client.impl.MessageIdImpl;
 import org.apache.pulsar.common.partition.PartitionedTopicMetadata;
 import org.apache.pulsar.common.policies.data.AuthAction;
-import org.apache.pulsar.common.policies.data.PartitionedTopicInternalStats;
-import org.apache.pulsar.common.policies.data.PartitionedTopicStats;
 import org.apache.pulsar.common.policies.data.PersistentOfflineTopicStats;
 import org.apache.pulsar.common.policies.data.PersistentTopicInternalStats;
 import org.apache.pulsar.common.policies.data.TopicStats;
@@ -134,6 +132,7 @@ public Map<String, Set<AuthAction>> getPermissionsOnTopic(
     @Path("/{tenant}/{namespace}/{topic}/permissions/{role}")
     @ApiOperation(value = "Grant a new permission to a role on a single topic.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "tenant/namespace/topic doesn't exit"),
@@ -160,6 +159,7 @@ public void grantPermissionsOnTopic(
     @ApiOperation(value = "Revoke permissions on a topic.", notes = "Revoke permissions to a role on a single topic. If the permission was not set at the topic"
             + "level, but rather at the namespace level, this operation will return an error (HTTP status code 412).")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "tenant/namespace/topic doesn't exit"),
@@ -182,6 +182,7 @@ public void revokePermissionsOnTopic(
     @Path("/{tenant}/{namespace}/{topic}/partitions")
     @ApiOperation(value = "Create a partitioned topic.", notes = "It needs to be called before creating a producer on a partitioned topic.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Tenant does not exist"),
@@ -208,6 +209,7 @@ public void createPartitionedTopic(
     @Path("/{tenant}/{namespace}/{topic}")
     @ApiOperation(value="Create a non-partitioned topic.", notes = "This is the only REST endpoint from which non-partitioned topics could be created.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 409, message = "Partitioned topic already exist"),
@@ -248,6 +250,7 @@ public void createNonPartitionedTopic(
     @Path("/{tenant}/{namespace}/{topic}/partitions")
     @ApiOperation(value = "Increment partitions of an existing partitioned topic.", notes = "It only increments partitions of existing non-global partitioned-topic")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to adminisActions to be grantedtrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Tenant does not exist"),
@@ -275,6 +278,7 @@ public void updatePartitionedTopic(
     @Path("/{tenant}/{namespace}/{topic}/createMissedPartitions")
     @ApiOperation(value = "Create missed partitions of an existing partitioned topic.", notes = "This is a best-effort operation for create missed partitions of existing non-global partitioned-topic and does't throw any exceptions when create failed")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to adminisActions to be grantedtrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Tenant does not exist"),
@@ -298,6 +302,7 @@ public void createMissedPartitions(
     @Path("/{tenant}/{namespace}/{topic}/partitions")
     @ApiOperation(value = "Get partitioned topic metadata.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Tenant does not exist"),
@@ -324,6 +329,7 @@ public PartitionedTopicMetadata getPartitionedMetadata(
     @Path("/{tenant}/{namespace}/{topic}/partitions")
     @ApiOperation(value = "Delete a partitioned topic.", notes = "It will also delete all the partitions of the topic if it exists.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Partitioned topic does not exist"),
@@ -365,6 +371,7 @@ public void deletePartitionedTopic(
             @ApiResponse(code = 500, message = "Internal server error"),
             @ApiResponse(code = 503, message = "Failed to validate global cluster configuration") })
     public void unloadTopic(
+            @Suspended final AsyncResponse asyncResponse,
             @ApiParam(value = "Specify the tenant", required = true)
             @PathParam("tenant") String tenant,
             @ApiParam(value = "Specify the namespace", required = true)
@@ -373,8 +380,14 @@ public void unloadTopic(
             @PathParam("topic") @Encoded String encodedTopic,
             @ApiParam(value = "Is authentication required to perform this operation")
             @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
-        validateTopicName(tenant, namespace, encodedTopic);
-        internalUnloadTopic(authoritative);
+        try {
+            validateTopicName(tenant, namespace, encodedTopic);
+            internalUnloadTopic(asyncResponse, authoritative);
+        } catch (WebApplicationException wae) {
+            asyncResponse.resume(wae);
+        } catch (Exception e) {
+            asyncResponse.resume(new RestException(e));
+        }
     }
 
     @DELETE
@@ -382,6 +395,7 @@ public void unloadTopic(
     @ApiOperation(value = "Delete a topic.", notes = "The topic cannot be deleted if delete is not forcefully and there's any active "
             + "subscription or producer connected to the it. Force delete ignores connected clients and deletes topic by explicitly closing them.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist"),
@@ -406,6 +420,7 @@ public void deleteTopic(
     @Path("/{tenant}/{namespace}/{topic}/subscriptions")
     @ApiOperation(value = "Get the list of persistent subscriptions for a given topic.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist"),
@@ -437,6 +452,7 @@ public void getSubscriptions(
     @Path("{tenant}/{namespace}/{topic}/stats")
     @ApiOperation(value = "Get the stats for the topic.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist"),
@@ -451,15 +467,18 @@ public TopicStats getStats(
             @ApiParam(value = "Specify topic name", required = true)
             @PathParam("topic") @Encoded String encodedTopic,
             @ApiParam(value = "Is authentication required to perform this operation")
-            @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
+            @QueryParam("authoritative") @DefaultValue("false") boolean authoritative,
+            @ApiParam(value = "Is return precise backlog or imprecise backlog")
+            @QueryParam("getPreciseBacklog") @DefaultValue("false") boolean getPreciseBacklog) {
         validateTopicName(tenant, namespace, encodedTopic);
-        return internalGetStats(authoritative);
+        return internalGetStats(authoritative, getPreciseBacklog);
     }
 
     @GET
     @Path("{tenant}/{namespace}/{topic}/internalStats")
     @ApiOperation(value = "Get the internal stats for the topic.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist"),
@@ -504,6 +523,7 @@ public void getManagedLedgerInfo(
     @Path("{tenant}/{namespace}/{topic}/partitioned-stats")
     @ApiOperation(value = "Get the stats for the partitioned topic.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist"),
@@ -522,10 +542,12 @@ public void getPartitionedStats(
             @ApiParam(value = "Get per partition stats")
             @QueryParam("perPartition") @DefaultValue("true") boolean perPartition,
             @ApiParam(value = "Is authentication required to perform this operation")
-            @QueryParam("authoritative") @DefaultValue("false") boolean authoritative) {
+            @QueryParam("authoritative") @DefaultValue("false") boolean authoritative,
+            @ApiParam(value = "Is return precise backlog or imprecise backlog")
+            @QueryParam("getPreciseBacklog") @DefaultValue("false") boolean getPreciseBacklog) {
         try {
             validatePartitionedTopicName(tenant, namespace, encodedTopic);
-            internalGetPartitionedStats(asyncResponse, authoritative, perPartition);
+            internalGetPartitionedStats(asyncResponse, authoritative, perPartition, getPreciseBacklog);
         } catch (WebApplicationException wae) {
             asyncResponse.resume(wae);
         } catch (Exception e) {
@@ -537,6 +559,7 @@ public void getPartitionedStats(
     @Path("{tenant}/{namespace}/{topic}/partitioned-internalStats")
     @ApiOperation(hidden = true, value = "Get the stats-internal for the partitioned topic.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist"),
@@ -567,6 +590,7 @@ public void getPartitionedStatsInternal(
     @Path("/{tenant}/{namespace}/{topic}/subscription/{subName}")
     @ApiOperation(value = "Delete a subscription.", notes = "There should not be any active consumers on the subscription.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic does not exist"),
@@ -599,6 +623,7 @@ public void deleteSubscription(
     @Path("/{tenant}/{namespace}/{topic}/subscription/{subName}/skip_all")
     @ApiOperation(value = "Skip all messages on a topic subscription.", notes = "Completely clears the backlog on the subscription.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" +
                     "subscriber is not authorized to access this operation"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
@@ -633,6 +658,7 @@ public void skipAllMessages(
     @Path("/{tenant}/{namespace}/{topic}/subscription/{subName}/skip/{numMessages}")
     @ApiOperation(value = "Skipping messages on a topic subscription.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Topic or subscription does not exist"),
@@ -661,6 +687,7 @@ public void skipMessages(
     @Path("/{tenant}/{namespace}/{topic}/subscription/{subName}/expireMessages/{expireTimeInSeconds}")
     @ApiOperation(value = "Expiry messages on a topic subscription.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" +
                     "subscriber is not authorized to access this operation"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
@@ -696,6 +723,7 @@ public void expireTopicMessages(
     @Path("/{tenant}/{namespace}/{topic}/all_subscription/expireMessages/{expireTimeInSeconds}")
     @ApiOperation(value = "Expiry messages on all subscriptions of topic.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" +
                     "subscriber is not authorized to access this operation"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
@@ -730,6 +758,7 @@ public void expireMessagesForAllSubscriptions(
     @Path("/{tenant}/{namespace}/{topic}/subscription/{subscriptionName}")
     @ApiOperation(value = "Reset subscription to message position closest to given position.", notes = "Creates a subscription on the topic at the specified message id")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" +
                     "subscriber is not authorized to access this operation"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
@@ -769,6 +798,7 @@ public void createSubscription(
     @Path("/{tenant}/{namespace}/{topic}/subscription/{subName}/resetcursor/{timestamp}")
     @ApiOperation(value = "Reset subscription to message position closest to absolute timestamp (in ms).", notes = "It fence cursor and disconnects all active consumers before reseting cursor.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" +
                     "subscriber is not authorized to access this operation"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
@@ -807,6 +837,7 @@ public void resetCursor(
     @Path("/{tenant}/{namespace}/{topic}/subscription/{subName}/resetcursor")
     @ApiOperation(value = "Reset subscription to message position closest to given position.", notes = "It fence cursor and disconnects all active consumers before reseting cursor.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" +
                     "subscriber is not authorized to access this operation"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
@@ -836,6 +867,7 @@ public void resetCursorOnPosition(
     @Path("/{tenant}/{namespace}/{topic}/subscription/{subName}/position/{messagePosition}")
     @ApiOperation(value = "Peek nth message on a topic subscription.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" +
                     "subscriber is not authorized to access this operation"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
@@ -886,6 +918,7 @@ public PersistentOfflineTopicStats getBacklog(
     @ApiOperation(value = "Terminate a topic. A topic that is terminated will not accept any more "
             + "messages to be published and will let consumer to drain existing messages in backlog")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" +
                     "subscriber is not authorized to access this operation"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
@@ -911,6 +944,7 @@ public MessageId terminate(
     @Path("/{tenant}/{namespace}/{topic}/compaction")
     @ApiOperation(value = "Trigger a compaction operation on a topic.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" +
                     "subscriber is not authorized to access this operation"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
@@ -937,6 +971,7 @@ public void compact(
     @Path("/{tenant}/{namespace}/{topic}/compaction")
     @ApiOperation(value = "Get the status of a compaction operation for a topic.")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" +
                     "subscriber is not authorized to access this operation"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
@@ -962,6 +997,7 @@ public LongRunningProcessStatus compactionStatus(
     @Path("/{tenant}/{namespace}/{topic}/offload")
     @ApiOperation(value = "Offload a prefix of a topic to long term storage")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" +
                     "subscriber is not authorized to access this operation"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
@@ -989,6 +1025,7 @@ public void triggerOffload(
     @Path("/{tenant}/{namespace}/{topic}/offload")
     @ApiOperation(value = "Offload a prefix of a topic to long term storage")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" +
                     "subscriber is not authorized to access this operation"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
@@ -1014,6 +1051,7 @@ public OffloadProcessStatus offloadStatus(
     @Path("/{tenant}/{namespace}/{topic}/lastMessageId")
     @ApiOperation(value = "Return the last commit message id of topic")
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic"),
             @ApiResponse(code = 401, message = "Don't have permission to administrate resources on this tenant or" +
                     "subscriber is not authorized to access this operation"),
             @ApiResponse(code = 403, message = "Don't have admin permission"),
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/ResourceQuotas.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/ResourceQuotas.java
index b2a7df6f7ead4..1ab2828482506 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/ResourceQuotas.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/ResourceQuotas.java
@@ -58,7 +58,9 @@ public void setDefaultResourceQuota(ResourceQuota quota) throws Exception {
     @GET
     @Path("/{tenant}/{namespace}/{bundle}")
     @ApiOperation(value = "Get resource quota of a namespace bundle.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 404, message = "Namespace does not exist") })
     public ResourceQuota getNamespaceBundleResourceQuota(@PathParam("tenant") String tenant,
             @PathParam("namespace") String namespace, @PathParam("bundle") String bundleRange) {
@@ -69,7 +71,9 @@ public ResourceQuota getNamespaceBundleResourceQuota(@PathParam("tenant") String
     @POST
     @Path("/{tenant}/{namespace}/{bundle}")
     @ApiOperation(value = "Set resource quota on a namespace.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 409, message = "Concurrent modification") })
     public void setNamespaceBundleResourceQuota(@PathParam("tenant") String tenant,
             @PathParam("namespace") String namespace, @PathParam("bundle") String bundleRange, ResourceQuota quota) {
@@ -80,7 +84,9 @@ public void setNamespaceBundleResourceQuota(@PathParam("tenant") String tenant,
     @DELETE
     @Path("/{tenant}/{namespace}/{bundle}")
     @ApiOperation(value = "Remove resource quota for a namespace.")
-    @ApiResponses(value = { @ApiResponse(code = 403, message = "Don't have admin permission"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace"),
+            @ApiResponse(code = 403, message = "Don't have admin permission"),
             @ApiResponse(code = 409, message = "Concurrent modification") })
     public void removeNamespaceBundleResourceQuota(@PathParam("tenant") String tenant,
             @PathParam("namespace") String namespace, @PathParam("bundle") String bundleRange) {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTracker.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTracker.java
index 836a2ff57d528..e772d228f150f 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTracker.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/DelayedDeliveryTracker.java
@@ -60,6 +60,14 @@ public interface DelayedDeliveryTracker extends AutoCloseable {
      */
     Set<PositionImpl> getScheduledMessages(int maxMessages);
 
+
+    /**
+     *  Reset tick time use zk policies cache
+     * @param tickTime
+     *          The tick time for when retrying on delayed delivery messages
+     */
+    void resetTickTime(long tickTime);
+
     /**
      * Close the subscription tracker and release all resources.
      */
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTracker.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTracker.java
index 447928486ab10..a702a010833c6 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTracker.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTracker.java
@@ -49,7 +49,7 @@ public class InMemoryDelayedDeliveryTracker implements DelayedDeliveryTracker, T
     // Timestamp at which the timeout is currently set
     private long currentTimeoutTarget;
 
-    private final long tickTimeMillis;
+    private long tickTimeMillis;
 
     private final Clock clock;
 
@@ -127,6 +127,13 @@ public Set<PositionImpl> getScheduledMessages(int maxMessages) {
         return positions;
     }
 
+    @Override
+    public void resetTickTime(long tickTime) {
+        if (this.tickTimeMillis != tickTime){
+            this.tickTimeMillis = tickTime;
+        }
+    }
+
     @Override
     public long getNumberOfDelayedMessages() {
         return priorityQueue.size();
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTrackerFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTrackerFactory.java
index 71f0fc293d2e1..0ac27779d4d83 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTrackerFactory.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/InMemoryDelayedDeliveryTrackerFactory.java
@@ -22,6 +22,7 @@
 import io.netty.util.Timer;
 import io.netty.util.concurrent.DefaultThreadFactory;
 
+import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.pulsar.broker.ServiceConfiguration;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
index 07fe7dcf875f9..5788656bb5eea 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/ModularLoadManagerImpl.java
@@ -125,7 +125,7 @@ public class ModularLoadManagerImpl implements ModularLoadManager, ZooKeeperCach
     private BrokerHostUsage brokerHostUsage;
 
     // Map from brokers to namespaces to the bundle ranges in that namespace assigned to that broker.
-    // Used to distribute bundles within a namespace evely across brokers.
+    // Used to distribute bundles within a namespace evenly across brokers.
     private final ConcurrentOpenHashMap<String, ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<String>>> brokerToNamespaceToBundleRange;
 
     // Path to the ZNode containing the LocalBrokerData json for this broker.
@@ -138,7 +138,7 @@ public class ModularLoadManagerImpl implements ModularLoadManager, ZooKeeperCach
     private ServiceConfiguration conf;
 
     // The default bundle stats which are used to initialize historic data.
-    // This data is overriden after the bundle receives its first sample.
+    // This data is overridden after the bundle receives its first sample.
     private final NamespaceBundleStats defaultStats;
 
     // Used to filter brokers from being selected for assignment.
@@ -648,7 +648,7 @@ public void checkNamespaceBundleSplit() {
                     }
                     log.info("Load-manager splitting bundle {} and unloading {}", bundleName, unloadSplitBundles);
                     pulsar.getAdminClient().namespaces().splitNamespaceBundle(namespaceName, bundleRange,
-                            unloadSplitBundles);
+                        unloadSplitBundles, null);
                     // Make sure the same bundle is not selected again.
                     loadData.getBundleData().remove(bundleName);
                     localData.getLastStats().remove(bundleName);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedder.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedder.java
index c61f8cb564f72..bda69fe0e7cf9 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedder.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedder.java
@@ -73,7 +73,8 @@ public Multimap<String, String> findBundlesForUnloading(final LoadData loadData,
             final double currentUsage = localData.getMaxResourceUsage();
             if (currentUsage < overloadThreshold) {
                 if (log.isDebugEnabled()) {
-                    log.debug("[{}] Broker is not overloaded, ignoring at this point", broker);
+                    log.debug("[{}] Broker is not overloaded, ignoring at this point ({})", broker,
+                            localData.printResourceUsage());
                 }
                 return;
             }
@@ -86,8 +87,9 @@ public Multimap<String, String> findBundlesForUnloading(final LoadData loadData,
             double minimumThroughputToOffload = brokerCurrentThroughput * percentOfTrafficToOffload;
 
             log.info(
-                    "Attempting to shed load on {}, which has resource usage {}% above threshold {}% -- Offloading at least {} MByte/s of traffic",
-                    broker, 100 * currentUsage, 100 * overloadThreshold, minimumThroughputToOffload / 1024 / 1024);
+                    "Attempting to shed load on {}, which has resource usage {}% above threshold {}% -- Offloading at least {} MByte/s of traffic ({})",
+                    broker, 100 * currentUsage, 100 * overloadThreshold, minimumThroughputToOffload / 1024 / 1024,
+                    localData.printResourceUsage());
 
             MutableDouble trafficMarkedToOffload = new MutableDouble(0);
             MutableBoolean atLeastOneBundleSelected = new MutableBoolean(false);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleLoadManagerImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleLoadManagerImpl.java
index 14ae88a7266f9..765f6c661021d 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleLoadManagerImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/impl/SimpleLoadManagerImpl.java
@@ -49,6 +49,7 @@
 import org.apache.pulsar.broker.loadbalance.PlacementStrategy;
 import org.apache.pulsar.broker.loadbalance.ResourceUnit;
 import org.apache.pulsar.broker.loadbalance.impl.LoadManagerShared.BrokerTopicLoadingPredicate;
+import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.common.naming.NamespaceName;
 import org.apache.pulsar.common.naming.ServiceUnitId;
 import org.apache.pulsar.common.policies.data.ResourceQuota;
@@ -1478,9 +1479,9 @@ public void doNamespaceBundleSplit() throws Exception {
             for (String bundleName : bundlesToBeSplit) {
                 try {
                     pulsar.getAdminClient().namespaces().splitNamespaceBundle(
-                            LoadManagerShared.getNamespaceNameFromBundleName(bundleName),
-                            LoadManagerShared.getBundleRangeFromBundleName(bundleName),
-                            pulsar.getConfiguration().isLoadBalancerAutoUnloadSplitBundlesEnabled());
+                        LoadManagerShared.getNamespaceNameFromBundleName(bundleName),
+                        LoadManagerShared.getBundleRangeFromBundleName(bundleName),
+                        pulsar.getConfiguration().isLoadBalancerAutoUnloadSplitBundlesEnabled(), null);
                     log.info("Successfully split namespace bundle {}", bundleName);
                 } catch (Exception e) {
                     log.error("Failed to split namespace bundle {}", bundleName, e);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v1/TopicLookup.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v1/TopicLookup.java
index 167311a8d28df..bbc572e4953c8 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v1/TopicLookup.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v1/TopicLookup.java
@@ -53,6 +53,7 @@ public class TopicLookup extends TopicLookupBase {
     @GET
     @Path("{topic-domain}/{property}/{cluster}/{namespace}/{topic}")
     @Produces(MediaType.APPLICATION_JSON)
+    @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic") })
     public void lookupTopicAsync(@PathParam("topic-domain") String topicDomain, @PathParam("property") String property,
             @PathParam("cluster") String cluster, @PathParam("namespace") String namespace,
             @PathParam("topic") @Encoded String encodedTopic,
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v2/TopicLookup.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v2/TopicLookup.java
index 18b49b3a138fb..a814b2636e691 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v2/TopicLookup.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/lookup/v2/TopicLookup.java
@@ -42,6 +42,7 @@ public class TopicLookup extends TopicLookupBase {
     @GET
     @Path("{topic-domain}/{tenant}/{namespace}/{topic}")
     @Produces(MediaType.APPLICATION_JSON)
+    @ApiResponses(value = { @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this topic") })
     public void lookupTopicAsync(@PathParam("topic-domain") String topicDomain, @PathParam("tenant") String tenant,
             @PathParam("namespace") String namespace, @PathParam("topic") @Encoded String encodedTopic,
             @QueryParam("authoritative") @DefaultValue("false") boolean authoritative,
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java
index 91eea0717b697..d4e90be705d99 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java
@@ -47,6 +47,7 @@
 import org.apache.pulsar.common.lookup.data.LookupData;
 import org.apache.pulsar.common.naming.NamespaceBundle;
 import org.apache.pulsar.common.naming.NamespaceBundleFactory;
+import org.apache.pulsar.common.naming.NamespaceBundleSplitAlgorithm;
 import org.apache.pulsar.common.naming.NamespaceBundles;
 import org.apache.pulsar.common.naming.NamespaceName;
 import org.apache.pulsar.common.naming.ServiceUnitId;
@@ -72,6 +73,7 @@
 
 import java.net.URI;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -196,22 +198,25 @@ private NamespaceBundle getFullBundle(NamespaceName fqnn) throws Exception {
      *
      * If the service unit is not owned, return an empty optional
      */
-	public Optional<URL> getWebServiceUrl(ServiceUnitId suName, boolean authoritative, boolean isRequestHttps, boolean readOnly)
-			throws Exception {
+    public Optional<URL> getWebServiceUrl(ServiceUnitId suName, boolean authoritative, boolean isRequestHttps,
+            boolean readOnly) throws Exception {
         if (suName instanceof TopicName) {
             TopicName name = (TopicName) suName;
             if (LOG.isDebugEnabled()) {
                 LOG.debug("Getting web service URL of topic: {} - auth: {}", name, authoritative);
             }
-            return this.internalGetWebServiceUrl(getBundle(name), authoritative, isRequestHttps, readOnly).get();
+            return this.internalGetWebServiceUrl(getBundle(name), authoritative, isRequestHttps, readOnly)
+                    .get(pulsar.getConfiguration().getZooKeeperOperationTimeoutSeconds(), SECONDS);
         }
 
         if (suName instanceof NamespaceName) {
-            return this.internalGetWebServiceUrl(getFullBundle((NamespaceName) suName), authoritative, isRequestHttps, readOnly).get();
+            return this.internalGetWebServiceUrl(getFullBundle((NamespaceName) suName), authoritative, isRequestHttps,
+                    readOnly).get(pulsar.getConfiguration().getZooKeeperOperationTimeoutSeconds(), SECONDS);
         }
 
         if (suName instanceof NamespaceBundle) {
-            return this.internalGetWebServiceUrl((NamespaceBundle) suName, authoritative, isRequestHttps, readOnly).get();
+            return this.internalGetWebServiceUrl((NamespaceBundle) suName, authoritative, isRequestHttps, readOnly)
+                    .get(pulsar.getConfiguration().getZooKeeperOperationTimeoutSeconds(), SECONDS);
         }
 
         throw new IllegalArgumentException("Unrecognized class of NamespaceBundle: " + suName.getClass().getName());
@@ -633,13 +638,12 @@ public boolean isNamespaceBundleDisabled(NamespaceBundle bundle) throws Exceptio
      * @return
      * @throws Exception
      */
-    public CompletableFuture<Void> splitAndOwnBundle(NamespaceBundle bundle, boolean unload)
+    public CompletableFuture<Void> splitAndOwnBundle(NamespaceBundle bundle, boolean unload, NamespaceBundleSplitAlgorithm splitAlgorithm)
         throws Exception {
 
         final CompletableFuture<Void> unloadFuture = new CompletableFuture<>();
         final AtomicInteger counter = new AtomicInteger(BUNDLE_SPLIT_RETRY_LIMIT);
-
-        splitAndOwnBundleOnceAndRetry(bundle, unload, counter, unloadFuture);
+        splitAndOwnBundleOnceAndRetry(bundle, unload, counter, unloadFuture, splitAlgorithm);
 
         return unloadFuture;
     }
@@ -647,114 +651,127 @@ public CompletableFuture<Void> splitAndOwnBundle(NamespaceBundle bundle, boolean
     void splitAndOwnBundleOnceAndRetry(NamespaceBundle bundle,
                                        boolean unload,
                                        AtomicInteger counter,
-                                       CompletableFuture<Void> unloadFuture) {
-        CompletableFuture<List<NamespaceBundle>> updateFuture = new CompletableFuture<>();
-
-        final Pair<NamespaceBundles, List<NamespaceBundle>> splittedBundles = bundleFactory.splitBundles(bundle,
-            2 /* by default split into 2 */);
-
-        // Split and updateNamespaceBundles. Update may fail because of concurrent write to Zookeeper.
-        if (splittedBundles != null) {
-            checkNotNull(splittedBundles.getLeft());
-            checkNotNull(splittedBundles.getRight());
-            checkArgument(splittedBundles.getRight().size() == 2, "bundle has to be split in two bundles");
-            NamespaceName nsname = bundle.getNamespaceObject();
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("[{}] splitAndOwnBundleOnce: {}, counter: {},  2 bundles: {}, {}",
-                    nsname.toString(), bundle.getBundleRange(), counter.get(),
-                    splittedBundles != null ? splittedBundles.getRight().get(0).getBundleRange() : "null splittedBundles",
-                    splittedBundles != null ? splittedBundles.getRight().get(1).getBundleRange() : "null splittedBundles");
-            }
-            try {
-                // take ownership of newly split bundles
-                for (NamespaceBundle sBundle : splittedBundles.getRight()) {
-                    checkNotNull(ownershipCache.tryAcquiringOwnership(sBundle));
-                }
-                updateNamespaceBundles(nsname, splittedBundles.getLeft(),
-                    (rc, path, zkCtx, stat) ->  {
-                        if (rc == Code.OK.intValue()) {
-                            // invalidate cache as zookeeper has new split
-                            // namespace bundle
-                            bundleFactory.invalidateBundleCache(bundle.getNamespaceObject());
-
-                            updateFuture.complete(splittedBundles.getRight());
-                        } else if (rc == Code.BADVERSION.intValue()) {
-                            KeeperException keeperException = KeeperException.create(KeeperException.Code.get(rc));
-                            String msg = format("failed to update namespace policies [%s], NamespaceBundle: %s " +
-                                    "due to %s, counter: %d",
-                                nsname.toString(), bundle.getBundleRange(),
-                                keeperException.getMessage(), counter.get());
-                            LOG.warn(msg);
-                            updateFuture.completeExceptionally(new ServerMetadataException(keeperException));
-                        } else {
-                            String msg = format("failed to update namespace policies [%s], NamespaceBundle: %s due to %s",
-                                nsname.toString(), bundle.getBundleRange(),
-                                KeeperException.create(KeeperException.Code.get(rc)).getMessage());
-                            LOG.warn(msg);
+                                       CompletableFuture<Void> unloadFuture,
+                                       NamespaceBundleSplitAlgorithm splitAlgorithm) {
+        splitAlgorithm.getSplitBoundary(this, bundle).whenComplete((splitBoundary, ex) -> {
+            CompletableFuture<List<NamespaceBundle>> updateFuture = new CompletableFuture<>();
+            if (ex == null) {
+                final Pair<NamespaceBundles, List<NamespaceBundle>> splittedBundles;
+                try {
+                    splittedBundles = bundleFactory.splitBundles(bundle,
+                        2 /* by default split into 2 */, splitBoundary);
+
+                    // Split and updateNamespaceBundles. Update may fail because of concurrent write to Zookeeper.
+                    if (splittedBundles != null) {
+                        checkNotNull(splittedBundles.getLeft());
+                        checkNotNull(splittedBundles.getRight());
+                        checkArgument(splittedBundles.getRight().size() == 2, "bundle has to be split in two bundles");
+                        NamespaceName nsname = bundle.getNamespaceObject();
+                        if (LOG.isDebugEnabled()) {
+                            LOG.debug("[{}] splitAndOwnBundleOnce: {}, counter: {},  2 bundles: {}, {}",
+                                nsname.toString(), bundle.getBundleRange(), counter.get(),
+                                splittedBundles != null ? splittedBundles.getRight().get(0).getBundleRange() : "null splittedBundles",
+                                splittedBundles != null ? splittedBundles.getRight().get(1).getBundleRange() : "null splittedBundles");
+                        }
+                        try {
+                            // take ownership of newly split bundles
+                            for (NamespaceBundle sBundle : splittedBundles.getRight()) {
+                                checkNotNull(ownershipCache.tryAcquiringOwnership(sBundle));
+                            }
+                            updateNamespaceBundles(nsname, splittedBundles.getLeft(),
+                                (rc, path, zkCtx, stat) ->  {
+                                    if (rc == Code.OK.intValue()) {
+                                        // invalidate cache as zookeeper has new split
+                                        // namespace bundle
+                                        bundleFactory.invalidateBundleCache(bundle.getNamespaceObject());
+
+                                        updateFuture.complete(splittedBundles.getRight());
+                                    } else if (rc == Code.BADVERSION.intValue()) {
+                                        KeeperException keeperException = KeeperException.create(KeeperException.Code.get(rc));
+                                        String msg = format("failed to update namespace policies [%s], NamespaceBundle: %s " +
+                                                "due to %s, counter: %d",
+                                            nsname.toString(), bundle.getBundleRange(),
+                                            keeperException.getMessage(), counter.get());
+                                        LOG.warn(msg);
+                                        updateFuture.completeExceptionally(new ServerMetadataException(keeperException));
+                                    } else {
+                                        String msg = format("failed to update namespace policies [%s], NamespaceBundle: %s due to %s",
+                                            nsname.toString(), bundle.getBundleRange(),
+                                            KeeperException.create(KeeperException.Code.get(rc)).getMessage());
+                                        LOG.warn(msg);
+                                        updateFuture.completeExceptionally(new ServiceUnitNotReadyException(msg));
+                                    }
+                                });
+                        } catch (Exception e) {
+                            String msg = format("failed to acquire ownership of split bundle for namespace [%s], %s",
+                                nsname.toString(), e.getMessage());
+                            LOG.warn(msg, e);
                             updateFuture.completeExceptionally(new ServiceUnitNotReadyException(msg));
                         }
-                    });
-            } catch (Exception e) {
-                String msg = format("failed to acquire ownership of split bundle for namespace [%s], %s",
-                    nsname.toString(), e.getMessage());
-                LOG.warn(msg, e);
-                updateFuture.completeExceptionally(new ServiceUnitNotReadyException(msg));
-            }
-        } else {
-            String msg = format("bundle %s not found under namespace", bundle.toString());
-            LOG.warn(msg);
-            updateFuture.completeExceptionally(new ServiceUnitNotReadyException(msg));
-        }
-
-        // If success updateNamespaceBundles, then do invalidateBundleCache and unload.
-        // Else retry splitAndOwnBundleOnceAndRetry.
-        updateFuture.whenCompleteAsync((r, t)-> {
-            if (t != null) {
-                // retry several times on BadVersion
-                if ((t instanceof ServerMetadataException) && (counter.decrementAndGet() >= 0)) {
-                    pulsar.getOrderedExecutor()
-                            .execute(() -> splitAndOwnBundleOnceAndRetry(bundle, unload, counter, unloadFuture));
-                } else {
-                    // Retry enough, or meet other exception
-                    String msg2 = format(" %s not success update nsBundles, counter %d, reason %s",
-                        bundle.toString(), counter.get(), t.getMessage());
-                    LOG.warn(msg2);
-                    unloadFuture.completeExceptionally(new ServiceUnitNotReadyException(msg2));
+                    } else {
+                        String msg = format("bundle %s not found under namespace", bundle.toString());
+                        LOG.warn(msg);
+                        updateFuture.completeExceptionally(new ServiceUnitNotReadyException(msg));
+                    }
+                } catch (Exception e) {
+                    updateFuture.completeExceptionally(e);
                 }
-                return;
+            } else {
+                updateFuture.completeExceptionally(ex);
             }
 
-            // success updateNamespaceBundles
-            try {
-                // disable old bundle in memory
-                getOwnershipCache().updateBundleState(bundle, false);
+            // If success updateNamespaceBundles, then do invalidateBundleCache and unload.
+            // Else retry splitAndOwnBundleOnceAndRetry.
+            updateFuture.whenCompleteAsync((r, t)-> {
+                if (t != null) {
+                    // retry several times on BadVersion
+                    if ((t instanceof ServerMetadataException) && (counter.decrementAndGet() >= 0)) {
+                        pulsar.getOrderedExecutor()
+                            .execute(() -> splitAndOwnBundleOnceAndRetry(bundle, unload, counter, unloadFuture, splitAlgorithm));
+                    } else if (t instanceof IllegalArgumentException) {
+                        unloadFuture.completeExceptionally(t);
+                    } else {
+                        // Retry enough, or meet other exception
+                        String msg2 = format(" %s not success update nsBundles, counter %d, reason %s",
+                            bundle.toString(), counter.get(), t.getMessage());
+                        LOG.warn(msg2);
+                        unloadFuture.completeExceptionally(new ServiceUnitNotReadyException(msg2));
+                    }
+                    return;
+                }
 
-                // update bundled_topic cache for load-report-generation
-                pulsar.getBrokerService().refreshTopicToStatsMaps(bundle);
-                loadManager.get().setLoadReportForceUpdateFlag();
+                // success updateNamespaceBundles
+                try {
+                    // disable old bundle in memory
+                    getOwnershipCache().updateBundleState(bundle, false);
+
+                    // update bundled_topic cache for load-report-generation
+                    pulsar.getBrokerService().refreshTopicToStatsMaps(bundle);
+                    loadManager.get().setLoadReportForceUpdateFlag();
+
+                    if (unload) {
+                        // unload new split bundles
+                        r.forEach(splitBundle -> {
+                            try {
+                                unloadNamespaceBundle(splitBundle);
+                            } catch (Exception e) {
+                                LOG.warn("Failed to unload split bundle {}", splitBundle, e);
+                                throw new RuntimeException("Failed to unload split bundle " + splitBundle, e);
+                            }
+                        });
+                    }
 
-                if (unload) {
-                    // unload new split bundles
-                    r.forEach(splitBundle -> {
-                        try {
-                            unloadNamespaceBundle(splitBundle);
-                        } catch (Exception e) {
-                            LOG.warn("Failed to unload split bundle {}", splitBundle, e);
-                            throw new RuntimeException("Failed to unload split bundle " + splitBundle, e);
-                        }
-                    });
+                    unloadFuture.complete(null);
+                } catch (Exception e) {
+                    String msg1 = format(
+                        "failed to disable bundle %s under namespace [%s] with error %s",
+                        bundle.getNamespaceObject().toString(), bundle.toString(), e.getMessage());
+                    LOG.warn(msg1, e);
+                    unloadFuture.completeExceptionally(new ServiceUnitNotReadyException(msg1));
                 }
-
-                unloadFuture.complete(null);
-            } catch (Exception e) {
-                String msg1 = format(
-                    "failed to disable bundle %s under namespace [%s] with error %s",
-                    bundle.getNamespaceObject().toString(), bundle.toString(), e.getMessage());
-                LOG.warn(msg1, e);
-                unloadFuture.completeExceptionally(new ServiceUnitNotReadyException(msg1));
-            }
-            return;
-        }, pulsar.getOrderedExecutor());
+                return;
+            }, pulsar.getOrderedExecutor());
+        });
     }
 
     /**
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnedBundle.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnedBundle.java
index eb73295a81dc7..bc92ac2a42a94 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnedBundle.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/OwnedBundle.java
@@ -86,7 +86,7 @@ public NamespaceBundle getNamespaceBundle() {
      * 
      * @param pulsar
      * @param timeout
-     *            timeout for unloading bundle. It doesn't throw exception if it timesout while waiting on closing all
+     *            timeout for unloading bundle. It doesn't throw exception if it times out while waiting on closing all
      *            topics
      * @param timeoutUnit
      * @throws Exception
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
index 638c8c7937f1e..b1a166ea26f14 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java
@@ -80,6 +80,8 @@ public abstract class AbstractTopic implements Topic {
     // schema validation enforced flag
     protected volatile boolean schemaValidationEnforced = false;
 
+    protected volatile int maxUnackedMessagesOnConsumer = -1;
+
     protected volatile PublishRateLimiter topicPublishRateLimiter;
 
     private LongAdder bytesInCounter = new LongAdder();
@@ -275,7 +277,7 @@ public void incrementPublishCount(int numOfMessages, long msgSizeInBytes) {
     public void resetTopicPublishCountAndEnableReadIfRequired() {
         // broker rate not exceeded. and completed topic limiter reset.
         if (!getBrokerPublishRateLimiter().isPublishRateExceeded() && topicPublishRateLimiter.resetPublishCount()) {
-            enableProducerRead();
+            enableProducerReadForPublishRateLimiting();
         }
     }
 
@@ -283,16 +285,28 @@ public void resetTopicPublishCountAndEnableReadIfRequired() {
     public void resetBrokerPublishCountAndEnableReadIfRequired(boolean doneBrokerReset) {
         // topic rate not exceeded, and completed broker limiter reset.
         if (!topicPublishRateLimiter.isPublishRateExceeded() && doneBrokerReset) {
-            enableProducerRead();
+            enableProducerReadForPublishRateLimiting();
         }
     }
 
     /**
      * it sets cnx auto-readable if producer's cnx is disabled due to publish-throttling
      */
-    protected void enableProducerRead() {
+    protected void enableProducerReadForPublishRateLimiting() {
+        if (producers != null) {
+            producers.values().forEach(producer -> {
+                producer.getCnx().cancelPublishRateLimiting();
+                producer.getCnx().enableCnxAutoRead();
+            });
+        }
+    }
+
+    protected void enableProducerReadForPublishBufferLimiting() {
         if (producers != null) {
-            producers.values().forEach(producer -> producer.getCnx().enableCnxAutoRead());
+            producers.values().forEach(producer -> {
+                producer.getCnx().cancelPublishBufferLimiting();
+                producer.getCnx().enableCnxAutoRead();
+            });
         }
     }
 
@@ -387,7 +401,7 @@ private void updatePublishDispatcher(Policies policies) {
         } else {
             log.info("Disabling publish throttling for {}", this.topic);
             this.topicPublishRateLimiter = PublishRateLimiter.DISABLED_RATE_LIMITER;
-            enableProducerRead();
+            enableProducerReadForPublishRateLimiting();
         }
     }
 
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
index 1d15b003d8c0f..fd47425bfaac5 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BacklogQuotaManager.java
@@ -65,8 +65,7 @@ public BacklogQuota getBacklogQuota(String namespace, String policyPath) {
                     .map(p -> p.backlog_quota_map.getOrDefault(BacklogQuotaType.destination_storage, defaultQuota))
                     .orElse(defaultQuota);
         } catch (Exception e) {
-            log.error(String.format("Failed to read policies data, will apply the default backlog quota: namespace=%s",
-                    namespace), e);
+            log.error("Failed to read policies data, will apply the default backlog quota: namespace={}", namespace, e);
             return this.defaultQuota;
         }
     }
@@ -145,7 +144,7 @@ private void dropBacklog(PersistentTopic persistentTopic, BacklogQuota quota) {
             }
 
             // Calculate number of messages to be skipped using the current backlog and the skip factor.
-            long entriesInBacklog = slowestConsumer.getNumberOfEntriesInBacklog();
+            long entriesInBacklog = slowestConsumer.getNumberOfEntriesInBacklog(false);
             int messagesToSkip = (int) (messageSkipFactor * entriesInBacklog);
             try {
                 // If there are no messages to skip, break out of the loop
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
index 4ea2d472cff76..7d48f76b71e90 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
@@ -27,6 +27,7 @@
 import static org.apache.pulsar.broker.cache.LocalZooKeeperCacheService.LOCAL_POLICIES_ROOT;
 import static org.apache.pulsar.broker.web.PulsarWebResource.joinPath;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Queues;
@@ -58,6 +59,7 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.atomic.LongAdder;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -121,6 +123,7 @@
 import org.apache.pulsar.common.partition.PartitionedTopicMetadata;
 import org.apache.pulsar.common.policies.data.ClusterData;
 import org.apache.pulsar.common.policies.data.LocalPolicies;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.apache.pulsar.common.policies.data.PersistencePolicies;
 import org.apache.pulsar.common.policies.data.PersistentOfflineTopicStats;
 import org.apache.pulsar.common.policies.data.Policies;
@@ -184,6 +187,7 @@ public class BrokerService implements Closeable, ZooKeeperCacheListener<Policies
     private final ScheduledExecutorService inactivityMonitor;
     private final ScheduledExecutorService messageExpiryMonitor;
     private final ScheduledExecutorService compactionMonitor;
+    private final ScheduledExecutorService messagePublishBufferMonitor;
     private ScheduledExecutorService topicPublishRateLimiterMonitor;
     private ScheduledExecutorService brokerPublishRateLimiterMonitor;
     protected volatile PublishRateLimiter brokerPublishRateLimiter = PublishRateLimiter.DISABLED_RATE_LIMITER;
@@ -215,8 +219,15 @@ public class BrokerService implements Closeable, ZooKeeperCacheListener<Policies
     private Channel listenChannel;
     private Channel listenChannelTls;
 
+    private final long maxMessagePublishBufferBytes;
+    private final long resumeProducerReadMessagePublishBufferBytes;
+    private volatile boolean reachMessagePublishBufferThreshold;
+
     public BrokerService(PulsarService pulsar) throws Exception {
         this.pulsar = pulsar;
+        this.maxMessagePublishBufferBytes = pulsar.getConfiguration().getMaxMessagePublishBufferSizeInMB() > 0 ?
+            pulsar.getConfiguration().getMaxMessagePublishBufferSizeInMB() * 1024 * 1024 : -1;
+        this.resumeProducerReadMessagePublishBufferBytes = this.maxMessagePublishBufferBytes / 2;
         this.managedLedgerFactory = pulsar.getManagedLedgerFactory();
         this.topics = new ConcurrentOpenHashMap<>();
         this.replicationClients = new ConcurrentOpenHashMap<>();
@@ -256,6 +267,8 @@ public BrokerService(PulsarService pulsar) throws Exception {
                 .newSingleThreadScheduledExecutor(new DefaultThreadFactory("pulsar-msg-expiry-monitor"));
         this.compactionMonitor =
             Executors.newSingleThreadScheduledExecutor(new DefaultThreadFactory("pulsar-compaction-monitor"));
+        this.messagePublishBufferMonitor =
+            Executors.newSingleThreadScheduledExecutor(new DefaultThreadFactory("pulsar-publish-buffer-monitor"));
 
         this.backlogQuotaManager = new BacklogQuotaManager(pulsar);
         this.backlogQuotaChecker = Executors
@@ -385,6 +398,7 @@ public void start() throws Exception {
         this.startInactivityMonitor();
         this.startMessageExpiryMonitor();
         this.startCompactionMonitor();
+        this.startMessagePublishBufferMonitor();
         this.startBacklogQuotaChecker();
         this.updateBrokerPublisherThrottlingMaxRate();
         // register listener to capture zk-latency
@@ -437,6 +451,14 @@ protected void startCompactionMonitor() {
         }
     }
 
+    protected void startMessagePublishBufferMonitor() {
+        int interval = pulsar().getConfiguration().getMessagePublishBufferCheckIntervalInMillis();
+        if (interval > 0 && maxMessagePublishBufferBytes > 0) {
+            messagePublishBufferMonitor.scheduleAtFixedRate(safeRun(this::checkMessagePublishBuffer),
+                                                            interval, interval, TimeUnit.MILLISECONDS);
+        }
+    }
+
     protected void startBacklogQuotaChecker() {
         if (pulsar().getConfiguration().isBacklogQuotaCheckEnabled()) {
             final int interval = pulsar().getConfiguration().getBacklogQuotaCheckIntervalInSeconds();
@@ -464,7 +486,7 @@ public synchronized void setupTopicPublishRateLimiterMonitor() {
                     // schedule task that sums up publish-rate across all cnx on a topic
                     topicPublishRateLimiterMonitor.scheduleAtFixedRate(safeRun(() -> checkTopicPublishThrottlingRate()),
                             topicTickTimeMs, topicTickTimeMs, TimeUnit.MILLISECONDS);
-                    // schedule task that refreshes rate-limitting bucket
+                    // schedule task that refreshes rate-limiting bucket
                     topicPublishRateLimiterMonitor.scheduleAtFixedRate(safeRun(() -> refreshTopicPublishRate()), 1, 1,
                             TimeUnit.SECONDS);
                 }
@@ -503,7 +525,7 @@ public synchronized void setupBrokerPublishRateLimiterMonitor() {
                         brokerTickTimeMs,
                         brokerTickTimeMs,
                         TimeUnit.MILLISECONDS);
-                    // schedule task that refreshes rate-limitting bucket
+                    // schedule task that refreshes rate-limiting bucket
                     brokerPublishRateLimiterMonitor.scheduleAtFixedRate(
                         safeRun(() -> refreshBrokerPublishRate()),
                         1,
@@ -982,7 +1004,8 @@ public CompletableFuture<ManagedLedgerConfig> getManagedLedgerConfig(TopicName t
             managedLedgerConfig.setRetentionTime(retentionPolicies.getRetentionTimeInMinutes(), TimeUnit.MINUTES);
             managedLedgerConfig.setRetentionSizeInMB(retentionPolicies.getRetentionSizeInMB());
 
-            managedLedgerConfig.setLedgerOffloader(pulsar.getManagedLedgerOffloader());
+            OffloadPolicies offloadPolicies = policies.map(p -> p.offload_policies).orElse(null);
+            managedLedgerConfig.setLedgerOffloader(pulsar.getManagedLedgerOffloader(namespace, offloadPolicies));
             policies.ifPresent(p -> {
                     long lag = serviceConfig.getManagedLedgerOffloadDeletionLagMs();
                     if (p.offload_deletion_lag_ms != null) {
@@ -1200,7 +1223,7 @@ public void checkTopicNsOwnership(final String topic) throws RuntimeException {
         try {
             ownedByThisInstance = pulsar.getNamespaceService().isServiceUnitOwned(topicName);
         } catch (Exception e) {
-            log.debug(String.format("Failed to check the ownership of the topic: %s", topicName), e);
+            log.debug("Failed to check the ownership of the topic: {}", topicName, e);
             throw new RuntimeException(new ServerMetadataException(e));
         }
 
@@ -1384,7 +1407,7 @@ public String generateUniqueProducerName() {
     public Map<String, TopicStats> getTopicStats() {
         HashMap<String, TopicStats> stats = new HashMap<>();
 
-        forEachTopic(topic -> stats.put(topic.getName(), topic.getStats()));
+        forEachTopic(topic -> stats.put(topic.getName(), topic.getStats(false)));
 
         return stats;
     }
@@ -1871,7 +1894,7 @@ public ConcurrentOpenHashMap<String, ConcurrentOpenHashMap<String, ConcurrentOpe
     }
 
     /**
-     * If per-broker unack message reached to limit then it blocks dispatcher if its unack message limit has been
+     * If per-broker unacked message reached to limit then it blocks dispatcher if its unacked message limit has been
      * reached to {@link #maxUnackedMsgsPerDispatcher}
      *
      * @param dispatcher
@@ -2009,4 +2032,36 @@ public Optional<Integer> getListenPortTls() {
             return Optional.empty();
         }
     }
+
+    private void checkMessagePublishBuffer() {
+        AtomicLong currentMessagePublishBufferBytes = new AtomicLong();
+        foreachProducer(producer -> currentMessagePublishBufferBytes.addAndGet(producer.getCnx().getMessagePublishBufferSize()));
+        if (currentMessagePublishBufferBytes.get() >= maxMessagePublishBufferBytes
+            && !reachMessagePublishBufferThreshold) {
+            reachMessagePublishBufferThreshold = true;
+        }
+        if (currentMessagePublishBufferBytes.get() < resumeProducerReadMessagePublishBufferBytes
+            && reachMessagePublishBufferThreshold) {
+            reachMessagePublishBufferThreshold = false;
+            forEachTopic(topic -> ((AbstractTopic) topic).enableProducerReadForPublishBufferLimiting());
+        }
+    }
+
+    private void foreachProducer(Consumer<Producer> consumer) {
+        topics.forEach((n, t) -> {
+            Optional<Topic> topic = extractTopic(t);
+            topic.ifPresent(value -> value.getProducers().values().forEach(consumer));
+        });
+    }
+
+    public boolean isReachMessagePublishBufferThreshold() {
+        return reachMessagePublishBufferThreshold;
+    }
+
+    @VisibleForTesting
+    long getCurrentMessagePublishBufferSize() {
+        AtomicLong currentMessagePublishBufferBytes = new AtomicLong();
+        foreachProducer(producer -> currentMessagePublishBufferBytes.addAndGet(producer.getCnx().getMessagePublishBufferSize()));
+        return currentMessagePublishBufferBytes.get();
+    }
 }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
index 731ae09e4c035..06393f210b14b 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
@@ -79,6 +79,9 @@ public class Consumer {
     private final Rate msgOut;
     private final Rate msgRedeliver;
 
+    private long lastConsumedTimestamp;
+    private long lastAckedTimestamp;
+
     // Represents how many messages we can safely send to the consumer without
     // overflowing its receiving queue. The consumer will use Flow commands to
     // increase its availability
@@ -188,6 +191,7 @@ public boolean readCompacted() {
      */
     public ChannelPromise sendMessages(final List<Entry> entries, EntryBatchSizes batchSizes, int totalMessages,
             long totalBytes, RedeliveryTracker redeliveryTracker) {
+        this.lastConsumedTimestamp = System.currentTimeMillis();
         final ChannelHandlerContext ctx = cnx.ctx();
         final ChannelPromise writePromise = ctx.newPromise();
 
@@ -335,6 +339,7 @@ void doUnsubscribe(final long requestId) {
     }
 
     void messageAcked(CommandAck ack) {
+        this.lastAckedTimestamp = System.currentTimeMillis();
         Map<String,Long> properties = Collections.emptyMap();
         if (ack.getPropertiesCount() > 0) {
             properties = ack.getPropertiesList().stream()
@@ -450,6 +455,8 @@ public void updateRates() {
     }
 
     public ConsumerStats getStats() {
+        stats.lastAckedTimestamp = lastAckedTimestamp;
+        stats.lastConsumedTimestamp = lastConsumedTimestamp;
         stats.availablePermits = getAvailablePermits();
         stats.unackedMessages = unackedMessages;
         stats.blockedConsumerOnUnackedMsgs = blockedConsumerOnUnackedMsgs;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Producer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Producer.java
index b6c2b496c522c..a7c97da3414b7 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Producer.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Producer.java
@@ -147,7 +147,7 @@ public void publishMessage(long producerId, long lowestSequenceId, long highestS
             cnx.ctx().channel().eventLoop().execute(() -> {
                 cnx.ctx().writeAndFlush(Commands.newSendError(producerId, highestSequenceId, ServerError.MetadataError,
                         "Invalid lowest or highest sequence id"));
-                cnx.completedSendOperation(isNonPersistentTopic);
+                cnx.completedSendOperation(isNonPersistentTopic, headersAndPayload.readableBytes());
             });
             return;
         }
@@ -160,7 +160,7 @@ public void beforePublish(long producerId, long sequenceId, ByteBuf headersAndPa
             cnx.ctx().channel().eventLoop().execute(() -> {
                 cnx.ctx().writeAndFlush(Commands.newSendError(producerId, sequenceId, ServerError.PersistenceError,
                         "Producer is closed"));
-                cnx.completedSendOperation(isNonPersistentTopic);
+                cnx.completedSendOperation(isNonPersistentTopic, headersAndPayload.readableBytes());
             });
 
             return;
@@ -170,7 +170,7 @@ public void beforePublish(long producerId, long sequenceId, ByteBuf headersAndPa
             cnx.ctx().channel().eventLoop().execute(() -> {
                 cnx.ctx().writeAndFlush(
                         Commands.newSendError(producerId, sequenceId, ServerError.ChecksumError, "Checksum failed on the broker"));
-                cnx.completedSendOperation(isNonPersistentTopic);
+                cnx.completedSendOperation(isNonPersistentTopic, headersAndPayload.readableBytes());
             });
             return;
         }
@@ -187,7 +187,7 @@ public void beforePublish(long producerId, long sequenceId, ByteBuf headersAndPa
                 cnx.ctx().channel().eventLoop().execute(() -> {
                     cnx.ctx().writeAndFlush(Commands.newSendError(producerId, sequenceId, ServerError.MetadataError,
                             "Messages must be encrypted"));
-                    cnx.completedSendOperation(isNonPersistentTopic);
+                    cnx.completedSendOperation(isNonPersistentTopic, headersAndPayload.readableBytes());
                 });
                 return;
             }
@@ -353,7 +353,7 @@ public void completed(Exception exception, long ledgerId, long entryId) {
                         producer.cnx.ctx().writeAndFlush(Commands.newSendError(producer.producerId, callBackSequenceId,
                                 serverError, exception.getMessage()));
                     }
-                    producer.cnx.completedSendOperation(producer.isNonPersistentTopic);
+                    producer.cnx.completedSendOperation(producer.isNonPersistentTopic, msgSize);
                     producer.publishOperationCompleted();
                     recycle();
                 });
@@ -385,7 +385,7 @@ public void run() {
             producer.cnx.ctx().writeAndFlush(
                     Commands.newSendReceipt(producer.producerId, sequenceId, highestSequenceId, ledgerId, entryId),
                     producer.cnx.ctx().voidPromise());
-            producer.cnx.completedSendOperation(producer.isNonPersistentTopic);
+            producer.cnx.completedSendOperation(producer.isNonPersistentTopic, msgSize);
             producer.publishOperationCompleted();
             recycle();
         }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarChannelInitializer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarChannelInitializer.java
index 9fb81ec2b1631..ce16a7ea99f42 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarChannelInitializer.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarChannelInitializer.java
@@ -18,17 +18,27 @@
  */
 package org.apache.pulsar.broker.service;
 
+import static org.apache.bookkeeper.util.SafeRunnable.safeRun;
+
+import java.net.SocketAddress;
+import java.util.concurrent.TimeUnit;
+
 import org.apache.pulsar.broker.PulsarService;
 import org.apache.pulsar.broker.ServiceConfiguration;
 import org.apache.pulsar.common.protocol.ByteBufPair;
 import org.apache.pulsar.common.protocol.Commands;
 import org.apache.pulsar.common.util.NettySslContextBuilder;
 
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
 import io.netty.handler.flow.FlowControlHandler;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class PulsarChannelInitializer extends ChannelInitializer<SocketChannel> {
 
     public static final String TLS_HANDLER = "tls";
@@ -38,6 +48,14 @@ public class PulsarChannelInitializer extends ChannelInitializer<SocketChannel>
     private final NettySslContextBuilder sslCtxRefresher;
     private final ServiceConfiguration brokerConf;
 
+    // This cache is used to maintain a list of active connections to iterate over them
+    // We keep weak references to have the cache to be auto cleaned up when the connections
+    // objects are GCed.
+    private final Cache<SocketAddress, ServerCnx> connections = Caffeine.newBuilder()
+            .weakKeys()
+            .weakValues()
+            .build();
+
     /**
      * @param pulsar
      *              An instance of {@link PulsarService}
@@ -59,6 +77,10 @@ public PulsarChannelInitializer(PulsarService pulsar, boolean enableTLS) throws
             this.sslCtxRefresher = null;
         }
         this.brokerConf = pulsar.getConfiguration();
+
+        pulsar.getExecutor().scheduleAtFixedRate(safeRun(this::refreshAuthenticationCredentials),
+                pulsar.getConfig().getAuthenticationRefreshCheckSeconds(),
+                pulsar.getConfig().getAuthenticationRefreshCheckSeconds(), TimeUnit.SECONDS);
     }
 
     @Override
@@ -78,6 +100,19 @@ protected void initChannel(SocketChannel ch) throws Exception {
         // ServerCnx ends up reading higher number of messages and broker can not throttle the messages by disabling
         // auto-read.
         ch.pipeline().addLast("flowController", new FlowControlHandler());
-        ch.pipeline().addLast("handler", new ServerCnx(pulsar));
+        ServerCnx cnx = new ServerCnx(pulsar);
+        ch.pipeline().addLast("handler", cnx);
+
+        connections.put(ch.remoteAddress(), cnx);
+    }
+
+    private void refreshAuthenticationCredentials() {
+        connections.asMap().values().forEach(cnx -> {
+            try {
+                cnx.refreshAuthenticationCredentials();
+            } catch (Throwable t) {
+                log.warn("[{}] Failed to refresh auth credentials", cnx.getRemoteAddress());
+            }
+        });
     }
 }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
index 2a78508ed0304..bef63fc7f5b0a 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
@@ -25,6 +25,7 @@
 import static org.apache.pulsar.common.protocol.Commands.newLookupErrorResponse;
 import static org.apache.pulsar.common.api.proto.PulsarApi.ProtocolVersion.v5;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;
 
 import io.netty.buffer.ByteBuf;
@@ -51,7 +52,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pulsar.broker.PulsarServerException;
 import org.apache.pulsar.broker.PulsarService;
-import org.apache.pulsar.broker.authentication.AuthenticationDataCommand;
 import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
 import org.apache.pulsar.broker.authentication.AuthenticationProvider;
 import org.apache.pulsar.broker.authentication.AuthenticationState;
@@ -94,6 +94,7 @@
 import org.apache.pulsar.common.api.proto.PulsarApi.CommandSubscribe.InitialPosition;
 import org.apache.pulsar.common.api.proto.PulsarApi.CommandSubscribe.SubType;
 import org.apache.pulsar.common.api.proto.PulsarApi.CommandUnsubscribe;
+import org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags;
 import org.apache.pulsar.common.api.proto.PulsarApi.MessageIdData;
 import org.apache.pulsar.common.api.proto.PulsarApi.MessageMetadata;
 import org.apache.pulsar.common.api.proto.PulsarApi.ProtocolVersion;
@@ -127,6 +128,10 @@ public class ServerCnx extends PulsarHandler {
     AuthenticationDataSource authenticationData;
     AuthenticationProvider authenticationProvider;
     AuthenticationState authState;
+    // In case of proxy, if the authentication credentials are forwardable,
+    // it will hold the credentials of the original client
+    AuthenticationState originalAuthState;
+    private boolean pendingAuthChallengeResponse = false;
 
     // Max number of pending requests per connections. If multiple producers are sharing the same connection the flow
     // control done by a single producer might not be enough to prevent write spikes on the broker.
@@ -143,9 +148,13 @@ public class ServerCnx extends PulsarHandler {
     private final boolean schemaValidationEnforced;
     private String authMethod = "none";
     private final int maxMessageSize;
-    
+
     // Flag to manage throttling-rate by atomically enable/disable read-channel.
     private volatile boolean autoReadDisabledRateLimiting = false;
+    private FeatureFlags features;
+    // Flag to manage throttling-publish-buffer by atomically enable/disable read-channel.
+    private volatile boolean autoReadDisabledPublishBufferLimiting = false;
+    private volatile long messagePublishBufferSize = 0;
 
     enum State {
         Start, Connected, Failed, Connecting
@@ -445,26 +454,13 @@ CommandConsumerStatsResponse.Builder createConsumerStatsResponse(Consumer consum
         commandConsumerStatsResponseBuilder.setConnectedSince(consumerStats.getConnectedSince());
 
         Subscription subscription = consumer.getSubscription();
-        commandConsumerStatsResponseBuilder.setMsgBacklog(subscription.getNumberOfEntriesInBacklog());
+        commandConsumerStatsResponseBuilder.setMsgBacklog(subscription.getNumberOfEntriesInBacklog(false));
         commandConsumerStatsResponseBuilder.setMsgRateExpired(subscription.getExpiredMessageRate());
         commandConsumerStatsResponseBuilder.setType(subscription.getTypeString());
 
         return commandConsumerStatsResponseBuilder;
     }
 
-    private String getOriginalPrincipal(String originalAuthData, String originalAuthMethod, String originalPrincipal,
-            SSLSession sslSession) throws AuthenticationException {
-        if (authenticateOriginalAuthData) {
-            if (originalAuthData != null) {
-                originalPrincipal = getBrokerService().getAuthenticationService().authenticate(
-                        new AuthenticationDataCommand(originalAuthData, remoteAddress, sslSession), originalAuthMethod);
-            } else {
-                originalPrincipal = null;
-            }
-        }
-        return originalPrincipal;
-    }
-
     // complete the connect and sent newConnected command
     private void completeConnect(int clientProtoVersion, String clientVersion) {
         ctx.writeAndFlush(Commands.newConnected(clientProtoVersion, maxMessageSize));
@@ -476,19 +472,53 @@ private void completeConnect(int clientProtoVersion, String clientVersion) {
     }
 
     // According to auth result, send newConnected or newAuthChallenge command.
-    private void doAuthentication(AuthData clientData,
-                                  int clientProtocolVersion,
-                                  String clientVersion) throws Exception {
+    private State doAuthentication(AuthData clientData,
+                                   int clientProtocolVersion,
+                                   String clientVersion) throws Exception {
+
+        // The original auth state can only be set on subsequent auth attempts (and only
+        // in presence of a proxy and if the proxy is forwarding the credentials).
+        // In this case, the re-validation needs to be done against the original client
+        // credentials.
+        boolean useOriginalAuthState = (originalAuthState != null);
+        AuthenticationState authState =  useOriginalAuthState ? originalAuthState : this.authState;
+        String authRole = useOriginalAuthState ? originalPrincipal : this.authRole;
         AuthData brokerData = authState.authenticate(clientData);
-        // authentication has completed, will send newConnected command.
+
+
         if (authState.isComplete()) {
-            authRole = authState.getAuthRole();
+            // Authentication has completed. It was either:
+            // 1. the 1st time the authentication process was done, in which case we'll
+            //    a `CommandConnected` response
+            // 2. an authentication refresh, in which case we don't need to do anything else
+
+            String newAuthRole = authState.getAuthRole();
+
+            if (!useOriginalAuthState) {
+                this.authRole = newAuthRole;
+            }
+
             if (log.isDebugEnabled()) {
                 log.debug("[{}] Client successfully authenticated with {} role {} and originalPrincipal {}",
-                    remoteAddress, authMethod, authRole, originalPrincipal);
+                        remoteAddress, authMethod, authRole, originalPrincipal);
             }
-            completeConnect(clientProtocolVersion, clientVersion);
-            return;
+
+            if (state != State.Connected) {
+                // First time authentication is done
+                completeConnect(clientProtocolVersion, clientVersion);
+            } else {
+                // If the connection was already ready, it means we're doing a refresh
+                if (!StringUtils.isEmpty(authRole)) {
+                    if (!authRole.equals(newAuthRole)) {
+                        log.warn("[{}] Principal cannot be changed during an authentication refresh", remoteAddress);
+                        ctx.close();
+                    } else {
+                        log.info("[{}] Refreshed authentication credentials", remoteAddress);
+                    }
+                }
+            }
+
+            return State.Connected;
         }
 
         // auth not complete, continue auth with client side.
@@ -497,8 +527,60 @@ private void doAuthentication(AuthData clientData,
             log.debug("[{}] Authentication in progress client by method {}.",
                 remoteAddress, authMethod);
         }
-        state = State.Connecting;
-        return;
+        return State.Connecting;
+    }
+
+    public void refreshAuthenticationCredentials() {
+        AuthenticationState authState = this.originalAuthState != null ? originalAuthState : this.authState;
+
+        if (authState == null) {
+            // Authentication is disabled or there's no local state to refresh
+            return;
+        } else if (getState() != State.Connected || !isActive) {
+            // Connection is either still being established or already closed.
+            return;
+        } else if (authState != null && !authState.isExpired()) {
+            // Credentials are still valid. Nothing to do at this point
+            return;
+        } else if (originalPrincipal != null && originalAuthState == null) {
+            log.info(
+                    "[{}] Cannot revalidate user credential when using proxy and not forwarding the credentials. Closing connection",
+                    remoteAddress);
+            return;
+        }
+
+        ctx.executor().execute(SafeRun.safeRun(() -> {
+            log.info("[{}] Refreshing authentication credentials", remoteAddress);
+
+            if (!supportsAuthenticationRefresh()) {
+                log.warn("[{}] Closing connection because client doesn't support auth credentials refresh", remoteAddress);
+                ctx.close();
+                return;
+            }
+
+            if (pendingAuthChallengeResponse) {
+                log.warn("[{}] Closing connection after timeout on refreshing auth credentials", remoteAddress);
+                ctx.close();
+                return;
+            }
+
+            try {
+                AuthData brokerData = authState.refreshAuthentication();
+
+                ctx.writeAndFlush(Commands.newAuthChallenge(authMethod, brokerData, remoteEndpointProtocolVersion));
+                if (log.isDebugEnabled()) {
+                    log.debug("[{}] Sent auth challenge to client to refresh credentials with method: {}.",
+                        remoteAddress, authMethod);
+                }
+
+                pendingAuthChallengeResponse = true;
+
+            } catch (AuthenticationException e) {
+                log.warn("[{}] Failed to refresh authentication: ",
+                        remoteAddress, e.getMessage());
+                ctx.close();
+            }
+        }));
     }
 
     @Override
@@ -512,6 +594,7 @@ protected void handleConnect(CommandConnect connect) {
 
         String clientVersion = connect.getClientVersion();
         int clientProtocolVersion = connect.getProtocolVersion();
+        features = connect.getFeatureFlags();
 
         if (!service.isAuthenticationEnabled()) {
             completeConnect(clientProtocolVersion, clientVersion);
@@ -551,18 +634,34 @@ protected void handleConnect(CommandConnect connect) {
             if (sslHandler != null) {
                 sslSession = ((SslHandler) sslHandler).engine().getSession();
             }
-            originalPrincipal = getOriginalPrincipal(
-                connect.hasOriginalAuthData() ? connect.getOriginalAuthData() : null,
-                connect.hasOriginalAuthMethod() ? connect.getOriginalAuthMethod() : null,
-                connect.hasOriginalPrincipal() ? connect.getOriginalPrincipal() : null,
-                sslSession);
 
             authState = authenticationProvider.newAuthState(clientData, remoteAddress, sslSession);
             authenticationData = authState.getAuthDataSource();
-            doAuthentication(clientData, clientProtocolVersion, clientVersion);
+            state = doAuthentication(clientData, clientProtocolVersion, clientVersion);
+
+            // This will fail the check if:
+            //  1. client is coming through a proxy
+            //  2. we require to validate the original credentials
+            //  3. no credentials were passed
+            if (connect.hasOriginalPrincipal() && service.getPulsar().getConfig().isAuthenticateOriginalAuthData()) {
+                AuthenticationProvider originalAuthenticationProvider = getBrokerService()
+                        .getAuthenticationService()
+                        .getAuthenticationProvider(authMethod);
+                originalAuthState = originalAuthenticationProvider.newAuthState(
+                        AuthData.of(connect.getOriginalAuthData().getBytes()),
+                        remoteAddress,
+                        sslSession);
+                originalPrincipal = originalAuthState.getAuthRole();
+            } else {
+                originalPrincipal = connect.hasOriginalPrincipal() ? connect.getOriginalPrincipal() : null;
+            }
         } catch (Exception e) {
             String msg = "Unable to authenticate";
-            log.warn("[{}] {} ", remoteAddress, msg, e);
+            if (e instanceof AuthenticationException) {
+                log.warn("[{}] {}: {}", remoteAddress, msg, e.getMessage());
+            } else {
+                log.warn("[{}] {}", remoteAddress, msg, e);
+            }
             ctx.writeAndFlush(Commands.newError(-1, ServerError.AuthenticationError, msg));
             close();
         }
@@ -570,10 +669,11 @@ protected void handleConnect(CommandConnect connect) {
 
     @Override
     protected void handleAuthResponse(CommandAuthResponse authResponse) {
-        checkArgument(state == State.Connecting);
         checkArgument(authResponse.hasResponse());
         checkArgument(authResponse.getResponse().hasAuthData() && authResponse.getResponse().hasAuthMethodName());
 
+        pendingAuthChallengeResponse = false;
+
         if (log.isDebugEnabled()) {
             log.debug("Received AuthResponse from {}, auth method: {}",
                 remoteAddress, authResponse.getResponse().getAuthMethodName());
@@ -582,10 +682,14 @@ protected void handleAuthResponse(CommandAuthResponse authResponse) {
         try {
             AuthData clientData = AuthData.of(authResponse.getResponse().getAuthData().toByteArray());
             doAuthentication(clientData, authResponse.getProtocolVersion(), authResponse.getClientVersion());
+        } catch (AuthenticationException e) {
+            log.warn("[{}] Authentication failed: {} ", remoteAddress, e.getMessage());
+            ctx.writeAndFlush(Commands.newError(-1, ServerError.AuthenticationError, e.getMessage()));
+            close();
         } catch (Exception e) {
             String msg = "Unable to handleAuthResponse";
             log.warn("[{}] {} ", remoteAddress, msg, e);
-            ctx.writeAndFlush(Commands.newError(-1, ServerError.AuthenticationError, msg));
+            ctx.writeAndFlush(Commands.newError(-1, ServerError.UnknownError, msg));
             close();
         }
     }
@@ -1054,7 +1158,7 @@ protected void handleSend(CommandSend send, ByteBuf headersAndPayload) {
             }
         }
 
-        startSendOperation(producer);
+        startSendOperation(producer, headersAndPayload.readableBytes());
 
         // Persist the message
         if (send.hasHighestSequenceId() && send.getSequenceId() <= send.getHighestSequenceId()) {
@@ -1577,17 +1681,24 @@ public boolean isWritable() {
         return ctx.channel().isWritable();
     }
 
-    public void startSendOperation(Producer producer) {
+    private void startSendOperation(Producer producer, int msgSize) {
+        messagePublishBufferSize += msgSize;
         boolean isPublishRateExceeded = producer.getTopic().isPublishRateExceeded();
         if (++pendingSendRequest == MaxPendingSendRequests || isPublishRateExceeded) {
             // When the quota of pending send requests is reached, stop reading from socket to cause backpressure on
             // client connection, possibly shared between multiple producers
             ctx.channel().config().setAutoRead(false);
             autoReadDisabledRateLimiting = isPublishRateExceeded;
+
+        }
+        if (getBrokerService().isReachMessagePublishBufferThreshold()) {
+            ctx.channel().config().setAutoRead(false);
+            autoReadDisabledPublishBufferLimiting = true;
         }
     }
 
-    public void completedSendOperation(boolean isNonPersistentTopic) {
+    void completedSendOperation(boolean isNonPersistentTopic, int msgSize) {
+        messagePublishBufferSize -= msgSize;
         if (--pendingSendRequest == ResumeReadsThreshold) {
             // Resume reading from socket
             ctx.channel().config().setAutoRead(true);
@@ -1599,18 +1710,31 @@ public void completedSendOperation(boolean isNonPersistentTopic) {
         }
     }
 
-    public void enableCnxAutoRead() {
+    void enableCnxAutoRead() {
         // we can add check (&& pendingSendRequest < MaxPendingSendRequests) here but then it requires
         // pendingSendRequest to be volatile and it can be expensive while writing. also this will be called on if
         // throttling is enable on the topic. so, avoid pendingSendRequest check will be fine.
-        if (!ctx.channel().config().isAutoRead() && autoReadDisabledRateLimiting) {
+        if (!ctx.channel().config().isAutoRead() && !autoReadDisabledRateLimiting && !autoReadDisabledPublishBufferLimiting) {
             // Resume reading from socket if pending-request is not reached to threshold
             ctx.channel().config().setAutoRead(true);
             // triggers channel read
             ctx.read();
+        }
+    }
+
+    @VisibleForTesting
+    void cancelPublishRateLimiting() {
+        if (autoReadDisabledRateLimiting) {
             autoReadDisabledRateLimiting = false;
         }
     }
+
+    @VisibleForTesting
+    void cancelPublishBufferLimiting() {
+        if (autoReadDisabledPublishBufferLimiting) {
+            autoReadDisabledPublishBufferLimiting = false;
+        }
+    }
     
     private <T> ServerError getErrorCode(CompletableFuture<T> future) {
         ServerError error = ServerError.UnknownError;
@@ -1624,7 +1748,7 @@ private <T> ServerError getErrorCode(CompletableFuture<T> future) {
         return error;
     }
 
-    private final void disableTcpNoDelayIfNeeded(String topic, String producerName) {
+    private void disableTcpNoDelayIfNeeded(String topic, String producerName) {
         if (producerName != null && producerName.startsWith(replicatorPrefix)) {
             // Re-enable nagle algorithm on connections used for replication purposes
             try {
@@ -1692,7 +1816,25 @@ public boolean isBatchMessageCompatibleVersion() {
         return remoteEndpointProtocolVersion >= ProtocolVersion.v4.getNumber();
     }
 
+    boolean supportsAuthenticationRefresh() {
+        return features != null && features.getSupportsAuthRefresh();
+    }
+
     public String getClientVersion() {
         return clientVersion;
     }
+
+    public long getMessagePublishBufferSize() {
+        return this.messagePublishBufferSize;
+    }
+
+    @VisibleForTesting
+    void setMessagePublishBufferSize(long bufferSize) {
+        this.messagePublishBufferSize = bufferSize;
+    }
+
+    @VisibleForTesting
+    void setAutoReadDisabledRateLimiting(boolean isLimiting) {
+        this.autoReadDisabledRateLimiting = isLimiting;
+    }
 }
\ No newline at end of file
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Subscription.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Subscription.java
index 18c7c49ae37f5..f7d9687523960 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Subscription.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Subscription.java
@@ -53,7 +53,7 @@ default void removeConsumer(Consumer consumer) throws BrokerServiceException {
 
     Dispatcher getDispatcher();
 
-    long getNumberOfEntriesInBacklog();
+    long getNumberOfEntriesInBacklog(boolean getPreciseBacklog);
 
     default long getNumberOfEntriesDelayed() {
         return 0;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java
index 26af1c1c5c8bf..6b3685deba927 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java
@@ -162,7 +162,7 @@ void updateRates(NamespaceStats nsStats, NamespaceBundleStats currentBundleStats
 
     ConcurrentOpenHashMap<String, ? extends Replicator> getReplicators();
 
-    TopicStats getStats();
+    TopicStats getStats(boolean getPreciseBacklog);
 
     PersistentTopicInternalStats getInternalStats();
 
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentSubscription.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentSubscription.java
index 652042000b6ac..f653ee52b4953 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentSubscription.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentSubscription.java
@@ -250,7 +250,7 @@ public CompletableFuture<Entry> peekNthMessage(int messagePosition) {
     }
 
     @Override
-    public long getNumberOfEntriesInBacklog() {
+    public long getNumberOfEntriesInBacklog(boolean getPreciseBacklog) {
         // No-op
         return 0;
     }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
index 8e3b14fa7f43a..27dc4bb3111bd 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
@@ -697,7 +697,7 @@ public void updateRates(NamespaceStats nsStats, NamespaceBundleStats bundleStats
                 topicStatsStream.endList();
 
                 // Populate subscription specific stats here
-                topicStatsStream.writePair("msgBacklog", subscription.getNumberOfEntriesInBacklog());
+                topicStatsStream.writePair("msgBacklog", subscription.getNumberOfEntriesInBacklog(false));
                 topicStatsStream.writePair("msgRateExpired", subscription.getExpiredMessageRate());
                 topicStatsStream.writePair("msgRateOut", subMsgRateOut);
                 topicStatsStream.writePair("msgThroughputOut", subMsgThroughputOut);
@@ -714,7 +714,7 @@ public void updateRates(NamespaceStats nsStats, NamespaceBundleStats bundleStats
 
                 topicStats.aggMsgRateOut += subMsgRateOut;
                 topicStats.aggMsgThroughputOut += subMsgThroughputOut;
-                nsStats.msgBacklog += subscription.getNumberOfEntriesInBacklog();
+                nsStats.msgBacklog += subscription.getNumberOfEntriesInBacklog(false);
             } catch (Exception e) {
                 log.error("Got exception when creating consumer stats for subscription {}: {}", subscriptionName,
                         e.getMessage(), e);
@@ -751,7 +751,7 @@ public void updateRates(NamespaceStats nsStats, NamespaceBundleStats bundleStats
         topicStatsStream.endObject();
     }
 
-    public NonPersistentTopicStats getStats() {
+    public NonPersistentTopicStats getStats(boolean getPreciseBacklog) {
 
         NonPersistentTopicStats stats = new NonPersistentTopicStats();
 
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/CompactorSubscription.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/CompactorSubscription.java
index 0c3feb31bfd86..5d39c20a2441d 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/CompactorSubscription.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/CompactorSubscription.java
@@ -89,7 +89,7 @@ public void markDeleteFailed(ManagedLedgerException exception, Object ctx) {
                 }
             }, null);
 
-        if (topic.getManagedLedger().isTerminated() && cursor.getNumberOfEntriesInBacklog() == 0) {
+        if (topic.getManagedLedger().isTerminated() && cursor.getNumberOfEntriesInBacklog(false) == 0) {
             // Notify all consumer that the end of topic was reached
             dispatcher.getConsumers().forEach(Consumer::reachedEndOfTopic);
         }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java
index 3f437ddc81566..29eed7305f0d2 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/DispatchRateLimiter.java
@@ -186,6 +186,7 @@ public static boolean isDispatchRateNeeded(final ServiceConfiguration serviceCon
         return true;
     }
 
+    @SuppressWarnings("deprecation")
     public void onPoliciesUpdate(Policies data) {
         String cluster = brokerService.pulsar().getConfiguration().getClusterName();
 
@@ -194,6 +195,9 @@ public void onPoliciesUpdate(Policies data) {
         switch (type) {
             case TOPIC:
                 dispatchRate = data.topicDispatchRate.get(cluster);
+                if (dispatchRate == null) {
+                    dispatchRate = data.clusterDispatchRate.get(cluster);
+                }
                 break;
             case SUBSCRIPTION:
                 dispatchRate = data.subscriptionDispatchRate.get(cluster);
@@ -219,6 +223,7 @@ public void onPoliciesUpdate(Policies data) {
         }
     }
 
+    @SuppressWarnings("deprecation")
     public static DispatchRate getPoliciesDispatchRate(final String cluster, Optional<Policies> policies, Type type) {
         // return policy-dispatch rate only if it's enabled in policies
         return policies.map(p -> {
@@ -226,6 +231,9 @@ public static DispatchRate getPoliciesDispatchRate(final String cluster, Optiona
             switch (type) {
                 case TOPIC:
                     dispatchRate = p.topicDispatchRate.get(cluster);
+                    if (dispatchRate == null) {
+                        dispatchRate = p.clusterDispatchRate.get(cluster);
+                    }
                     break;
                 case SUBSCRIPTION:
                     dispatchRate = p.subscriptionDispatchRate.get(cluster);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java
index 3660ce00c3c72..9457af38d398a 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java
@@ -82,7 +82,6 @@ public class PersistentDispatcherMultipleConsumers extends AbstractDispatcherMul
     protected final RedeliveryTracker redeliveryTracker;
 
     private Optional<DelayedDeliveryTracker> delayedDeliveryTracker = Optional.empty();
-    private final boolean isDelayedDeliveryEnabled;
 
     private volatile boolean havePendingRead = false;
     private volatile boolean havePendingReplayRead = false;
@@ -95,7 +94,6 @@ public class PersistentDispatcherMultipleConsumers extends AbstractDispatcherMul
     private static final AtomicIntegerFieldUpdater<PersistentDispatcherMultipleConsumers> TOTAL_UNACKED_MESSAGES_UPDATER =
             AtomicIntegerFieldUpdater.newUpdater(PersistentDispatcherMultipleConsumers.class, "totalUnackedMessages");
     private volatile int totalUnackedMessages = 0;
-    private final int maxUnackedMessages;
     private volatile int blockedDispatcherOnUnackedMsgs = FALSE;
     private static final AtomicIntegerFieldUpdater<PersistentDispatcherMultipleConsumers> BLOCKED_DISPATCHER_ON_UNACKMSG_UPDATER =
             AtomicIntegerFieldUpdater.newUpdater(PersistentDispatcherMultipleConsumers.class, "blockedDispatcherOnUnackedMsgs");
@@ -117,10 +115,6 @@ public PersistentDispatcherMultipleConsumers(PersistentTopic topic, ManagedCurso
                 ? new InMemoryRedeliveryTracker()
                 : RedeliveryTrackerDisabled.REDELIVERY_TRACKER_DISABLED;
         this.readBatchSize = serviceConfig.getDispatcherMaxReadBatchSize();
-        this.maxUnackedMessages = topic.getBrokerService().pulsar().getConfiguration()
-                .getMaxUnackedMessagesPerSubscription();
-        this.isDelayedDeliveryEnabled = topic.getBrokerService().pulsar().getConfiguration()
-                .isDelayedDeliveryEnabled();
         this.initializeDispatchRateLimiterIfNeeded(Optional.empty());
     }
 
@@ -332,7 +326,7 @@ public void readMoreEntries() {
                 }
             } else if (BLOCKED_DISPATCHER_ON_UNACKMSG_UPDATER.get(this) == TRUE) {
                 log.warn("[{}] Dispatcher read is blocked due to unackMessages {} reached to max {}", name,
-                        totalUnackedMessages, maxUnackedMessages);
+                        totalUnackedMessages, topic.maxUnackedMessagesOnSubscription);
             } else if (!havePendingRead) {
                 if (log.isDebugEnabled()) {
                     log.debug("[{}] Schedule read of {} messages for {} consumers", name, messagesToRead,
@@ -546,7 +540,7 @@ public synchronized void readEntriesFailed(ManagedLedgerException exception, Obj
         long waitTimeMillis = readFailureBackoff.next();
 
         if (exception instanceof NoMoreEntriesToReadException) {
-            if (cursor.getNumberOfEntriesInBacklog() == 0) {
+            if (cursor.getNumberOfEntriesInBacklog(false) == 0) {
                 // Topic has been terminated and there are no more entries to read
                 // Notify the consumer only if all the messages were already acknowledged
                 consumerList.forEach(Consumer::reachedEndOfTopic);
@@ -653,10 +647,16 @@ public synchronized void redeliverUnacknowledgedMessages(Consumer consumer, List
 
     @Override
     public void addUnAckedMessages(int numberOfMessages) {
+        int maxUnackedMessages = topic.maxUnackedMessagesOnSubscription;
+        if (maxUnackedMessages == -1) {
+            maxUnackedMessages = topic.getBrokerService().pulsar().getConfiguration()
+                    .getMaxUnackedMessagesPerSubscription();
+        }
         // don't block dispatching if maxUnackedMessages = 0
         if (maxUnackedMessages <= 0) {
             return;
         }
+
         int unAckedMessages = TOTAL_UNACKED_MESSAGES_UPDATER.addAndGet(this, numberOfMessages);
         if (unAckedMessages >= maxUnackedMessages
                 && BLOCKED_DISPATCHER_ON_UNACKMSG_UPDATER.compareAndSet(this, FALSE, TRUE)) {
@@ -724,7 +724,7 @@ public void initializeDispatchRateLimiterIfNeeded(Optional<Policies> policies) {
 
     @Override
     public boolean trackDelayedDelivery(long ledgerId, long entryId, MessageMetadata msgMetadata) {
-        if (!isDelayedDeliveryEnabled) {
+        if (!topic.delayedDeliveryEnabled) {
             // If broker has the feature disabled, always deliver messages immediately
             return false;
         }
@@ -736,6 +736,7 @@ public boolean trackDelayedDelivery(long ledgerId, long entryId, MessageMetadata
                         .of(topic.getBrokerService().getDelayedDeliveryTrackerFactory().newTracker(this));
             }
 
+            delayedDeliveryTracker.get().resetTickTime(topic.delayedDeliveryTickTimeMillis);
             return delayedDeliveryTracker.get().addMessage(ledgerId, entryId, msgMetadata.getDeliverAtTime());
         }
     }
@@ -745,6 +746,7 @@ private synchronized Set<PositionImpl> getMessagesToReplayNow(int maxMessagesToR
             return messagesToRedeliver.items(maxMessagesToRead,
                     (ledgerId, entryId) -> new PositionImpl(ledgerId, entryId));
         } else if (delayedDeliveryTracker.isPresent() && delayedDeliveryTracker.get().hasMessageAvailable()) {
+            delayedDeliveryTracker.get().resetTickTime(topic.delayedDeliveryTickTimeMillis);
             return delayedDeliveryTracker.get().getScheduledMessages(maxMessagesToRead);
         } else {
             return Collections.emptySet();
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java
index c29fbc85b7879..fe73760171286 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherSingleActiveConsumer.java
@@ -470,7 +470,7 @@ private synchronized void internalReadEntriesFailed(ManagedLedgerException excep
         long waitTimeMillis = readFailureBackoff.next();
 
         if (exception instanceof NoMoreEntriesToReadException) {
-            if (cursor.getNumberOfEntriesInBacklog() == 0) {
+            if (cursor.getNumberOfEntriesInBacklog(false) == 0) {
                 // Topic has been terminated and there are no more entries to read
                 // Notify the consumer only if all the messages were already acknowledged
                 consumers.forEach(Consumer::reachedEndOfTopic);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageExpiryMonitor.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageExpiryMonitor.java
index deb274457bf92..1b761d8fb7af6 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageExpiryMonitor.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageExpiryMonitor.java
@@ -99,7 +99,7 @@ public double getMessageExpiryRate() {
     private final MarkDeleteCallback markDeleteCallback = new MarkDeleteCallback() {
         @Override
         public void markDeleteComplete(Object ctx) {
-            long numMessagesExpired = (long) ctx - cursor.getNumberOfEntriesInBacklog();
+            long numMessagesExpired = (long) ctx - cursor.getNumberOfEntriesInBacklog(false);
             msgExpired.recordMultipleEvents(numMessagesExpired, 0 /* no value stats */);
             updateRates();
 
@@ -119,7 +119,7 @@ public void markDeleteFailed(ManagedLedgerException exception, Object ctx) {
     public void findEntryComplete(Position position, Object ctx) {
         if (position != null) {
             log.info("[{}][{}] Expiring all messages until position {}", topicName, subName, position);
-            cursor.asyncMarkDelete(position, markDeleteCallback, cursor.getNumberOfEntriesInBacklog());
+            cursor.asyncMarkDelete(position, markDeleteCallback, cursor.getNumberOfEntriesInBacklog(false));
         } else {
             if (log.isDebugEnabled()) {
                 log.debug("[{}][{}] No messages to expire", topicName, subName);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java
index 2bc18ca384709..c4a19c460b529 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentReplicator.java
@@ -149,7 +149,7 @@ protected Position getReplicatorReadPosition() {
 
     @Override
     protected long getNumberOfEntriesInBacklog() {
-        return cursor.getNumberOfEntriesInBacklog();
+        return cursor.getNumberOfEntriesInBacklog(false);
     }
 
     @Override
@@ -507,7 +507,7 @@ public CompletableFuture<Void> clearBacklog() {
 
         if (log.isDebugEnabled()) {
             log.debug("[{}][{} -> {}] Backlog size before clearing: {}", topicName, localCluster, remoteCluster,
-                    cursor.getNumberOfEntriesInBacklog());
+                    cursor.getNumberOfEntriesInBacklog(false));
         }
 
         cursor.asyncClearBacklog(new ClearBacklogCallback() {
@@ -515,7 +515,7 @@ public CompletableFuture<Void> clearBacklog() {
             public void clearBacklogComplete(Object ctx) {
                 if (log.isDebugEnabled()) {
                     log.debug("[{}][{} -> {}] Backlog size after clearing: {}", topicName, localCluster, remoteCluster,
-                            cursor.getNumberOfEntriesInBacklog());
+                            cursor.getNumberOfEntriesInBacklog(false));
                 }
                 future.complete(null);
             }
@@ -535,7 +535,7 @@ public CompletableFuture<Void> skipMessages(int numMessagesToSkip) {
 
         if (log.isDebugEnabled()) {
             log.debug("[{}][{} -> {}] Skipping {} messages, current backlog {}", topicName, localCluster, remoteCluster,
-                    numMessagesToSkip, cursor.getNumberOfEntriesInBacklog());
+                    numMessagesToSkip, cursor.getNumberOfEntriesInBacklog(false));
         }
         cursor.asyncSkipEntries(numMessagesToSkip, IndividualDeletedEntries.Exclude,
                 new AsyncCallbacks.SkipEntriesCallback() {
@@ -543,7 +543,7 @@ public CompletableFuture<Void> skipMessages(int numMessagesToSkip) {
                     public void skipEntriesComplete(Object ctx) {
                         if (log.isDebugEnabled()) {
                             log.debug("[{}][{} -> {}] Skipped {} messages, new backlog {}", topicName, localCluster,
-                                    remoteCluster, numMessagesToSkip, cursor.getNumberOfEntriesInBacklog());
+                                    remoteCluster, numMessagesToSkip, cursor.getNumberOfEntriesInBacklog(false));
                         }
                         future.complete(null);
                     }
@@ -605,7 +605,7 @@ public void updateRates() {
     }
 
     public ReplicatorStats getStats() {
-        stats.replicationBacklog = cursor.getNumberOfEntriesInBacklog();
+        stats.replicationBacklog = cursor.getNumberOfEntriesInBacklog(false);
         stats.connected = producer != null && producer.isConnected();
         stats.replicationDelayInSeconds = getReplicationDelayInSeconds();
 
@@ -633,8 +633,8 @@ private long getReplicationDelayInSeconds() {
     }
 
     public void expireMessages(int messageTTLInSeconds) {
-        if ((cursor.getNumberOfEntriesInBacklog() == 0)
-                || (cursor.getNumberOfEntriesInBacklog() < MINIMUM_BACKLOG_FOR_EXPIRY_CHECK
+        if ((cursor.getNumberOfEntriesInBacklog(false) == 0)
+                || (cursor.getNumberOfEntriesInBacklog(false) < MINIMUM_BACKLOG_FOR_EXPIRY_CHECK
                         && !topic.isOldestMessageExpired(cursor, messageTTLInSeconds))) {
             // don't do anything for almost caught-up connected subscriptions
             return;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
index 200d06e63cec4..7055ac0071e62 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentSubscription.java
@@ -31,6 +31,7 @@
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import java.util.stream.Collectors;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
 import org.apache.bookkeeper.mledger.AsyncCallbacks;
 import org.apache.bookkeeper.mledger.AsyncCallbacks.ClearBacklogCallback;
@@ -89,6 +90,7 @@ public class PersistentSubscription implements Subscription {
     private PersistentMessageExpiryMonitor expiryMonitor;
 
     private long lastExpireTimestamp = 0L;
+    private long lastConsumedFlowTimestamp = 0L;
 
     // for connected subscriptions, message expiry will be checked if the backlog is greater than this threshold
     private static final int MINIMUM_BACKLOG_FOR_EXPIRY_CHECK = 1000;
@@ -315,6 +317,7 @@ public void deactivateCursor() {
 
     @Override
     public void consumerFlow(Consumer consumer, int additionalNumberOfMessages) {
+        this.lastConsumedFlowTimestamp = System.currentTimeMillis();
         dispatcher.consumerFlow(consumer, additionalNumberOfMessages);
     }
 
@@ -389,7 +392,7 @@ public void acknowledgeMessage(List<Position> positions, AckType ackType, Map<St
             }
         }
 
-        if (topic.getManagedLedger().isTerminated() && cursor.getNumberOfEntriesInBacklog() == 0) {
+        if (topic.getManagedLedger().isTerminated() && cursor.getNumberOfEntriesInBacklog(false) == 0) {
             // Notify all consumer that the end of topic was reached
             dispatcher.getConsumers().forEach(Consumer::reachedEndOfTopic);
         }
@@ -476,7 +479,7 @@ public synchronized void acknowledgeMessage(TxnID txnId, List<Position> position
                     pendingAckMessagesMap.computeIfAbsent(txnId, txn -> new ConcurrentOpenHashSet<>());
 
             for (Position position : positions) {
-                // If try to ack message already acked by some ongoign transaction(can be itself), throw exception.
+                // If try to ack message already acked by some ongoing transaction(can be itself), throw exception.
                 // Acking single message within range of cumulative ack(if exist) is considered valid operation.
                 if (this.pendingAckMessages.contains(position)) {
                     String errorMsg = "[" + topicName + "][" + subName + "] Transaction:" + txnId +
@@ -571,7 +574,7 @@ public CompletableFuture<Void> clearBacklog() {
 
         if (log.isDebugEnabled()) {
             log.debug("[{}][{}] Backlog size before clearing: {}", topicName, subName,
-                    cursor.getNumberOfEntriesInBacklog());
+                    cursor.getNumberOfEntriesInBacklog(false));
         }
 
         cursor.asyncClearBacklog(new ClearBacklogCallback() {
@@ -579,7 +582,7 @@ public CompletableFuture<Void> clearBacklog() {
             public void clearBacklogComplete(Object ctx) {
                 if (log.isDebugEnabled()) {
                     log.debug("[{}][{}] Backlog size after clearing: {}", topicName, subName,
-                            cursor.getNumberOfEntriesInBacklog());
+                            cursor.getNumberOfEntriesInBacklog(false));
                 }
                 future.complete(null);
             }
@@ -600,7 +603,7 @@ public CompletableFuture<Void> skipMessages(int numMessagesToSkip) {
 
         if (log.isDebugEnabled()) {
             log.debug("[{}][{}] Skipping {} messages, current backlog {}", topicName, subName, numMessagesToSkip,
-                    cursor.getNumberOfEntriesInBacklog());
+                    cursor.getNumberOfEntriesInBacklog(false));
         }
         cursor.asyncSkipEntries(numMessagesToSkip, IndividualDeletedEntries.Exclude,
                 new AsyncCallbacks.SkipEntriesCallback() {
@@ -608,7 +611,7 @@ public CompletableFuture<Void> skipMessages(int numMessagesToSkip) {
                     public void skipEntriesComplete(Object ctx) {
                         if (log.isDebugEnabled()) {
                             log.debug("[{}][{}] Skipped {} messages, new backlog {}", topicName, subName,
-                                    numMessagesToSkip, cursor.getNumberOfEntriesInBacklog());
+                                    numMessagesToSkip, cursor.getNumberOfEntriesInBacklog(false));
                         }
                         future.complete(null);
                     }
@@ -774,8 +777,8 @@ public void readEntryComplete(Entry entry, Object ctx) {
     }
 
     @Override
-    public long getNumberOfEntriesInBacklog() {
-        return cursor.getNumberOfEntriesInBacklog();
+    public long getNumberOfEntriesInBacklog(boolean getPreciseBacklog) {
+        return cursor.getNumberOfEntriesInBacklog(getPreciseBacklog);
     }
 
     @Override
@@ -883,7 +886,7 @@ public CompletableFuture<Void> delete() {
      *
      * @param consumer
      *            consumer object that is initiating the unsubscribe operation
-     * @return CompletableFuture indicating the completion of ubsubscribe operation
+     * @return CompletableFuture indicating the completion of unsubscribe operation
      */
     @Override
     public CompletableFuture<Void> doUnsubscribe(Consumer consumer) {
@@ -915,8 +918,8 @@ public List<Consumer> getConsumers() {
     @Override
     public void expireMessages(int messageTTLInSeconds) {
         this.lastExpireTimestamp = System.currentTimeMillis();
-        if ((getNumberOfEntriesInBacklog() == 0) || (dispatcher != null && dispatcher.isConsumerConnected()
-                && getNumberOfEntriesInBacklog() < MINIMUM_BACKLOG_FOR_EXPIRY_CHECK
+        if ((getNumberOfEntriesInBacklog(false) == 0) || (dispatcher != null && dispatcher.isConsumerConnected()
+                && getNumberOfEntriesInBacklog(false) < MINIMUM_BACKLOG_FOR_EXPIRY_CHECK
                 && !topic.isOldestMessageExpired(cursor, messageTTLInSeconds))) {
             // don't do anything for almost caught-up connected subscriptions
             return;
@@ -932,9 +935,10 @@ public long estimateBacklogSize() {
         return cursor.getEstimatedSizeSinceMarkDeletePosition();
     }
 
-    public SubscriptionStats getStats() {
+    public SubscriptionStats getStats(Boolean getPreciseBacklog) {
         SubscriptionStats subStats = new SubscriptionStats();
         subStats.lastExpireTimestamp = lastExpireTimestamp;
+        subStats.lastConsumedFlowTimestamp = lastConsumedFlowTimestamp;
         Dispatcher dispatcher = this.dispatcher;
         if (dispatcher != null) {
             dispatcher.getConsumers().forEach(consumer -> {
@@ -944,6 +948,8 @@ public SubscriptionStats getStats() {
                 subStats.msgThroughputOut += consumerStats.msgThroughputOut;
                 subStats.msgRateRedeliver += consumerStats.msgRateRedeliver;
                 subStats.unackedMessages += consumerStats.unackedMessages;
+                subStats.lastConsumedTimestamp = Math.max(subStats.lastConsumedTimestamp, consumerStats.lastConsumedTimestamp);
+                subStats.lastAckedTimestamp = Math.max(subStats.lastAckedTimestamp, consumerStats.lastAckedTimestamp);
             });
         }
 
@@ -962,7 +968,8 @@ public SubscriptionStats getStats() {
                 subStats.msgDelayed = d.getNumberOfDelayedMessages();
             }
         }
-        subStats.msgBacklog = getNumberOfEntriesInBacklog();
+        subStats.msgBacklog = getNumberOfEntriesInBacklog(getPreciseBacklog);
+        subStats.msgBacklogNoDelayed = subStats.msgBacklog - subStats.msgDelayed;
         subStats.msgRateExpired = expiryMonitor.getMessageExpiryRate();
         subStats.isReplicated = isReplicated();
         return subStats;
@@ -1042,7 +1049,7 @@ public void markTopicWithBatchMessagePublished() {
     }
 
     void topicTerminated() {
-        if (cursor.getNumberOfEntriesInBacklog() == 0) {
+        if (cursor.getNumberOfEntriesInBacklog(false) == 0) {
             // notify the consumers if there are consumers connected to this topic.
             if (null != dispatcher) {
                 // Immediately notify the consumer that there are no more available messages
@@ -1192,5 +1199,10 @@ public void processReplicatedSubscriptionSnapshot(ReplicatedSubscriptionsSnapsho
         }
     }
 
+    @VisibleForTesting
+    public ManagedCursor getCursor() {
+        return cursor;
+    }
+
     private static final Logger log = LoggerFactory.getLogger(PersistentSubscription.class);
 }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
index 8d8f9644f5658..335be8cf3a847 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
@@ -154,6 +154,8 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
 
     private Optional<DispatchRateLimiter> dispatchRateLimiter = Optional.empty();
     private Optional<SubscribeRateLimiter> subscribeRateLimiter = Optional.empty();
+    public volatile long delayedDeliveryTickTimeMillis = 1000;
+    public volatile boolean delayedDeliveryEnabled = false;
     public static final int MESSAGE_RATE_BACKOFF_MS = 1000;
 
     protected final MessageDeduplication messageDeduplication;
@@ -178,6 +180,8 @@ protected TopicStatsHelper initialValue() {
     private volatile double lastUpdatedAvgPublishRateInMsg = 0;
     private volatile double lastUpdatedAvgPublishRateInByte = 0;
 
+    public volatile int maxUnackedMessagesOnSubscription = -1;
+
     private static class TopicStatsHelper {
         public double averageMsgSize;
         public double aggMsgRateIn;
@@ -209,6 +213,8 @@ public PersistentTopic(String topic, ManagedLedger ledger, BrokerService brokerS
         this.subscriptions = new ConcurrentOpenHashMap<>(16, 1);
         this.replicators = new ConcurrentOpenHashMap<>(16, 1);
         USAGE_COUNT_UPDATER.set(this, 0);
+        this.delayedDeliveryEnabled = brokerService.pulsar().getConfiguration().isDelayedDeliveryEnabled();
+        this.delayedDeliveryTickTimeMillis = brokerService.pulsar().getConfiguration().getDelayedDeliveryTickTimeMillis();
 
         initializeDispatchRateLimiterIfNeeded(Optional.empty());
 
@@ -247,6 +253,9 @@ public PersistentTopic(String topic, ManagedLedger ledger, BrokerService brokerS
             isAllowAutoUpdateSchema = policies.is_allow_auto_update_schema;
 
             schemaValidationEnforced = policies.schema_validation_enforced;
+
+            maxUnackedMessagesOnConsumer = unackedMessagesExceededOnConsumer(policies);
+            maxUnackedMessagesOnSubscription = unackedMessagesExceededOnSubscription(policies);
         } catch (Exception e) {
             log.warn("[{}] Error getting policies {} and isEncryptionRequired will be set to false", topic, e.getMessage());
             isEncryptionRequired = false;
@@ -578,7 +587,7 @@ public CompletableFuture<Consumer> subscribe(final ServerCnx cnx, String subscri
                 : getNonDurableSubscription(subscriptionName, startMessageId, startMessageRollbackDurationSec);
 
         int maxUnackedMessages = isDurable
-                ? brokerService.pulsar().getConfiguration().getMaxUnackedMessagesPerConsumer()
+                ? maxUnackedMessagesOnConsumer
                 : 0;
 
         subscriptionFuture.thenAccept(subscription -> {
@@ -623,6 +632,22 @@ public CompletableFuture<Consumer> subscribe(final ServerCnx cnx, String subscri
         return future;
     }
 
+    private int unackedMessagesExceededOnSubscription(Policies data) {
+        final int maxUnackedMessages = data.max_unacked_messages_per_subscription > -1 ?
+                data.max_unacked_messages_per_subscription :
+                brokerService.pulsar().getConfiguration().getMaxUnackedMessagesPerSubscription();
+
+        return maxUnackedMessages;
+    }
+
+    private int unackedMessagesExceededOnConsumer(Policies data) {
+        final int maxUnackedMessages = data.max_unacked_messages_per_consumer > -1 ?
+                data.max_unacked_messages_per_consumer :
+                brokerService.pulsar().getConfiguration().getMaxUnackedMessagesPerConsumer();
+
+        return maxUnackedMessages;
+    }
+
     private CompletableFuture<Subscription> getDurableSubscription(String subscriptionName,
             InitialPosition initialPosition, long startMessageRollbackDurationSec, boolean replicated) {
         CompletableFuture<Subscription> subscriptionFuture = new CompletableFuture<>();
@@ -1410,7 +1435,7 @@ public void updateRates(NamespaceStats nsStats, NamespaceBundleStats bundleStats
                 topicStatsStream.endList();
 
                 // Populate subscription specific stats here
-                topicStatsStream.writePair("msgBacklog", subscription.getNumberOfEntriesInBacklog());
+                topicStatsStream.writePair("msgBacklog", subscription.getNumberOfEntriesInBacklog(false));
                 topicStatsStream.writePair("msgRateExpired", subscription.getExpiredMessageRate());
                 topicStatsStream.writePair("msgRateOut", subMsgRateOut);
                 topicStatsStream.writePair("msgThroughputOut", subMsgThroughputOut);
@@ -1431,7 +1456,7 @@ public void updateRates(NamespaceStats nsStats, NamespaceBundleStats bundleStats
 
                 topicStatsHelper.aggMsgRateOut += subMsgRateOut;
                 topicStatsHelper.aggMsgThroughputOut += subMsgThroughputOut;
-                nsStats.msgBacklog += subscription.getNumberOfEntriesInBacklog();
+                nsStats.msgBacklog += subscription.getNumberOfEntriesInBacklog(false);
             } catch (Exception e) {
                 log.error("Got exception when creating consumer stats for subscription {}: {}", subscriptionName,
                         e.getMessage(), e);
@@ -1483,7 +1508,7 @@ public double getLastUpdatedAvgPublishRateInByte() {
         return lastUpdatedAvgPublishRateInByte;
     }
 
-    public TopicStats getStats() {
+    public TopicStats getStats(boolean getPreciseBacklog) {
 
         TopicStats stats = new TopicStats();
 
@@ -1506,7 +1531,7 @@ public TopicStats getStats() {
         stats.bytesInCounter = getBytesInCounter();
 
         subscriptions.forEach((name, subscription) -> {
-            SubscriptionStats subStats = subscription.getStats();
+            SubscriptionStats subStats = subscription.getStats(getPreciseBacklog);
 
             stats.msgRateOut += subStats.msgRateOut;
             stats.msgThroughputOut += subStats.msgThroughputOut;
@@ -1616,7 +1641,7 @@ public boolean isActive(InactiveTopicDeleteMode deleteMode) {
     }
 
     private boolean hasBacklogs() {
-        return subscriptions.values().stream().anyMatch(sub -> sub.getNumberOfEntriesInBacklog() > 0);
+        return subscriptions.values().stream().anyMatch(sub -> sub.getNumberOfEntriesInBacklog(false) > 0);
     }
 
     @Override
@@ -1737,6 +1762,14 @@ public CompletableFuture<Void> onPoliciesUpdate(Policies data) {
 
         schemaValidationEnforced = data.schema_validation_enforced;
 
+        maxUnackedMessagesOnConsumer = unackedMessagesExceededOnConsumer(data);
+        maxUnackedMessagesOnSubscription = unackedMessagesExceededOnSubscription(data);
+
+        if (data.delayed_delivery_policies != null) {
+            delayedDeliveryTickTimeMillis = data.delayed_delivery_policies.getTickTime();
+            delayedDeliveryEnabled = data.delayed_delivery_policies.isActive();
+        }
+
         initializeDispatchRateLimiterIfNeeded(Optional.ofNullable(data));
         
         this.updateMaxPublishRate(data);
@@ -1766,6 +1799,9 @@ public CompletableFuture<Void> onPoliciesUpdate(Policies data) {
         if (this.subscribeRateLimiter.isPresent()) {
             subscribeRateLimiter.get().onPoliciesUpdate(data);
         }
+        getManagedLedger().getConfig().setLedgerOffloader(
+                brokerService.pulsar().getManagedLedgerOffloader(
+                        TopicName.get(topic).getNamespaceObject(), data.offload_policies));
 
         return CompletableFuture.allOf(replicationFuture, dedupFuture, persistentPoliciesFuture);
     }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheck.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheck.java
index 0e9f839e211d8..3ed2328406315 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheck.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheck.java
@@ -49,7 +49,7 @@ public void checkCompatible(SchemaData from, SchemaData to, SchemaCompatibilityS
                 super.checkCompatible(from, to, strategy);
             } else if (isJsonSchema(to)) {
                 // if broker have the schema in avro format but producer sent a schema in the old json format
-                // allow old schema format for backwards compatiblity
+                // allow old schema format for backwards compatibility
             } else {
                 // unknown schema format
                 throw new IncompatibleSchemaException("Unknown schema format");
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStats.java
index cc5388e8ced02..ea05ed074c09e 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStats.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStats.java
@@ -93,6 +93,7 @@ void updateStats(TopicStats stats) {
             msgDelayed += as.msgDelayed;
             subsStats.blockedSubscriptionOnUnackedMsgs = as.blockedSubscriptionOnUnackedMsgs;
             subsStats.msgBacklog += as.msgBacklog;
+            subsStats.msgBacklogNoDelayed += as.msgBacklogNoDelayed;
             subsStats.msgDelayed += as.msgDelayed;
             subsStats.msgRateRedeliver += as.msgRateRedeliver;
             subsStats.unackedMessages += as.unackedMessages;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedSubscriptionStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedSubscriptionStats.java
index 1f3c51302e980..d5b53537dcc9a 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedSubscriptionStats.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/AggregatedSubscriptionStats.java
@@ -27,6 +27,8 @@ public class AggregatedSubscriptionStats {
 
     public long msgBacklog;
 
+    public long msgBacklogNoDelayed;
+
     public boolean blockedSubscriptionOnUnackedMsgs;
 
     public double msgRateRedeliver;
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java
index 19aa043ae823a..a7b35b8c63337 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/NamespaceStatsAggregator.java
@@ -61,7 +61,7 @@ public static void generate(PulsarService pulsar, boolean includeTopicMetrics, b
 
             bundlesMap.forEach((bundle, topicsMap) -> {
                 topicsMap.forEach((name, topic) -> {
-                    getTopicStats(topic, topicStats, includeConsumerMetrics);
+                    getTopicStats(topic, topicStats, includeConsumerMetrics, pulsar.getConfiguration().isExposePreciseBacklogInPrometheus());
 
                     if (includeTopicMetrics) {
                         topicsCount.add(1);
@@ -82,7 +82,7 @@ public static void generate(PulsarService pulsar, boolean includeTopicMetrics, b
         });
     }
 
-    private static void getTopicStats(Topic topic, TopicStats stats, boolean includeConsumerMetrics) {
+    private static void getTopicStats(Topic topic, TopicStats stats, boolean includeConsumerMetrics, boolean getPreciseBacklog) {
         stats.reset();
 
         if (topic instanceof PersistentTopic) {
@@ -104,8 +104,8 @@ private static void getTopicStats(Topic topic, TopicStats stats, boolean include
             stats.storageReadRate = mlStats.getReadEntriesRate();
         }
 
-        stats.msgInCounter = topic.getStats().msgInCounter;
-        stats.bytesInCounter = topic.getStats().bytesInCounter;
+        stats.msgInCounter = topic.getStats(getPreciseBacklog).msgInCounter;
+        stats.bytesInCounter = topic.getStats(getPreciseBacklog).bytesInCounter;
 
         stats.producersCount = 0;
         topic.getProducers().values().forEach(producer -> {
@@ -125,12 +125,13 @@ private static void getTopicStats(Topic topic, TopicStats stats, boolean include
 
         topic.getSubscriptions().forEach((name, subscription) -> {
             stats.subscriptionsCount++;
-            stats.msgBacklog += subscription.getNumberOfEntriesInBacklog();
+            stats.msgBacklog += subscription.getNumberOfEntriesInBacklog(getPreciseBacklog);
 
             AggregatedSubscriptionStats subsStats = stats.subscriptionStats
                     .computeIfAbsent(name, k -> new AggregatedSubscriptionStats());
-            subsStats.msgBacklog = subscription.getNumberOfEntriesInBacklog();
+            subsStats.msgBacklog = subscription.getNumberOfEntriesInBacklog(getPreciseBacklog);
             subsStats.msgDelayed = subscription.getNumberOfEntriesDelayed();
+            subsStats.msgBacklogNoDelayed = subsStats.msgBacklog - subsStats.msgDelayed;
 
             subscription.getConsumers().forEach(consumer -> {
 
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TopicStats.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TopicStats.java
index 846104441fac3..caf0ce842e2b3 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TopicStats.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/stats/prometheus/TopicStats.java
@@ -134,6 +134,7 @@ static void printTopicStats(SimpleTextOutputStream stream, String cluster, Strin
 
         stats.subscriptionStats.forEach((n, subsStats) -> {
             metric(stream, cluster, namespace, topic, n, "pulsar_subscription_back_log", subsStats.msgBacklog);
+            metric(stream, cluster, namespace, topic, n, "pulsar_subscription_back_log_no_delayed", subsStats.msgBacklogNoDelayed);
             metric(stream, cluster, namespace, topic, n, "pulsar_subscription_delayed", subsStats.msgDelayed);
             metric(stream, cluster, namespace, topic, n, "pulsar_subscription_msg_rate_redeliver", subsStats.msgRateRedeliver);
             metric(stream, cluster, namespace, topic, n, "pulsar_subscription_unacked_messages", subsStats.unackedMessages);
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/MaxRequestSizeFilter.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/MaxRequestSizeFilter.java
new file mode 100644
index 0000000000000..fbb4aa5fe5b26
--- /dev/null
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/MaxRequestSizeFilter.java
@@ -0,0 +1,72 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.broker.web;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class MaxRequestSizeFilter implements Filter {
+
+    private final long maxSize;
+
+    public MaxRequestSizeFilter(long maxSize) {
+        this.maxSize = maxSize;
+    }
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
+
+        long size = request.getContentLengthLong();
+
+        if (size > maxSize || isChunked(request)) {
+            // Size it's either unknown or too large
+            HttpServletResponse httpResponse = (HttpServletResponse) response;
+            httpResponse.sendError(HttpServletResponse.SC_BAD_REQUEST, "Bad Request");
+        } else {
+            chain.doFilter(request, response);
+        }
+    }
+
+    private static boolean isChunked(ServletRequest request) {
+        if (request instanceof HttpServletRequest) {
+            HttpServletRequest req = (HttpServletRequest) request;
+            String encoding = req.getHeader("Transfer-Encoding");
+            return encoding != null && encoding.contains("chunked");
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public void destroy() {
+    }
+}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java
index 166551c6f6034..ca9ec8567b006 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java
@@ -31,6 +31,7 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -437,7 +438,7 @@ protected void validateNamespaceOwnershipWithBundles(String tenant, String clust
             // propagate already wrapped-up WebApplicationExceptions
             throw wae;
         } catch (Exception oe) {
-            log.debug(String.format("Failed to find owner for namespace %s", fqnn), oe);
+            log.debug("Failed to find owner for namespace {}", fqnn, oe);
             throw new RestException(oe);
         }
     }
@@ -452,7 +453,7 @@ protected void validateBundleOwnership(String tenant, String cluster, String nam
             // propagate already wrapped-up WebApplicationExceptions
             throw wae;
         } catch (Exception oe) {
-            log.debug(String.format("Failed to find owner for namespace %s", fqnn), oe);
+            log.debug("Failed to find owner for namespace {}", fqnn, oe);
             throw new RestException(oe);
         }
     }
@@ -542,13 +543,17 @@ public void validateBundleOwnership(NamespaceBundle bundle, boolean authoritativ
                 log.debug("Redirecting the rest call to {}", redirect);
                 throw new WebApplicationException(Response.temporaryRedirect(redirect).build());
             }
+        } catch (TimeoutException te) {
+            String msg = String.format("Finding owner for ServiceUnit %s timed out", bundle);
+            log.error(msg, te);
+            throw new RestException(Status.INTERNAL_SERVER_ERROR, msg);
         } catch (IllegalArgumentException iae) {
             // namespace format is not valid
-            log.debug(String.format("Failed to find owner for ServiceUnit %s", bundle), iae);
+            log.debug("Failed to find owner for ServiceUnit {}", bundle, iae);
             throw new RestException(Status.PRECONDITION_FAILED,
                     "ServiceUnit format is not expected. ServiceUnit " + bundle);
         } catch (IllegalStateException ise) {
-            log.debug(String.format("Failed to find owner for ServiceUnit %s", bundle), ise);
+            log.debug("Failed to find owner for ServiceUnit {}", bundle, ise);
             throw new RestException(Status.PRECONDITION_FAILED, "ServiceUnit bundle is actived. ServiceUnit " + bundle);
         } catch (NullPointerException e) {
             log.warn("Unable to get web service url");
@@ -590,17 +595,21 @@ protected void validateTopicOwnership(TopicName topicName, boolean authoritative
                 log.debug("Redirecting the rest call to {}", redirect);
                 throw new WebApplicationException(Response.temporaryRedirect(redirect).build());
             }
+        } catch (TimeoutException te) {
+            String msg = String.format("Finding owner for topic %s timed out", topicName);
+            log.error(msg, te);
+            throw new RestException(Status.INTERNAL_SERVER_ERROR, msg);
         } catch (IllegalArgumentException iae) {
             // namespace format is not valid
-            log.debug(String.format("Failed to find owner for topic :%s", topicName), iae);
+            log.debug("Failed to find owner for topic: {}", topicName, iae);
             throw new RestException(Status.PRECONDITION_FAILED, "Can't find owner for topic " + topicName);
         } catch (IllegalStateException ise) {
-            log.debug(String.format("Failed to find owner for topic:%s", topicName), ise);
+            log.debug("Failed to find owner for topic: {}", topicName, ise);
             throw new RestException(Status.PRECONDITION_FAILED, "Can't find owner for topic " + topicName);
         } catch (WebApplicationException wae) {
             throw wae;
         } catch (Exception oe) {
-            log.debug(String.format("Failed to find owner for topic:%s", topicName), oe);
+            log.debug("Failed to find owner for topic: {}", topicName, oe);
             throw new RestException(oe);
         }
     }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java
index ffaec7c00f685..e111fbcd1af5c 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/WebService.java
@@ -22,6 +22,7 @@
 
 import io.prometheus.client.jetty.JettyStatisticsCollector;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
@@ -30,6 +31,13 @@
 import java.util.TimeZone;
 
 import javax.servlet.DispatcherType;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.pulsar.broker.PulsarServerException;
 import org.apache.pulsar.broker.PulsarService;
@@ -146,9 +154,15 @@ public void addServlet(String path, ServletHolder servletHolder, boolean require
             context.addFilter(filter, MATCH_ALL, EnumSet.allOf(DispatcherType.class));
         }
 
+        if (pulsar.getConfig().getHttpMaxRequestSize() > 0) {
+            context.addFilter(new FilterHolder(
+                    new MaxRequestSizeFilter(
+                            pulsar.getConfig().getHttpMaxRequestSize())),
+                    MATCH_ALL, EnumSet.allOf(DispatcherType.class));
+        }
+
         FilterHolder responseFilter = new FilterHolder(new ResponseHandlerFilter(pulsar));
         context.addFilter(responseFilter, MATCH_ALL, EnumSet.allOf(DispatcherType.class));
-
         handlers.add(context);
     }
 
@@ -191,7 +205,6 @@ public void start() throws PulsarServerException {
             handlers.add(stats);
 
             server.setHandler(stats);
-
             server.start();
 
             if (httpConnector != null) {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/client/api/RawReader.java b/pulsar-broker/src/main/java/org/apache/pulsar/client/api/RawReader.java
index f9d297f483d2f..caf44ee95653d 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/client/api/RawReader.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/client/api/RawReader.java
@@ -44,6 +44,13 @@ public static CompletableFuture<RawReader> create(PulsarClient client, String to
      */
     String getTopic();
 
+    /**
+     * Check if there is any message available to read.
+     *
+     * @return a completable future which will return whether there is any message available to read.
+     */
+    CompletableFuture<Boolean> hasMessageAvailableAsync();
+
     /**
      * Seek to a location in the topic. After the seek, the first message read will be the one with
      * with the specified message ID.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawReaderImpl.java b/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawReaderImpl.java
index a6db7c64739e7..6a4d682d2b8ed 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawReaderImpl.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/client/impl/RawReaderImpl.java
@@ -33,9 +33,11 @@
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.client.api.SubscriptionType;
 import org.apache.pulsar.client.impl.conf.ConsumerConfigurationData;
+import org.apache.pulsar.common.api.proto.PulsarApi.MessageMetadata;
 import org.apache.pulsar.common.api.proto.PulsarApi.CommandAck.AckType;
 import org.apache.pulsar.common.api.proto.PulsarApi.MessageIdData;
 import org.apache.pulsar.common.naming.TopicName;
+import org.apache.pulsar.common.protocol.Commands;
 import org.apache.pulsar.common.util.collections.GrowableArrayBlockingQueue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -67,6 +69,11 @@ public String getTopic() {
             .findFirst().orElse(null);
     }
 
+    @Override
+    public CompletableFuture<Boolean> hasMessageAvailableAsync() {
+        return consumer.hasMessageAvailableAsync();
+    }
+
     @Override
     public CompletableFuture<Void> seekAsync(MessageId messageId) {
         return consumer.seekAsync(messageId);
@@ -134,6 +141,15 @@ void tryCompletePending() {
             if (future == null) {
                 assert(messageAndCnx == null);
             } else {
+                int numMsg;
+                try {
+                    MessageMetadata msgMetadata = Commands.parseMessageMetadata(messageAndCnx.msg.getHeadersAndPayload());
+                    numMsg = msgMetadata.getNumMessagesInBatch();
+                    msgMetadata.recycle();
+                } catch (Throwable t) {
+                    // TODO message validation
+                    numMsg = 1;
+                }
                 if (!future.complete(messageAndCnx.msg)) {
                     messageAndCnx.msg.close();
                     closeAsync();
@@ -141,7 +157,7 @@ void tryCompletePending() {
 
                 ClientCnx currentCnx = cnx();
                 if (currentCnx == messageAndCnx.cnx) {
-                    increaseAvailablePermits(currentCnx);
+                    increaseAvailablePermits(currentCnx, numMsg);
                 }
             }
         }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundle.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundle.java
index 43cfaa0a58804..c79f6bdbe204a 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundle.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundle.java
@@ -153,4 +153,8 @@ public void setHasNonPersistentTopic(boolean hasNonPersistentTopic) {
     public static String getBundleRange(String namespaceBundle) {
         return namespaceBundle.substring(namespaceBundle.lastIndexOf('/') + 1);
     }
+
+    public NamespaceBundleFactory getNamespaceBundleFactory() {
+        return factory;
+    }
 }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundleFactory.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundleFactory.java
index bdfccf3cf4a7e..69ec0b719f2ba 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundleFactory.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundleFactory.java
@@ -221,11 +221,19 @@ public static BundlesData getBundlesData(NamespaceBundles bundles) throws Except
      *            {@link NamespaceBundle} needs to be split
      * @param numBundles
      *            split into numBundles
+     * @param splitBoundary
+     *            split into 2 numBundles by the given split key. The given split key must between the key range of the
+     *            given split bundle.
      * @return List of split {@link NamespaceBundle} and {@link NamespaceBundles} that contains final bundles including
      *         split bundles for a given namespace
      */
-    public Pair<NamespaceBundles, List<NamespaceBundle>> splitBundles(NamespaceBundle targetBundle, int numBundles) {
+    public Pair<NamespaceBundles, List<NamespaceBundle>> splitBundles(NamespaceBundle targetBundle, int numBundles, Long splitBoundary) {
         checkArgument(canSplitBundle(targetBundle), "%s bundle can't be split further", targetBundle);
+        if (splitBoundary != null) {
+            checkArgument(splitBoundary > targetBundle.getLowerEndpoint() && splitBoundary < targetBundle.getUpperEndpoint(),
+                "The given fixed key must between the key range of the %s bundle", targetBundle);
+            numBundles = 2;
+        }
         checkNotNull(targetBundle, "can't split null bundle");
         checkNotNull(targetBundle.getNamespaceObject(), "namespace must be present");
         NamespaceName nsname = targetBundle.getNamespaceObject();
@@ -243,7 +251,7 @@ public Pair<NamespaceBundles, List<NamespaceBundle>> splitBundles(NamespaceBundl
                 splitPartition = i;
                 Long maxVal = sourceBundle.partitions[i + 1];
                 Long minVal = sourceBundle.partitions[i];
-                Long segSize = (maxVal - minVal) / numBundles;
+                Long segSize = splitBoundary == null ? (maxVal - minVal) / numBundles : splitBoundary - minVal;
                 partitions[pos++] = minVal;
                 Long curPartition = minVal + segSize;
                 for (int j = 0; j < numBundles - 1; j++) {
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundleSplitAlgorithm.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundleSplitAlgorithm.java
new file mode 100644
index 0000000000000..a0e45f3e9485c
--- /dev/null
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/NamespaceBundleSplitAlgorithm.java
@@ -0,0 +1,56 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.common.naming;
+
+import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.pulsar.broker.namespace.NamespaceService;
+
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Algorithm interface for namespace bundle split.
+ */
+public interface NamespaceBundleSplitAlgorithm {
+
+    String rangeEquallyDivideName = "range_equally_divide";
+    String topicCountEquallyDivideName = "topic_count_equally_divide";
+
+    List<String> availableAlgorithms = Lists.newArrayList(rangeEquallyDivideName, topicCountEquallyDivideName);
+
+    NamespaceBundleSplitAlgorithm rangeEquallyDivide = new RangeEquallyDivideBundleSplitAlgorithm();
+    NamespaceBundleSplitAlgorithm topicCountEquallyDivide = new TopicCountEquallyDivideBundleSplitAlgorithm();
+
+    static NamespaceBundleSplitAlgorithm of(String algorithmName) {
+        if (algorithmName == null) {
+            return null;
+        }
+        switch (algorithmName) {
+            case  rangeEquallyDivideName:
+                return rangeEquallyDivide;
+            case topicCountEquallyDivideName:
+                return topicCountEquallyDivide;
+            default:
+                return null;
+        }
+    }
+
+    CompletableFuture<Long> getSplitBoundary(NamespaceService service, NamespaceBundle bundle);
+}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/RangeEquallyDivideBundleSplitAlgorithm.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/RangeEquallyDivideBundleSplitAlgorithm.java
new file mode 100644
index 0000000000000..a66ac2630226e
--- /dev/null
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/RangeEquallyDivideBundleSplitAlgorithm.java
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.common.naming;
+
+import org.apache.pulsar.broker.namespace.NamespaceService;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * This algorithm divides the bundle into two parts with the same hash range size.
+ */
+public class RangeEquallyDivideBundleSplitAlgorithm implements NamespaceBundleSplitAlgorithm {
+
+    @Override
+    public CompletableFuture<Long> getSplitBoundary(NamespaceService service, NamespaceBundle bundle) {
+        return CompletableFuture.completedFuture(bundle.getLowerEndpoint() +
+            (bundle.getUpperEndpoint() - bundle.getLowerEndpoint()) / 2);
+    }
+}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/TopicCountEquallyDivideBundleSplitAlgorithm.java b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/TopicCountEquallyDivideBundleSplitAlgorithm.java
new file mode 100644
index 0000000000000..40b3d778fd881
--- /dev/null
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/common/naming/TopicCountEquallyDivideBundleSplitAlgorithm.java
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.common.naming;
+
+import org.apache.pulsar.broker.namespace.NamespaceService;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * This algorithm divides the bundle into two parts with the same topics count.
+ */
+public class TopicCountEquallyDivideBundleSplitAlgorithm implements NamespaceBundleSplitAlgorithm  {
+
+    @Override
+    public CompletableFuture<Long> getSplitBoundary(NamespaceService service, NamespaceBundle bundle) {
+        return service.getOwnedTopicListForNamespaceBundle(bundle).thenCompose(topics -> {
+            if (topics == null || topics.size() <= 1) {
+                return CompletableFuture.completedFuture(null);
+            }
+            List<Long> topicNameHashList = new ArrayList<>(topics.size());
+            for (String topic : topics) {
+                topicNameHashList.add(bundle.getNamespaceBundleFactory().getLongHashCode(topic));
+            }
+            Collections.sort(topicNameHashList);
+            long splitStart = topicNameHashList.get(Math.max((topicNameHashList.size() / 2) - 1, 0));
+            long splitEnd = topicNameHashList.get(topicNameHashList.size() / 2);
+            long splitMiddle = splitStart + (splitEnd - splitStart) / 2;
+            return CompletableFuture.completedFuture(splitMiddle);
+        });
+    }
+}
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/TwoPhaseCompactor.java b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/TwoPhaseCompactor.java
index 62503ffffdd12..06afe9310433f 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/compaction/TwoPhaseCompactor.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/compaction/TwoPhaseCompactor.java
@@ -72,8 +72,16 @@ public TwoPhaseCompactor(ServiceConfiguration conf,
 
     @Override
     protected CompletableFuture<Long> doCompaction(RawReader reader, BookKeeper bk) {
-        return phaseOne(reader).thenCompose(
-                (r) -> phaseTwo(reader, r.from, r.to, r.lastReadId, r.latestForKey, bk));
+        return reader.hasMessageAvailableAsync()
+                .thenCompose(available -> {
+                    if (available) {
+                        return phaseOne(reader).thenCompose(
+                                (r) -> phaseTwo(reader, r.from, r.to, r.lastReadId, r.latestForKey, bk));
+                    } else {
+                        log.info("Skip compaction of the empty topic {}", reader.getTopic());
+                        return CompletableFuture.completedFuture(-1L);
+                    }
+                });
     }
 
     private CompletableFuture<PhaseOneResult> phaseOne(RawReader reader) {
@@ -233,36 +241,43 @@ private void phaseTwoLoop(RawReader reader, MessageId to, Map<String, MessageId>
                             messageToAdd = Optional.of(m);
                         } else {
                             m.close();
-                            // Reached to last-id and phase-one found it deleted-message while iterating on ledger so, not
-                            // present under latestForKey. Complete the compaction.
-                            if (to.equals(id)) {
-                                promise.complete(null);
-                            }
                         }
                     }
 
-                    messageToAdd.ifPresent((toAdd) -> {
-                            try {
-                                outstanding.acquire();
-                                CompletableFuture<Void> addFuture = addToCompactedLedger(lh, toAdd)
+                    if (messageToAdd.isPresent()) {
+                        try {
+                            outstanding.acquire();
+                            CompletableFuture<Void> addFuture = addToCompactedLedger(lh, messageToAdd.get())
                                     .whenComplete((res, exception2) -> {
-                                            outstanding.release();
-                                            if (exception2 != null) {
-                                                promise.completeExceptionally(exception2);
-                                            }
-                                        });
-                                if (to.equals(id)) {
-                                    addFuture.whenComplete((res, exception2) -> {
-                                            if (exception2 == null) {
-                                                promise.complete(null);
-                                            }
-                                        });
-                                }
-                            } catch (InterruptedException ie) {
-                                Thread.currentThread().interrupt();
-                                promise.completeExceptionally(ie);
+                                        outstanding.release();
+                                        if (exception2 != null) {
+                                            promise.completeExceptionally(exception2);
+                                        }
+                                    });
+                            if (to.equals(id)) {
+                                addFuture.whenComplete((res, exception2) -> {
+                                    if (exception2 == null) {
+                                        promise.complete(null);
+                                    }
+                                });
                             }
-                        });
+                        } catch (InterruptedException ie) {
+                            Thread.currentThread().interrupt();
+                            promise.completeExceptionally(ie);
+                        }
+                    } else if (to.equals(id)) {
+                        // Reached to last-id and phase-one found it deleted-message while iterating on ledger so, not
+                        // present under latestForKey. Complete the compaction.
+                        try {
+                            // make sure all inflight writes have finished
+                            outstanding.acquire(MAX_OUTSTANDING);
+                            promise.complete(null);
+                        } catch (InterruptedException e) {
+                            Thread.currentThread().interrupt();
+                            promise.completeExceptionally(e);
+                        }
+                        return;
+                    }
                     phaseTwoLoop(reader, to, latestForKey, lh, outstanding, promise);
                 }, scheduler);
     }
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/utils/auth/tokens/TokensCliUtils.java b/pulsar-broker/src/main/java/org/apache/pulsar/utils/auth/tokens/TokensCliUtils.java
index 03cc0bf544b97..34281f97d041f 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/utils/auth/tokens/TokensCliUtils.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/utils/auth/tokens/TokensCliUtils.java
@@ -304,8 +304,9 @@ public static void main(String[] args) throws Exception {
                 System.exit(1);
             }
         } catch (Exception e) {
-            jcommander.usage();
             System.err.println(e);
+            String chosenCommand = jcommander.getParsedCommand();
+            jcommander.usage(chosenCommand);
             System.exit(1);
         }
 
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarBrokerStarterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarBrokerStarterTest.java
index ba4b212571a91..95711405ac28e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/PulsarBrokerStarterTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/PulsarBrokerStarterTest.java
@@ -78,6 +78,7 @@ private File createValidBrokerConfigFile() throws FileNotFoundException {
         printWriter.println("bookkeeperClientTimeoutInSeconds=12345");
         printWriter.println("bookkeeperClientSpeculativeReadTimeoutInMillis=3000");
         printWriter.println("enableRunBookieTogether=true");
+        printWriter.println("bookkeeperExplicitLacIntervalInMills=5");
 
         printWriter.close();
         testConfigFile.deleteOnExit();
@@ -127,6 +128,7 @@ public void testLoadConfig() throws SecurityException, NoSuchMethodException, IO
         assertEquals(serviceConfig.getBookkeeperClientIsolationGroups(), "group1,group2");
         assertEquals(serviceConfig.getBookkeeperClientSpeculativeReadTimeoutInMillis(), 3000);
         assertEquals(serviceConfig.getBookkeeperClientTimeoutInSeconds(), 12345);
+        assertEquals(serviceConfig.getBookkeeperExplicitLacIntervalInMills(), 5);
     }
 
     @Test
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/BookKeeperClientFactoryImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/BookKeeperClientFactoryImplTest.java
index f06e791a12e4b..36ce41f53d883 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/BookKeeperClientFactoryImplTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/BookKeeperClientFactoryImplTest.java
@@ -159,4 +159,13 @@ public void testSetDiskWeightBasedPlacementEnabled() {
         assertTrue(factory.createBkClientConfiguration(conf).getDiskWeightBasedPlacementEnabled());
     }
 
+    @Test
+    public void testSetExplicitLacInterval() {
+        BookKeeperClientFactoryImpl factory = new BookKeeperClientFactoryImpl();
+        ServiceConfiguration conf = new ServiceConfiguration();
+        assertEquals(factory.createBkClientConfiguration(conf).getExplictLacInterval(), 0);
+        conf.setBookkeeperExplicitLacIntervalInMills(5);
+        assertEquals(factory.createBkClientConfiguration(conf).getExplictLacInterval(), 5);
+    }
+
 }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiDelayedDelivery.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiDelayedDelivery.java
new file mode 100644
index 0000000000000..f532d1d3b8bc6
--- /dev/null
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiDelayedDelivery.java
@@ -0,0 +1,115 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.broker.admin;
+
+import com.google.common.collect.Sets;
+import lombok.Cleanup;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
+import org.apache.pulsar.client.api.*;
+import org.apache.pulsar.common.policies.data.ClusterData;
+import org.apache.pulsar.common.policies.data.DelayedDeliveryPolicies;
+import org.apache.pulsar.common.policies.data.TenantInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.TimeUnit;
+
+import static org.testng.Assert.*;
+
+@Slf4j
+public class AdminApiDelayedDelivery extends MockedPulsarServiceBaseTest {
+
+    private static final Logger LOG = LoggerFactory.getLogger(AdminApiDelayedDelivery.class);
+
+    @BeforeMethod
+    @Override
+    public void setup() throws Exception {
+        super.internalSetup();
+
+        admin.clusters().createCluster("test", new ClusterData(pulsar.getWebServiceAddress()));
+        TenantInfo tenantInfo = new TenantInfo(Sets.newHashSet("role1", "role2"), Sets.newHashSet("test"));
+        admin.tenants().createTenant("delayed-delivery-messages", tenantInfo);
+    }
+
+    @AfterMethod
+    @Override
+    public void cleanup() throws Exception {
+        super.internalCleanup();
+    }
+
+    @Test
+    public void testDisableDelayedDelivery() throws Exception {
+        admin.namespaces().createNamespace("delayed-delivery-messages/default-ns");
+        String namespace = "delayed-delivery-messages/default-ns";
+        assertTrue(admin.namespaces().getDelayedDelivery(namespace).isActive());
+
+        DelayedDeliveryPolicies delayedDeliveryPolicies = new DelayedDeliveryPolicies(2000, false);
+        admin.namespaces().setDelayedDeliveryMessages(namespace, delayedDeliveryPolicies);
+
+        assertFalse(admin.namespaces().getDelayedDelivery(namespace).isActive());
+        assertEquals(2000, admin.namespaces().getDelayedDelivery(namespace).getTickTime());
+    }
+
+    @Test
+    public void testEnableDelayedDeliveryMessages() throws Exception {
+        admin.namespaces().createNamespace("delayed-delivery-messages/default-enable-service-conf");
+        String namespace = "delayed-delivery-messages/default-enable-service-conf";
+        String topicName = "persistent://delayed-delivery-messages/default-enable-service-conf/test";
+        assertTrue(admin.namespaces().getDelayedDelivery(namespace).isActive());
+
+        @Cleanup
+        Consumer<String> consumer = pulsarClient.newConsumer(Schema.STRING)
+                .topic(topicName)
+                .subscriptionName("test-sub")
+                .subscriptionType(SubscriptionType.Shared)
+                .subscribe();
+
+        @Cleanup
+        Producer<String> producer = pulsarClient.newProducer(Schema.STRING)
+                .topic(topicName)
+                .create();
+
+        for (int i = 0; i < 10; i++) {
+            producer.newMessage()
+                    .value("delayed-msg-" + i)
+                    .deliverAfter(5, TimeUnit.SECONDS)
+                    .sendAsync();
+        }
+
+        producer.flush();
+
+        // Delayed messages might not come in same exact order
+        Set<String> delayedMessages = new TreeSet<>();
+        for (int i = 0; i < 10; i++) {
+            Message<String> msg = consumer.receive(10, TimeUnit.SECONDS);
+            delayedMessages.add(msg.getValue());
+            consumer.acknowledge(msg);
+        }
+
+        for (int i = 0; i < 10; i++) {
+            assertTrue(delayedMessages.contains("delayed-msg-" + i));
+        }
+    }
+}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiMaxUnackedMessages.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiMaxUnackedMessages.java
new file mode 100644
index 0000000000000..d72b0506670c0
--- /dev/null
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiMaxUnackedMessages.java
@@ -0,0 +1,82 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.broker.admin;
+
+import com.google.common.collect.Sets;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
+import org.apache.pulsar.client.admin.PulsarAdminException;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.PulsarClientException;
+import org.apache.pulsar.client.api.Schema;
+import org.apache.pulsar.common.policies.data.ClusterData;
+import org.apache.pulsar.common.policies.data.TenantInfo;
+import org.apache.pulsar.common.protocol.schema.PostSchemaPayload;
+import org.apache.pulsar.common.schema.SchemaInfo;
+import org.apache.pulsar.common.schema.SchemaType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+import org.testng.collections.Maps;
+
+import java.util.Map;
+
+import static org.testng.Assert.*;
+
+@Slf4j
+public class AdminApiMaxUnackedMessages extends MockedPulsarServiceBaseTest {
+
+    private static final Logger LOG = LoggerFactory.getLogger(AdminApiMaxUnackedMessages.class);
+
+    @BeforeMethod
+    @Override
+    public void setup() throws Exception {
+        super.internalSetup();
+
+        admin.clusters().createCluster("test", new ClusterData(pulsar.getWebServiceAddress()));
+        TenantInfo tenantInfo = new TenantInfo(Sets.newHashSet("role1", "role2"), Sets.newHashSet("test"));
+        admin.tenants().createTenant("max-unacked-messages", tenantInfo);
+    }
+
+    @AfterMethod
+    @Override
+    public void cleanup() throws Exception {
+        super.internalCleanup();
+    }
+
+    @Test
+    public void testMaxUnackedMessagesOnConsumers() throws Exception {
+        admin.namespaces().createNamespace("max-unacked-messages/default-on-consumers");
+        String namespace = "max-unacked-messages/default-on-consumers";
+        assertEquals(50000, admin.namespaces().getMaxUnackedMessagesPerConsumer(namespace));
+        admin.namespaces().setMaxUnackedMessagesPerConsumer(namespace, 2*50000);
+        assertEquals(2*50000, admin.namespaces().getMaxUnackedMessagesPerConsumer(namespace));
+    }
+
+    @Test
+    public void testMaxUnackedMessagesOnSubscription() throws Exception {
+        admin.namespaces().createNamespace("max-unacked-messages/default-on-subscription");
+        String namespace = "max-unacked-messages/default-on-subscription";
+        assertEquals(200000, admin.namespaces().getMaxUnackedMessagesPerSubscription(namespace));
+        admin.namespaces().setMaxUnackedMessagesPerSubscription(namespace, 2*200000);
+        assertEquals(2*200000, admin.namespaces().getMaxUnackedMessagesPerSubscription(namespace));
+    }
+}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java
index 7f56a3fc02e9b..25c45dfd29a7d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java
@@ -38,6 +38,7 @@
 import org.apache.pulsar.client.api.Producer;
 import org.apache.pulsar.client.impl.MessageIdImpl;
 import org.apache.pulsar.common.policies.data.ClusterData;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.apache.pulsar.common.policies.data.TenantInfo;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
@@ -71,7 +72,7 @@ private void testOffload(String topicName, String mlName) throws Exception {
         LedgerOffloader offloader = mock(LedgerOffloader.class);
         when(offloader.getOffloadDriverName()).thenReturn("mock");
 
-        doReturn(offloader).when(pulsar).getManagedLedgerOffloader();
+        doReturn(offloader).when(pulsar).getManagedLedgerOffloader(any(), any());
 
         CompletableFuture<Void> promise = new CompletableFuture<>();
         doReturn(promise).when(offloader).offload(any(), any(), any());
@@ -138,4 +139,20 @@ public void testOffloadV1() throws Exception {
         String mlName = "prop-xyz/test/ns1/persistent/topic2";
         testOffload(topicName, mlName);
     }
+
+    @Test
+    public void testOffloadPolicies() throws Exception {
+        String namespaceName = "prop-xyz/ns1";
+        String driver = "aws-s3";
+        String region = "test-region";
+        String bucket = "test-bucket";
+        String endpoint = "test-endpoint";
+
+        OffloadPolicies offload1 = OffloadPolicies.create(
+                driver, region, bucket, endpoint, 100, 100);
+        admin.namespaces().setOffloadPolicies(namespaceName, offload1);
+        OffloadPolicies offload2 = admin.namespaces().getOffloadPolicies(namespaceName);
+        Assert.assertEquals(offload1, offload2);
+    }
+
 }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
index b83c5c29b6af4..5b9949b4ae745 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
@@ -41,6 +41,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
@@ -90,6 +91,7 @@
 import org.apache.pulsar.common.lookup.data.LookupData;
 import org.apache.pulsar.common.naming.NamespaceBundle;
 import org.apache.pulsar.common.naming.NamespaceBundleFactory;
+import org.apache.pulsar.common.naming.NamespaceBundleSplitAlgorithm;
 import org.apache.pulsar.common.naming.NamespaceBundles;
 import org.apache.pulsar.common.naming.NamespaceName;
 import org.apache.pulsar.common.naming.TopicDomain;
@@ -580,7 +582,7 @@ public void testGetDynamicLocalConfiguration() throws Exception {
         assertNotEquals(pulsar.getConfiguration().getBrokerShutdownTimeoutMs(), shutdownTime);
         // update configuration
         admin.brokers().updateDynamicConfiguration(configName, Long.toString(shutdownTime));
-        // Now, znode is created: updateConfigurationAndregisterListeners and check if configuration updated
+        // Now, znode is created: updateConfigurationAndRegisterListeners and check if configuration updated
         assertEquals(Long.parseLong(admin.brokers().getAllDynamicConfigurations().get(configName)), shutdownTime);
     }
 
@@ -663,6 +665,8 @@ public void namespaces() throws PulsarAdminException, PulsarServerException, Exc
         policies.topicDispatchRate.put("test", ConfigHelper.topicDispatchRate(conf));
         policies.subscriptionDispatchRate.put("test", ConfigHelper.subscriptionDispatchRate(conf));
         policies.clusterSubscribeRate.put("test", ConfigHelper.subscribeRate(conf));
+        policies.max_unacked_messages_per_subscription = 200000;
+        policies.max_unacked_messages_per_consumer = 50000;
 
         assertEquals(admin.namespaces().getPolicies("prop-xyz/ns1"), policies);
         assertEquals(admin.namespaces().getPermissions("prop-xyz/ns1"), policies.auth_policies.namespace_auth);
@@ -993,7 +997,7 @@ public void testNamespaceSplitBundle() throws Exception {
         assertEquals(admin.topics().getList(namespace), Lists.newArrayList(topicName));
 
         try {
-            admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", true);
+            admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", true, null);
         } catch (Exception e) {
             fail("split bundle shouldn't have thrown exception");
         }
@@ -1008,6 +1012,95 @@ public void testNamespaceSplitBundle() throws Exception {
         producer.close();
     }
 
+    @Test
+    public void testNamespaceSplitBundleWithTopicCountEquallyDivideAlgorithm() throws Exception {
+        // Force to create a topic
+        final String namespace = "prop-xyz/ns1";
+        List<String> topicNames = Lists.newArrayList(
+            (new StringBuilder("persistent://")).append(namespace).append("/topicCountEquallyDivideAlgorithum-1").toString(),
+            (new StringBuilder("persistent://")).append(namespace).append("/topicCountEquallyDivideAlgorithum-2").toString());
+
+        List<Producer<byte[]>> producers = new ArrayList<>(2);
+        for (String topicName : topicNames) {
+            Producer<byte[]> producer = pulsarClient.newProducer(Schema.BYTES)
+                .topic(topicName)
+                .enableBatching(false)
+                .messageRoutingMode(MessageRoutingMode.SinglePartition)
+                .create();
+            producers.add(producer);
+            producer.send("message".getBytes());
+        }
+
+        assertTrue(admin.topics().getList(namespace).containsAll(topicNames));
+
+        try {
+            admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", true,
+                NamespaceBundleSplitAlgorithm.topicCountEquallyDivideName);
+        } catch (Exception e) {
+            fail("split bundle shouldn't have thrown exception");
+        }
+        NamespaceBundles bundles = bundleFactory.getBundles(NamespaceName.get(namespace));
+        NamespaceBundle bundle1 = pulsar.getNamespaceService().getBundle(TopicName.get(topicNames.get(0)));
+        NamespaceBundle bundle2 = pulsar.getNamespaceService().getBundle(TopicName.get(topicNames.get(1)));
+        assertNotEquals(bundle1, bundle2);
+        String[] splitRange = { namespace + "/0x00000000_0x7fffffff", namespace + "/0x7fffffff_0xffffffff" };
+        for (int i = 0; i < bundles.getBundles().size(); i++) {
+            assertNotEquals(bundles.getBundles().get(i).toString(), splitRange[i]);
+        }
+        producers.forEach(Producer::closeAsync);
+    }
+
+    @Test
+    public void testNamespaceSplitBundleWithInvalidAlgorithm() throws Exception {
+        // Force to create a topic
+        final String namespace = "prop-xyz/ns1";
+        try {
+            admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", true,
+                "invalid_test");
+            fail("unsupported namespace bundle split algorithm");
+        } catch (PulsarAdminException ignored) {
+        }
+    }
+
+    @Test
+    public void testNamespaceSplitBundleWithDefaultTopicCountEquallyDivideAlgorithm() throws Exception {
+        conf.setDefaultNamespaceBundleSplitAlgorithm(NamespaceBundleSplitAlgorithm.topicCountEquallyDivideName);
+        // Force to create a topic
+        final String namespace = "prop-xyz/ns1";
+        List<String> topicNames = Lists.newArrayList(
+            (new StringBuilder("persistent://")).append(namespace).append("/topicCountEquallyDivideAlgorithum-1").toString(),
+            (new StringBuilder("persistent://")).append(namespace).append("/topicCountEquallyDivideAlgorithum-2").toString());
+
+        List<Producer<byte[]>> producers = new ArrayList<>(2);
+        for (String topicName : topicNames) {
+            Producer<byte[]> producer = pulsarClient.newProducer(Schema.BYTES)
+                .topic(topicName)
+                .enableBatching(false)
+                .messageRoutingMode(MessageRoutingMode.SinglePartition)
+                .create();
+            producers.add(producer);
+            producer.send("message".getBytes());
+        }
+
+        assertTrue(admin.topics().getList(namespace).containsAll(topicNames));
+
+        try {
+            admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", true, null);
+        } catch (Exception e) {
+            fail("split bundle shouldn't have thrown exception");
+        }
+        NamespaceBundles bundles = bundleFactory.getBundles(NamespaceName.get(namespace));
+        NamespaceBundle bundle1 = pulsar.getNamespaceService().getBundle(TopicName.get(topicNames.get(0)));
+        NamespaceBundle bundle2 = pulsar.getNamespaceService().getBundle(TopicName.get(topicNames.get(1)));
+        assertNotEquals(bundle1, bundle2);
+        String[] splitRange = { namespace + "/0x00000000_0x7fffffff", namespace + "/0x7fffffff_0xffffffff" };
+        for (int i = 0; i < bundles.getBundles().size(); i++) {
+            assertNotEquals(bundles.getBundles().get(i).toString(), splitRange[i]);
+        }
+        producers.forEach(Producer::closeAsync);
+        conf.setDefaultNamespaceBundleSplitAlgorithm(NamespaceBundleSplitAlgorithm.rangeEquallyDivideName);
+    }
+
     @Test
     public void testNamespaceSplitBundleConcurrent() throws Exception {
         // Force to create a topic
@@ -1023,7 +1116,7 @@ public void testNamespaceSplitBundleConcurrent() throws Exception {
         assertEquals(admin.topics().getList(namespace), Lists.newArrayList(topicName));
 
         try {
-            admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", false);
+            admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", false, null);
         } catch (Exception e) {
             fail("split bundle shouldn't have thrown exception");
         }
@@ -1040,11 +1133,11 @@ public void testNamespaceSplitBundleConcurrent() throws Exception {
         try {
             executorService.invokeAll(Arrays.asList(() -> {
                 log.info("split 2 bundles at the same time. spilt: 0x00000000_0x7fffffff ");
-                admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0x7fffffff", false);
+                admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0x7fffffff", false, null);
                 return null;
             }, () -> {
                 log.info("split 2 bundles at the same time. spilt: 0x7fffffff_0xffffffff ");
-                admin.namespaces().splitNamespaceBundle(namespace, "0x7fffffff_0xffffffff", false);
+                admin.namespaces().splitNamespaceBundle(namespace, "0x7fffffff_0xffffffff", false, null);
                 return null;
             }));
         } catch (Exception e) {
@@ -1062,19 +1155,19 @@ public void testNamespaceSplitBundleConcurrent() throws Exception {
         try {
             executorService.invokeAll(Arrays.asList(() -> {
                 log.info("split 4 bundles at the same time. spilt: 0x00000000_0x3fffffff ");
-                admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0x3fffffff", false);
+                admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0x3fffffff", false, null);
                 return null;
             }, () -> {
                 log.info("split 4 bundles at the same time. spilt: 0x3fffffff_0x7fffffff ");
-                admin.namespaces().splitNamespaceBundle(namespace, "0x3fffffff_0x7fffffff", false);
+                admin.namespaces().splitNamespaceBundle(namespace, "0x3fffffff_0x7fffffff", false, null);
                 return null;
             }, () -> {
                 log.info("split 4 bundles at the same time. spilt: 0x7fffffff_0xbfffffff ");
-                admin.namespaces().splitNamespaceBundle(namespace, "0x7fffffff_0xbfffffff", false);
+                admin.namespaces().splitNamespaceBundle(namespace, "0x7fffffff_0xbfffffff", false, null);
                 return null;
             }, () -> {
                 log.info("split 4 bundles at the same time. spilt: 0xbfffffff_0xffffffff ");
-                admin.namespaces().splitNamespaceBundle(namespace, "0xbfffffff_0xffffffff", false);
+                admin.namespaces().splitNamespaceBundle(namespace, "0xbfffffff_0xffffffff", false, null);
                 return null;
             }));
         } catch (Exception e) {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest2.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest2.java
index 359003aee3802..558ce39d09f27 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest2.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest2.java
@@ -21,6 +21,7 @@
 import static org.apache.commons.lang3.StringUtils.isBlank;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
@@ -31,6 +32,7 @@
 import com.google.common.collect.Sets;
 
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -51,15 +53,19 @@
 import org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl;
 import org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl;
 import org.apache.pulsar.broker.service.Topic;
+import org.apache.pulsar.broker.service.persistent.PersistentSubscription;
 import org.apache.pulsar.broker.service.persistent.PersistentTopic;
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.admin.PulsarAdminException.PreconditionFailedException;
 import org.apache.pulsar.client.api.Consumer;
 import org.apache.pulsar.client.api.Message;
+import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.api.MessageRoutingMode;
 import org.apache.pulsar.client.api.Producer;
 import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.PulsarClientException;
+import org.apache.pulsar.client.api.SubscriptionInitialPosition;
 import org.apache.pulsar.client.api.SubscriptionType;
 import org.apache.pulsar.client.impl.MessageIdImpl;
 import org.apache.pulsar.common.naming.TopicDomain;
@@ -460,7 +466,7 @@ public void testResetCursorOnPosition(String namespaceName) throws Exception {
             }
         }
 
-        // close consumer which will clean up intenral-receive-queue
+        // close consumer which will clean up internal-receive-queue
         consumer.close();
 
         // messages should still be available due to retention
@@ -505,9 +511,8 @@ public void testResetCursorOnPosition(String namespaceName) throws Exception {
         try {
             messageId = new MessageIdImpl(0, 0, -1);
             admin.topics().resetCursor(topicName, "my-sub", messageId);
-            fail("It should have failed due to invalid subscription name");
         } catch (PulsarAdminException.PreconditionFailedException e) {
-            // Ok
+            fail("It shouldn't fail for a invalid position");
         }
 
         consumer.close();
@@ -589,7 +594,7 @@ public void testPeerCluster() throws Exception {
             assertTrue(e instanceof PreconditionFailedException);
         }
 
-        // Cluster itselft can't be part of peer-list
+        // Cluster itself can't be part of peer-list
         try {
             admin.clusters().updatePeerClusterNames("us-west1", Sets.newLinkedHashSet(Lists.newArrayList("us-west1")));
             fail("should have failed");
@@ -619,9 +624,14 @@ public void testReplicationPeerCluster() throws Exception {
                 new ClusterData("http://broker.messaging.east2.example.com:8080"));
         admin.clusters().createCluster("global", new ClusterData());
 
+        List<String> allClusters = admin.clusters().getClusters();
+        Collections.sort(allClusters);
+        assertEquals(allClusters,
+                Lists.newArrayList("test", "us-east1", "us-east2", "us-west1", "us-west2", "us-west3", "us-west4"));
+
         final String property = "peer-prop";
         Set<String> allowedClusters = Sets.newHashSet("us-west1", "us-west2", "us-west3", "us-west4", "us-east1",
-                "us-east2");
+                "us-east2", "global");
         TenantInfo propConfig = new TenantInfo(Sets.newHashSet("test"), allowedClusters);
         admin.tenants().createTenant(property, propConfig);
 
@@ -948,4 +958,291 @@ public void testCreateNamespaceWithNoClusters() throws PulsarAdminException {
         assertEquals(admin.namespaces().getNamespaceReplicationClusters(namespace),
                 Collections.singletonList(localCluster));
     }
+
+    @Test(timeOut = 30000)
+    public void testConsumerStatsLastTimestamp() throws PulsarClientException, PulsarAdminException, InterruptedException {
+        long timestamp = System.currentTimeMillis();
+        final String topicName = "consumer-stats-" + timestamp;
+        final String subscribeName = topicName + "-test-stats-sub";
+        final String topic = "persistent://prop-xyz/ns1/" + topicName;
+        final String producerName = "producer-" + topicName;
+
+        @Cleanup
+        PulsarClient client = PulsarClient.builder().serviceUrl(pulsar.getWebServiceAddress()).build();
+        Producer<byte[]> producer = client.newProducer().topic(topic)
+            .enableBatching(false)
+            .producerName(producerName)
+            .create();
+
+        // a. Send a message to the topic.
+        producer.send("message-1".getBytes(StandardCharsets.UTF_8));
+
+        // b. Create a consumer, because there was a message in the topic, the consumer will receive the message pushed
+        // by the broker, the lastConsumedTimestamp will as the consume subscribe time.
+        Consumer<byte[]> consumer = client.newConsumer().topic(topic)
+            .subscriptionName(subscribeName)
+            .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
+            .subscribe();
+        Message<byte[]> message = consumer.receive();
+
+        // Get the consumer stats.
+        TopicStats topicStats = admin.topics().getStats(topic);
+        SubscriptionStats subscriptionStats = topicStats.subscriptions.get(subscribeName);
+        long startConsumedFlowTimestamp = subscriptionStats.lastConsumedFlowTimestamp;
+        long startAckedTimestampInSubStats = subscriptionStats.lastAckedTimestamp;
+        ConsumerStats consumerStats = subscriptionStats.consumers.get(0);
+        long startConsumedTimestampInConsumerStats = consumerStats.lastConsumedTimestamp;
+        long startAckedTimestampInConsumerStats = consumerStats.lastAckedTimestamp;
+
+        // Because the message was pushed by the broker, the consumedTimestamp should not as 0.
+        assertNotEquals(0, startConsumedTimestampInConsumerStats);
+        // There is no consumer ack the message, so the lastAckedTimestamp still as 0.
+        assertEquals(0, startAckedTimestampInConsumerStats);
+        assertNotEquals(0, startConsumedFlowTimestamp);
+        assertEquals(0, startAckedTimestampInSubStats);
+
+        // c. The Consumer receives the message and acks the message.
+        consumer.acknowledge(message);
+        // Waiting for the ack command send to the broker.
+        while (true) {
+            topicStats = admin.topics().getStats(topic);
+            if (topicStats.subscriptions.get(subscribeName).lastAckedTimestamp != 0) {
+                break;
+            }
+            TimeUnit.MILLISECONDS.sleep(100);
+        }
+
+        // Get the consumer stats.
+        topicStats = admin.topics().getStats(topic);
+        subscriptionStats = topicStats.subscriptions.get(subscribeName);
+        long consumedFlowTimestamp = subscriptionStats.lastConsumedFlowTimestamp;
+        long ackedTimestampInSubStats = subscriptionStats.lastAckedTimestamp;
+        consumerStats = subscriptionStats.consumers.get(0);
+        long consumedTimestamp = consumerStats.lastConsumedTimestamp;
+        long ackedTimestamp = consumerStats.lastAckedTimestamp;
+
+        // The lastConsumedTimestamp should same as the last time because the broker does not push any messages and the
+        // consumer does not pull any messages.
+        assertEquals(startConsumedTimestampInConsumerStats, consumedTimestamp);
+        assertTrue(startAckedTimestampInConsumerStats < ackedTimestamp);
+        assertNotEquals(0, consumedFlowTimestamp);
+        assertTrue(startAckedTimestampInSubStats < ackedTimestampInSubStats);
+
+        // d. Send another messages. The lastConsumedTimestamp should be updated.
+        producer.send("message-2".getBytes(StandardCharsets.UTF_8));
+
+        // e. Receive the message and ack it.
+        message = consumer.receive();
+        consumer.acknowledge(message);
+        // Waiting for the ack command send to the broker.
+        while (true) {
+            topicStats = admin.topics().getStats(topic);
+            if (topicStats.subscriptions.get(subscribeName).lastAckedTimestamp != ackedTimestampInSubStats) {
+                break;
+            }
+            TimeUnit.MILLISECONDS.sleep(100);
+        }
+
+        // Get the consumer stats again.
+        topicStats = admin.topics().getStats(topic);
+        subscriptionStats = topicStats.subscriptions.get(subscribeName);
+        long lastConsumedFlowTimestamp = subscriptionStats.lastConsumedFlowTimestamp;
+        long lastConsumedTimestampInSubStats = subscriptionStats.lastConsumedTimestamp;
+        long lastAckedTimestampInSubStats = subscriptionStats.lastAckedTimestamp;
+        consumerStats = subscriptionStats.consumers.get(0);
+        long lastConsumedTimestamp = consumerStats.lastConsumedTimestamp;
+        long lastAckedTimestamp = consumerStats.lastAckedTimestamp;
+
+        assertTrue(consumedTimestamp < lastConsumedTimestamp);
+        assertTrue(ackedTimestamp < lastAckedTimestamp);
+        assertTrue(startConsumedTimestampInConsumerStats < lastConsumedTimestamp);
+        assertTrue(startAckedTimestampInConsumerStats < lastAckedTimestamp);
+        assertTrue(consumedFlowTimestamp == lastConsumedFlowTimestamp);
+        assertTrue(ackedTimestampInSubStats < lastAckedTimestampInSubStats);
+        assertEquals(lastConsumedTimestamp, lastConsumedTimestampInSubStats);
+
+        consumer.close();
+        producer.close();
+    }
+
+    @Test(timeOut = 30000)
+    public void testPreciseBacklog() throws PulsarClientException, PulsarAdminException, InterruptedException {
+        final String topic = "persistent://prop-xyz/ns1/precise-back-log";
+        final String subName = "sub-name";
+
+        @Cleanup
+        PulsarClient client = PulsarClient.builder().serviceUrl(pulsar.getWebServiceAddress()).build();
+
+        @Cleanup
+        Consumer<byte[]> consumer = client.newConsumer()
+            .topic(topic)
+            .subscriptionName(subName)
+            .subscribe();
+
+        @Cleanup
+        Producer<byte[]> producer = client.newProducer()
+            .topic(topic)
+            .enableBatching(false)
+            .create();
+
+        producer.send("message-1".getBytes(StandardCharsets.UTF_8));
+        Message<byte[]> message = consumer.receive();
+        assertNotNull(message);
+
+        // Mock the entries added count. Default is disable the precise backlog, so the backlog is entries added count - consumed count
+        // Since message have not acked, so the backlog is 10
+        PersistentSubscription subscription = (PersistentSubscription)pulsar.getBrokerService().getTopicReference(topic).get().getSubscription(subName);
+        assertNotNull(subscription);
+        ((ManagedLedgerImpl)subscription.getCursor().getManagedLedger()).setEntriesAddedCounter(10L);
+        TopicStats topicStats = admin.topics().getStats(topic);
+        assertEquals(topicStats.subscriptions.get(subName).msgBacklog, 10);
+
+        topicStats = admin.topics().getStats(topic, true);
+        assertEquals(topicStats.subscriptions.get(subName).msgBacklog, 1);
+        consumer.acknowledge(message);
+
+        // wait for ack send
+        Thread.sleep(500);
+
+        // Consumer acks the message, so the precise backlog is 0
+        topicStats = admin.topics().getStats(topic, true);
+        assertEquals(topicStats.subscriptions.get(subName).msgBacklog, 0);
+
+        topicStats = admin.topics().getStats(topic);
+        assertEquals(topicStats.subscriptions.get(subName).msgBacklog, 9);
+    }
+
+    @Test(timeOut = 30000)
+    public void testBacklogNoDelayed() throws PulsarClientException, PulsarAdminException, InterruptedException {
+        final String topic = "persistent://prop-xyz/ns1/precise-back-log-no-delayed";
+        final String subName = "sub-name";
+
+        @Cleanup
+        PulsarClient client = PulsarClient.builder().serviceUrl(pulsar.getWebServiceAddress()).build();
+
+        @Cleanup
+        Consumer<byte[]> consumer = client.newConsumer()
+            .topic(topic)
+            .subscriptionName(subName)
+            .subscriptionType(SubscriptionType.Shared)
+            .subscribe();
+
+        @Cleanup
+        Producer<byte[]> producer = client.newProducer()
+            .topic(topic)
+            .enableBatching(false)
+            .create();
+
+        for (int i = 0; i < 10; i++) {
+            if (i > 4) {
+                producer.newMessage()
+                    .value("message-1".getBytes(StandardCharsets.UTF_8))
+                    .deliverAfter(10, TimeUnit.SECONDS)
+                    .send();
+            } else {
+                producer.send("message-1".getBytes(StandardCharsets.UTF_8));
+            }
+        }
+
+        TopicStats topicStats = admin.topics().getStats(topic, true);
+        assertEquals(topicStats.subscriptions.get(subName).msgBacklog, 10);
+        assertEquals(topicStats.subscriptions.get(subName).msgBacklogNoDelayed, 5);
+
+        for (int i = 0; i < 5; i++) {
+            consumer.acknowledge(consumer.receive());
+        }
+        // Wait the ack send.
+        Thread.sleep(500);
+        topicStats = admin.topics().getStats(topic, true);
+        assertEquals(topicStats.subscriptions.get(subName).msgBacklog, 5);
+        assertEquals(topicStats.subscriptions.get(subName).msgBacklogNoDelayed, 0);
+    }
+
+    @Test
+    public void testPreciseBacklogForPartitionedTopic() throws PulsarClientException, PulsarAdminException, InterruptedException {
+        final String topic = "persistent://prop-xyz/ns1/precise-back-log-for-partitioned-topic";
+        admin.topics().createPartitionedTopic(topic, 2);
+        final String subName = "sub-name";
+
+        @Cleanup
+        PulsarClient client = PulsarClient.builder().serviceUrl(pulsar.getWebServiceAddress()).build();
+
+        @Cleanup
+        Consumer<byte[]> consumer = client.newConsumer()
+            .topic(topic)
+            .subscriptionName(subName)
+            .subscribe();
+
+        @Cleanup
+        Producer<byte[]> producer = client.newProducer()
+            .topic(topic)
+            .enableBatching(false)
+            .create();
+
+        producer.send("message-1".getBytes(StandardCharsets.UTF_8));
+        Message<byte[]> message = consumer.receive();
+        assertNotNull(message);
+
+        // Mock the entries added count. Default is disable the precise backlog, so the backlog is entries added count - consumed count
+        // Since message have not acked, so the backlog is 10
+        for (int i = 0; i < 2; i++) {
+            PersistentSubscription subscription = (PersistentSubscription)pulsar.getBrokerService().getTopicReference(topic + "-partition-" + i).get().getSubscription(subName);
+            assertNotNull(subscription);
+            ((ManagedLedgerImpl)subscription.getCursor().getManagedLedger()).setEntriesAddedCounter(10L);
+        }
+
+        TopicStats topicStats = admin.topics().getPartitionedStats(topic, false);
+        assertEquals(topicStats.subscriptions.get(subName).msgBacklog, 20);
+
+        topicStats = admin.topics().getPartitionedStats(topic, false, true);
+        assertEquals(topicStats.subscriptions.get(subName).msgBacklog, 1);
+    }
+
+    @Test(timeOut = 30000)
+    public void testBacklogNoDelayedForPartitionedTopic() throws PulsarClientException, PulsarAdminException, InterruptedException {
+        final String topic = "persistent://prop-xyz/ns1/precise-back-log-no-delayed-partitioned-topic";
+        admin.topics().createPartitionedTopic(topic, 2);
+        final String subName = "sub-name";
+
+        @Cleanup
+        PulsarClient client = PulsarClient.builder().serviceUrl(pulsar.getWebServiceAddress()).build();
+
+        @Cleanup
+        Consumer<byte[]> consumer = client.newConsumer()
+            .topic(topic)
+            .subscriptionName(subName)
+            .subscriptionType(SubscriptionType.Shared)
+            .subscribe();
+
+        @Cleanup
+        Producer<byte[]> producer = client.newProducer()
+            .topic(topic)
+            .enableBatching(false)
+            .create();
+
+        for (int i = 0; i < 10; i++) {
+            if (i > 4) {
+                producer.newMessage()
+                    .value("message-1".getBytes(StandardCharsets.UTF_8))
+                    .deliverAfter(10, TimeUnit.SECONDS)
+                    .send();
+            } else {
+                producer.send("message-1".getBytes(StandardCharsets.UTF_8));
+            }
+        }
+
+        TopicStats topicStats = admin.topics().getPartitionedStats(topic, false, true);
+        assertEquals(topicStats.subscriptions.get(subName).msgBacklog, 10);
+        assertEquals(topicStats.subscriptions.get(subName).msgBacklogNoDelayed, 5);
+
+        for (int i = 0; i < 5; i++) {
+            consumer.acknowledge(consumer.receive());
+        }
+        // Wait the ack send.
+        Thread.sleep(500);
+        topicStats = admin.topics().getPartitionedStats(topic, false, true);
+        assertEquals(topicStats.subscriptions.get(subName).msgBacklog, 5);
+        assertEquals(topicStats.subscriptions.get(subName).msgBacklogNoDelayed, 0);
+    }
+
 }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java
index 06ec02ae000b7..00d1a31b1ef53 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminTest.java
@@ -381,7 +381,11 @@ void properties() throws Exception {
         assertEquals(properties.getTenants(), Lists.newArrayList());
         verify(properties, times(1)).validateSuperUserAccess();
 
+        // create local cluster
+        clusters.createCluster(configClusterName, new ClusterData());
+
         Set<String> allowedClusters = Sets.newHashSet();
+        allowedClusters.add(configClusterName);
         TenantInfo tenantInfo = new TenantInfo(Sets.newHashSet("role1", "role2"), allowedClusters);
         properties.createTenant("test-property", tenantInfo);
         verify(properties, times(2)).validateSuperUserAccess();
@@ -489,7 +493,6 @@ void properties() throws Exception {
         assertEquals(properties.getTenants(), Lists.newArrayList());
 
         // Create a namespace to test deleting a non-empty property
-        clusters.createCluster("use", new ClusterData());
         newPropertyAdmin = new TenantInfo(Sets.newHashSet("role1", "other-role"), Sets.newHashSet("use"));
         properties.createTenant("my-tenant", newPropertyAdmin);
 
@@ -511,9 +514,34 @@ void properties() throws Exception {
         }
 
         // Check tenantInfo is null
-        TenantInfo nullTenantInfo = new TenantInfo();
-        properties.createTenant("tenant-config-is-null", null);
-        assertEquals(properties.getTenantAdmin("tenant-config-is-null"), nullTenantInfo);
+        try {
+            properties.createTenant("tenant-config-is-null", null);
+            fail("should have failed");
+        } catch (RestException e) {
+            assertEquals(e.getResponse().getStatus(), Status.PRECONDITION_FAILED.getStatusCode());
+        }
+
+        // Check tenantInfo with empty cluster
+        String blankCluster = "";
+        Set<String> blankClusters = Sets.newHashSet(blankCluster);
+        TenantInfo tenantWithEmptyCluster = new TenantInfo(Sets.newHashSet("role1", "role2"), blankClusters);
+        try {
+            properties.createTenant("tenant-config-is-empty", tenantWithEmptyCluster);
+            fail("should have failed");
+        } catch (RestException e) {
+            assertEquals(e.getResponse().getStatus(), Status.PRECONDITION_FAILED.getStatusCode());
+        }
+
+        // Check tenantInfo contains empty cluster
+        Set<String> containBlankClusters = Sets.newHashSet(blankCluster);
+        containBlankClusters.add(configClusterName);
+        TenantInfo tenantContainEmptyCluster = new TenantInfo(Sets.newHashSet(), containBlankClusters);
+        try {
+            properties.createTenant("tenant-config-contain-empty", tenantContainEmptyCluster);
+            fail("should have failed");
+        } catch (RestException e) {
+            assertEquals(e.getResponse().getStatus(), Status.PRECONDITION_FAILED.getStatusCode());
+        }
 
         AsyncResponse response = mock(AsyncResponse.class);
         namespaces.deleteNamespace(response, "my-tenant", "use", "my-namespace", false);
@@ -521,7 +549,6 @@ void properties() throws Exception {
         verify(response, timeout(5000).times(1)).resume(captor.capture());
         assertEquals(captor.getValue().getStatus(), Status.NO_CONTENT.getStatusCode());
         properties.deleteTenant("my-tenant");
-        properties.deleteTenant("tenant-config-is-null");
     }
 
     @Test
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
index a4cd3258198ac..1825d313124e7 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
@@ -276,18 +276,46 @@ public void testUpdatePartitionedTopicHavingNonPartitionTopicWithPartitionSuffix
     @Test
     public void testUnloadTopic() {
         final String topicName = "standard-topic-to-be-unload";
+        final String partitionTopicName = "partition-topic-to-be-unload";
+
+        // 1) not exist topic
+        AsyncResponse response = mock(AsyncResponse.class);
+        persistentTopics.unloadTopic(response, testTenant, testNamespace, "topic-not-exist", true);
+        ArgumentCaptor<RestException> errCaptor = ArgumentCaptor.forClass(RestException.class);
+        verify(response, timeout(5000).times(1)).resume(errCaptor.capture());
+        Assert.assertEquals(errCaptor.getValue().getResponse().getStatus(), Response.Status.NOT_FOUND.getStatusCode());
+
+        // 2) create non partitioned topic and unload
+        response = mock(AsyncResponse.class);
         persistentTopics.createNonPartitionedTopic(testTenant, testNamespace, topicName, true);
-        persistentTopics.unloadTopic(testTenant, testNamespace, topicName, true);
+        persistentTopics.unloadTopic(response, testTenant, testNamespace, topicName, true);
+        ArgumentCaptor<Response> responseCaptor = ArgumentCaptor.forClass(Response.class);
+        verify(response, timeout(5000).times(1)).resume(responseCaptor.capture());
+        Assert.assertEquals(responseCaptor.getValue().getStatus(), Response.Status.NO_CONTENT.getStatusCode());
+
+        // 3) create partitioned topic and unload
+        response = mock(AsyncResponse.class);
+        persistentTopics.createPartitionedTopic(testTenant, testNamespace, partitionTopicName, 6);
+        persistentTopics.unloadTopic(response, testTenant, testNamespace, partitionTopicName, true);
+        responseCaptor = ArgumentCaptor.forClass(Response.class);
+        verify(response, timeout(5000).times(1)).resume(responseCaptor.capture());
+        Assert.assertEquals(responseCaptor.getValue().getStatus(), Response.Status.NO_CONTENT.getStatusCode());
+
+        // 4) delete partitioned topic
+        response = mock(AsyncResponse.class);
+        persistentTopics.deletePartitionedTopic(response, testTenant, testNamespace, partitionTopicName, true, true);
+        responseCaptor = ArgumentCaptor.forClass(Response.class);
+        verify(response, timeout(5000).times(1)).resume(responseCaptor.capture());
+        Assert.assertEquals(responseCaptor.getValue().getStatus(), Response.Status.NO_CONTENT.getStatusCode());
     }
 
-    @Test(expectedExceptions = RestException.class)
+    @Test
     public void testUnloadTopicShallThrowNotFoundWhenTopicNotExist() {
-        try {
-            persistentTopics.unloadTopic(testTenant, testNamespace,"non-existent-topic", true);
-        } catch (RestException e) {
-            Assert.assertEquals(e.getResponse().getStatus(), Response.Status.NOT_FOUND.getStatusCode());
-            throw e;
-        }
+        AsyncResponse response = mock(AsyncResponse.class);
+        persistentTopics.unloadTopic(response, testTenant, testNamespace,"non-existent-topic", true);
+        ArgumentCaptor<RestException> responseCaptor = ArgumentCaptor.forClass(RestException.class);
+        verify(response, timeout(5000).times(1)).resume(responseCaptor.capture());
+        Assert.assertEquals(responseCaptor.getValue().getResponse().getStatus(), Response.Status.NOT_FOUND.getStatusCode());
     }
 
     @Test
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
index cf5db2b660220..9c7e1d47b94eb 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest.java
@@ -638,6 +638,9 @@ public void namespaces() throws PulsarAdminException, PulsarServerException, Exc
         policies.subscriptionDispatchRate.put("test", ConfigHelper.subscriptionDispatchRate(conf));
         policies.clusterSubscribeRate.put("test", ConfigHelper.subscribeRate(conf));
 
+        policies.max_unacked_messages_per_subscription = 200000;
+        policies.max_unacked_messages_per_consumer = 50000;
+
         assertEquals(admin.namespaces().getPolicies("prop-xyz/use/ns1"), policies);
         assertEquals(admin.namespaces().getPermissions("prop-xyz/use/ns1"), policies.auth_policies.namespace_auth);
 
@@ -953,7 +956,7 @@ public void testNamespaceSplitBundle() throws Exception {
         assertEquals(admin.topics().getList(namespace), Lists.newArrayList(topicName));
 
         try {
-            admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", true);
+            admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", true, null);
         } catch (Exception e) {
             fail("split bundle shouldn't have thrown exception");
         }
@@ -983,7 +986,7 @@ public void testNamespaceSplitBundleConcurrent() throws Exception {
         assertEquals(admin.topics().getList(namespace), Lists.newArrayList(topicName));
 
         try {
-            admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", false);
+            admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", false, null);
         } catch (Exception e) {
             fail("split bundle shouldn't have thrown exception");
         }
@@ -1004,13 +1007,13 @@ public void testNamespaceSplitBundleConcurrent() throws Exception {
                     () ->
                     {
                         log.info("split 2 bundles at the same time. spilt: 0x00000000_0x7fffffff ");
-                        admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0x7fffffff", false);
+                        admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0x7fffffff", false, null);
                         return null;
                     },
                     () ->
                     {
                         log.info("split 2 bundles at the same time. spilt: 0x7fffffff_0xffffffff ");
-                        admin.namespaces().splitNamespaceBundle(namespace, "0x7fffffff_0xffffffff", false);
+                        admin.namespaces().splitNamespaceBundle(namespace, "0x7fffffff_0xffffffff", false, null);
                         return null;
                     }
                 )
@@ -1036,25 +1039,25 @@ public void testNamespaceSplitBundleConcurrent() throws Exception {
                     () ->
                     {
                         log.info("split 4 bundles at the same time. spilt: 0x00000000_0x3fffffff ");
-                        admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0x3fffffff", false);
+                        admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0x3fffffff", false, null);
                         return null;
                     },
                     () ->
                     {
                         log.info("split 4 bundles at the same time. spilt: 0x3fffffff_0x7fffffff ");
-                        admin.namespaces().splitNamespaceBundle(namespace, "0x3fffffff_0x7fffffff", false);
+                        admin.namespaces().splitNamespaceBundle(namespace, "0x3fffffff_0x7fffffff", false, null);
                         return null;
                     },
                     () ->
                     {
                         log.info("split 4 bundles at the same time. spilt: 0x7fffffff_0xbfffffff ");
-                        admin.namespaces().splitNamespaceBundle(namespace, "0x7fffffff_0xbfffffff", false);
+                        admin.namespaces().splitNamespaceBundle(namespace, "0x7fffffff_0xbfffffff", false, null);
                         return null;
                     },
                     () ->
                     {
                         log.info("split 4 bundles at the same time. spilt: 0xbfffffff_0xffffffff ");
-                        admin.namespaces().splitNamespaceBundle(namespace, "0xbfffffff_0xffffffff", false);
+                        admin.namespaces().splitNamespaceBundle(namespace, "0xbfffffff_0xffffffff", false, null);
                         return null;
                     }
                 )
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest2.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest2.java
index 2865c915eadc6..4c8289bfa34da 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest2.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/v1/V1_AdminApiTest2.java
@@ -501,9 +501,8 @@ public void testResetCursorOnPosition(String namespaceName) throws Exception {
         try {
             messageId = new MessageIdImpl(0, 0, -1);
             admin.topics().resetCursor(topicName, "my-sub", messageId);
-            fail("It should have failed due to invalid subscription name");
         } catch (PulsarAdminException.PreconditionFailedException e) {
-            // Ok
+            fail("It shouldn't fail for a invalid position");
         }
 
         consumer.close();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java
index a47e3ebc3dea4..7b3b04061e55d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java
@@ -21,6 +21,7 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 
+import com.google.common.collect.Sets;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
@@ -31,6 +32,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -48,8 +50,11 @@
 import org.apache.pulsar.broker.ServiceConfiguration;
 import org.apache.pulsar.broker.namespace.NamespaceService;
 import org.apache.pulsar.client.admin.PulsarAdmin;
+import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.client.api.PulsarClientException;
+import org.apache.pulsar.common.policies.data.ClusterData;
+import org.apache.pulsar.common.policies.data.TenantInfo;
 import org.apache.pulsar.compaction.Compactor;
 import org.apache.pulsar.zookeeper.ZooKeeperClientFactory;
 import org.apache.pulsar.zookeeper.ZookeeperClientFactoryImpl;
@@ -231,6 +236,17 @@ protected void setupBrokerMocks(PulsarService pulsar) throws Exception {
         doReturn(sameThreadOrderedSafeExecutor).when(pulsar).getOrderedExecutor();
     }
 
+    public TenantInfo createDefaultTenantInfo() throws PulsarAdminException {
+        // create local cluster if not exist
+        if (!admin.clusters().getClusters().contains(configClusterName)) {
+            admin.clusters().createCluster(configClusterName, new ClusterData());
+        }
+        Set<String> allowedClusters = Sets.newHashSet();
+        allowedClusters.add(configClusterName);
+        TenantInfo tenantInfo = new TenantInfo(Sets.newHashSet(), allowedClusters);
+        return tenantInfo;
+    }
+
     public static MockZooKeeper createMockZooKeeper() throws Exception {
         MockZooKeeper zk = MockZooKeeper.newInstance(MoreExecutors.newDirectExecutorService());
         List<ACL> dummyAclList = new ArrayList<>(0);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java
index b61474ad3d992..0951da4d018a8 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/AntiAffinityNamespaceGroupTest.java
@@ -428,7 +428,7 @@ public void testBrokerSelectionForAntiAffinityGroup() throws Exception {
 
     /**
      * It verifies that load-shedding task should unload namespace only if there is a broker available which doesn't
-     * cause uneven anti-affinitiy namespace distribution.
+     * cause uneven anti-affinity namespace distribution.
      *
      * <pre>
      * 1. broker1 owns ns-0 => broker1 can unload ns-0
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTest.java
index 013175f29a41b..d52a3ecb47bb7 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTest.java
@@ -312,7 +312,7 @@ private void printSortedRanking(AtomicReference<Map<Long, Set<ResourceUnit>>> so
     /*
      * Pre-publish load report to ZK, each broker has: - Difference memory capacity, for the first 3 brokers memory is
      * bottleneck, for the 4/5th brokers CPU become bottleneck since memory is big enough - non-bundles assigned so all
-     * idle resources are avaiable for new bundle Check the broker rankings are the load percentage of each broker.
+     * idle resources are available for new bundle Check the broker rankings are the load percentage of each broker.
      */
     @Test
     public void testBrokerRanking() throws Exception {
@@ -402,7 +402,7 @@ public void testTopicAssignmentWithExistingBundles() throws Exception {
             printSortedRanking(sortedRanking);
         }
 
-        // check owner of new destiations and verify that the distribution is roughly
+        // check owner of new destinations and verify that the distribution is roughly
         // consistent (variation < 10%) with the broker capacity:
         int totalNamespaces = 250;
         int[] expectedAssignments = new int[] { 17, 34, 51, 68, 85 };
@@ -680,25 +680,25 @@ public void testNamespaceBundleAutoSplit() throws Exception {
         boolean isAutoUnooadSplitBundleEnabled = pulsarServices[0].getConfiguration().isLoadBalancerAutoUnloadSplitBundlesEnabled();
         // verify bundles are split
         verify(namespaceAdmin, times(1)).splitNamespaceBundle("pulsar/use/primary-ns-01", "0x00000000_0x80000000",
-                isAutoUnooadSplitBundleEnabled);
+                isAutoUnooadSplitBundleEnabled, null);
         verify(namespaceAdmin, times(1)).splitNamespaceBundle("pulsar/use/primary-ns-02", "0x00000000_0x80000000",
-                isAutoUnooadSplitBundleEnabled);
+                isAutoUnooadSplitBundleEnabled, null);
         verify(namespaceAdmin, times(1)).splitNamespaceBundle("pulsar/use/primary-ns-03", "0x00000000_0x80000000",
-                isAutoUnooadSplitBundleEnabled);
+                isAutoUnooadSplitBundleEnabled, null);
         verify(namespaceAdmin, times(1)).splitNamespaceBundle("pulsar/use/primary-ns-04", "0x00000000_0x80000000",
-                isAutoUnooadSplitBundleEnabled);
+                isAutoUnooadSplitBundleEnabled, null);
         verify(namespaceAdmin, times(1)).splitNamespaceBundle("pulsar/use/primary-ns-05", "0x00000000_0x80000000",
-                isAutoUnooadSplitBundleEnabled);
+                isAutoUnooadSplitBundleEnabled, null);
         verify(namespaceAdmin, times(1)).splitNamespaceBundle("pulsar/use/primary-ns-06", "0x00000000_0x80000000",
-                isAutoUnooadSplitBundleEnabled);
+                isAutoUnooadSplitBundleEnabled, null);
         verify(namespaceAdmin, times(1)).splitNamespaceBundle("pulsar/use/primary-ns-07", "0x00000000_0x80000000",
-                isAutoUnooadSplitBundleEnabled);
+                isAutoUnooadSplitBundleEnabled, null);
         verify(namespaceAdmin, never()).splitNamespaceBundle("pulsar/use/primary-ns-08", "0x00000000_0x80000000",
-                isAutoUnooadSplitBundleEnabled);
+                isAutoUnooadSplitBundleEnabled, null);
         verify(namespaceAdmin, never()).splitNamespaceBundle("pulsar/use/primary-ns-09", "0x00000000_0x80000000",
-                isAutoUnooadSplitBundleEnabled);
+                isAutoUnooadSplitBundleEnabled, null);
         verify(namespaceAdmin, never()).splitNamespaceBundle("pulsar/use/primary-ns-10", "0x00000000_0x02000000",
-                isAutoUnooadSplitBundleEnabled);
+                isAutoUnooadSplitBundleEnabled, null);
     }
 
     /*
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedderTest.java
index 34725eeb7917f..14a86cc68690d 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedderTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/impl/OverloadShedderTest.java
@@ -188,4 +188,18 @@ public void testFilterRecentlyUnloaded() {
         assertFalse(bundlesToUnload.isEmpty());
         assertEquals(bundlesToUnload.get("broker-1"), Lists.newArrayList("bundle-8", "bundle-7"));
     }
+
+    @Test
+    public void testPrintResourceUsage() {
+        LocalBrokerData data = new LocalBrokerData();
+
+        data.setCpu(new ResourceUsage(10, 100));
+        data.setMemory(new ResourceUsage(50, 100));
+        data.setDirectMemory(new ResourceUsage(90, 100));
+        data.setBandwidthIn(new ResourceUsage(30, 100));
+        data.setBandwidthOut(new ResourceUsage(20, 100));
+
+        assertEquals(data.printResourceUsage(),
+                "cpu: 10.00%, memory: 50.00%, directMemory: 90.00%, bandwidthIn: 30.00%, bandwidthOut: 20.00%");
+    }
 }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java
index fb83ff218a8ea..ce5f519cfb2c8 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java
@@ -61,6 +61,7 @@
 import org.apache.pulsar.client.api.Consumer;
 import org.apache.pulsar.common.naming.NamespaceBundle;
 import org.apache.pulsar.common.naming.NamespaceBundleFactory;
+import org.apache.pulsar.common.naming.NamespaceBundleSplitAlgorithm;
 import org.apache.pulsar.common.naming.NamespaceBundles;
 import org.apache.pulsar.common.naming.NamespaceName;
 import org.apache.pulsar.common.naming.TopicName;
@@ -110,7 +111,7 @@ public void testSplitAndOwnBundles() throws Exception {
         NamespaceBundle originalBundle = bundles.findBundle(topicName);
 
         // Split bundle and take ownership of split bundles
-        CompletableFuture<Void> result = namespaceService.splitAndOwnBundle(originalBundle, false);
+        CompletableFuture<Void> result = namespaceService.splitAndOwnBundle(originalBundle, false, NamespaceBundleSplitAlgorithm.rangeEquallyDivide);
 
         try {
             result.get();
@@ -190,7 +191,7 @@ public void testSplitMapWithRefreshedStatMap() throws Exception {
         assertNotNull(list);
 
         // Split bundle and take ownership of split bundles
-        CompletableFuture<Void> result = namespaceService.splitAndOwnBundle(originalBundle, false);
+        CompletableFuture<Void> result = namespaceService.splitAndOwnBundle(originalBundle, false, NamespaceBundleSplitAlgorithm.rangeEquallyDivide);
         try {
             result.get();
         } catch (Exception e) {
@@ -359,7 +360,7 @@ public void testLoadReportDeserialize() throws Exception {
                 CreateMode.EPHEMERAL);
         LookupResult result1 = pulsar.getNamespaceService().createLookupResult(candidateBroker1).get();
 
-        // update to new load mananger
+        // update to new load manager
         LoadManager oldLoadManager = pulsar.getLoadManager()
                 .getAndSet(new ModularLoadManagerWrapper(new ModularLoadManagerImpl()));
         oldLoadManager.stop();
@@ -383,7 +384,7 @@ public void testCreateNamespaceWithDefaultNumberOfBundles() throws Exception {
         NamespaceBundle originalBundle = bundles.findBundle(topicName);
 
         // Split bundle and take ownership of split bundles
-        CompletableFuture<Void> result = namespaceService.splitAndOwnBundle(originalBundle, false);
+        CompletableFuture<Void> result = namespaceService.splitAndOwnBundle(originalBundle, false, NamespaceBundleSplitAlgorithm.rangeEquallyDivide);
 
         try {
             result.get();
@@ -448,7 +449,7 @@ public void testRemoveOwnershipAndSplitBundle() throws Exception {
         NamespaceBundles bundles = namespaceService.getNamespaceBundleFactory().getBundles(nsname);
         NamespaceBundle originalBundle = bundles.findBundle(topicName);
 
-        CompletableFuture<Void> result1 = namespaceService.splitAndOwnBundle(originalBundle, false);
+        CompletableFuture<Void> result1 = namespaceService.splitAndOwnBundle(originalBundle, false, NamespaceBundleSplitAlgorithm.rangeEquallyDivide);
         try {
             result1.get();
         } catch (Exception e) {
@@ -467,7 +468,7 @@ public void testRemoveOwnershipAndSplitBundle() throws Exception {
             }
         });
 
-        CompletableFuture<Void> result2 = namespaceService.splitAndOwnBundle(splittedBundle, true);
+        CompletableFuture<Void> result2 = namespaceService.splitAndOwnBundle(splittedBundle, true, NamespaceBundleSplitAlgorithm.rangeEquallyDivide);
         try {
             result2.get();
         } catch (Exception e) {
@@ -483,7 +484,7 @@ private Pair<NamespaceBundles, List<NamespaceBundle>> splitBundles(NamespaceBund
         bCacheField.setAccessible(true);
         ((AsyncLoadingCache<NamespaceName, NamespaceBundles>) bCacheField.get(utilityFactory)).put(nsname,
                 CompletableFuture.completedFuture(bundles));
-        return utilityFactory.splitBundles(targetBundle, 2);
+        return utilityFactory.splitBundles(targetBundle, 2, null);
     }
 
     private static final Logger log = LoggerFactory.getLogger(NamespaceServiceTest.class);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java
index 05b888a785479..3d5f95603b057 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java
@@ -121,7 +121,7 @@ public void testSimpleBatchProducerWithFixedBatchSize(CompressionType compressio
         assertTrue(topic.getProducers().values().iterator().next().getStats().msgRateIn > 0.0);
         // we expect 2 messages in the backlog since we sent 50 messages with the batch size set to 25. We have set the
         // batch time high enough for it to not affect the number of messages in the batch
-        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(), 2);
+        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false), 2);
         consumer = pulsarClient.newConsumer().topic(topicName).subscriptionName(subscriptionName).subscribe();
 
         for (int i = 0; i < numMsgs; i++) {
@@ -170,7 +170,7 @@ public void testSimpleBatchProducerWithFixedBatchBytes(CompressionType compressi
         assertTrue(topic.getProducers().values().iterator().next().getStats().msgRateIn > 0.0);
         // we expect 2 messages in the backlog since we sent 50 messages with the batch size set to 25. We have set the
         // batch time high enough for it to not affect the number of messages in the batch
-        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(), 2);
+        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false), 2);
         consumer = pulsarClient.newConsumer().topic(topicName).subscriptionName(subscriptionName).subscribe();
 
         for (int i = 0; i < numMsgs; i++) {
@@ -215,8 +215,8 @@ public void testSimpleBatchProducerWithFixedBatchTime(CompressionType compressio
         rolloverPerIntervalStats();
         assertTrue(topic.getProducers().values().iterator().next().getStats().msgRateIn > 0.0);
         LOG.info("Sent {} messages, backlog is {} messages", numMsgs,
-                topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog());
-        assertTrue(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog() < numMsgs);
+                topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false));
+        assertTrue(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false) < numMsgs);
 
         producer.close();
     }
@@ -251,8 +251,8 @@ public void testSimpleBatchProducerWithFixedBatchSizeAndTime(CompressionType com
         rolloverPerIntervalStats();
         assertTrue(topic.getProducers().values().iterator().next().getStats().msgRateIn > 0.0);
         LOG.info("Sent {} messages, backlog is {} messages", numMsgs,
-                topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog());
-        assertTrue(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog() < numMsgs);
+                topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false));
+        assertTrue(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false) < numMsgs);
 
         producer.close();
     }
@@ -298,7 +298,7 @@ public void testBatchProducerWithLargeMessage(CompressionType compressionType, B
         assertTrue(topic.getProducers().values().iterator().next().getStats().msgRateIn > 0.0);
         // we expect 3 messages in the backlog since the large message in the middle should
         // close out the batch and be sent in a batch of its own
-        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(), 3);
+        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false), 3);
         consumer = pulsarClient.newConsumer()
                 .topic(topicName)
                 .subscriptionName(subscriptionName)
@@ -312,7 +312,7 @@ public void testBatchProducerWithLargeMessage(CompressionType compressionType, B
             consumer.acknowledge(msg);
         }
         Thread.sleep(100);
-        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(), 0);
+        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false), 0);
         consumer.close();
         producer.close();
     }
@@ -354,7 +354,7 @@ public void testSimpleBatchProducerConsumer(CompressionType compressionType, Bat
 
         rolloverPerIntervalStats();
         assertTrue(topic.getProducers().values().iterator().next().getStats().msgRateIn > 0.0);
-        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(), numMsgs / numMsgsInBatch);
+        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false), numMsgs / numMsgsInBatch);
         consumer = pulsarClient.newConsumer().topic(topicName).subscriptionName(subscriptionName).subscribe();
 
         Message<byte[]> lastunackedMsg = null;
@@ -371,7 +371,7 @@ public void testSimpleBatchProducerConsumer(CompressionType compressionType, Bat
             consumer.acknowledgeCumulative(lastunackedMsg);
         }
         Thread.sleep(100);
-        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(), 0);
+        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false), 0);
         consumer.close();
         producer.close();
     }
@@ -403,7 +403,7 @@ public void testSimpleBatchSyncProducerWithFixedBatchSize(BatcherBuilder builder
         assertTrue(topic.getProducers().values().iterator().next().getStats().msgRateIn > 0.0);
         // we expect 10 messages in the backlog since we sent 10 messages with the batch size set to 5.
         // However, we are using synchronous send and so each message will go as an individual message
-        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(), 10);
+        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false), 10);
         consumer = pulsarClient.newConsumer().topic(topicName).subscriptionName(subscriptionName).subscribe();
 
         for (int i = 0; i < numMsgs; i++) {
@@ -458,7 +458,7 @@ public void testSimpleBatchProducerConsumer1kMessages(BatcherBuilder builder) th
         // allow stats to be updated..
         LOG.info("[{}] checking backlog stats..");
         rolloverPerIntervalStats();
-        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(), numMsgs / numMsgsInBatch);
+        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false), numMsgs / numMsgsInBatch);
         consumer = pulsarClient.newConsumer().topic(topicName).subscriptionName(subscriptionName).subscribe();
 
         Message<byte[]> lastunackedMsg = null;
@@ -473,7 +473,7 @@ public void testSimpleBatchProducerConsumer1kMessages(BatcherBuilder builder) th
 
         consumer.close();
         producer.close();
-        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(), 0);
+        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false), 0);
     }
 
     // test for ack holes
@@ -507,7 +507,7 @@ public void testOutOfOrderAcksForBatchMessage() throws Exception {
         PersistentTopic topic = (PersistentTopic) pulsar.getBrokerService().getTopicReference(topicName).get();
 
         rolloverPerIntervalStats();
-        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(), numMsgs / numMsgsInBatch);
+        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false), numMsgs / numMsgsInBatch);
         consumer = pulsarClient.newConsumer().topic(topicName).subscriptionName(subscriptionName).subscribe();
         Set<Integer> individualAcks = new HashSet<>();
         for (int i = 15; i < 20; i++) {
@@ -528,7 +528,7 @@ public void testOutOfOrderAcksForBatchMessage() throws Exception {
                 Thread.sleep(1000);
                 rolloverPerIntervalStats();
                 Thread.sleep(1000);
-                assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(), 3);
+                assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false), 3);
             } else if (individualAcks.contains(i)) {
                 consumer.acknowledge(msg);
             } else {
@@ -537,12 +537,12 @@ public void testOutOfOrderAcksForBatchMessage() throws Exception {
         }
         Thread.sleep(1000);
         rolloverPerIntervalStats();
-        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(), 2);
+        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false), 2);
         if (lastunackedMsg != null) {
             consumer.acknowledgeCumulative(lastunackedMsg);
         }
         Thread.sleep(100);
-        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(), 0);
+        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false), 0);
         consumer.close();
         producer.close();
     }
@@ -580,7 +580,7 @@ public void testNonBatchCumulativeAckAfterBatchPublish(BatcherBuilder builder) t
 
         rolloverPerIntervalStats();
         assertTrue(topic.getProducers().values().iterator().next().getStats().msgRateIn > 0.0);
-        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(), 2);
+        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false), 2);
         consumer = pulsarClient.newConsumer().topic(topicName).subscriptionName(subscriptionName).subscribe();
 
         Message<byte[]> lastunackedMsg = null;
@@ -594,7 +594,7 @@ public void testNonBatchCumulativeAckAfterBatchPublish(BatcherBuilder builder) t
         }
         Thread.sleep(100);
         rolloverPerIntervalStats();
-        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(), 0);
+        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false), 0);
         consumer.close();
         producer.close();
         noBatchProducer.close();
@@ -637,7 +637,7 @@ public void testBatchAndNonBatchCumulativeAcks(BatcherBuilder builder) throws Ex
 
         rolloverPerIntervalStats();
         assertTrue(topic.getProducers().values().iterator().next().getStats().msgRateIn > 0.0);
-        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(),
+        assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false),
                 (numMsgs / 2) / numMsgsInBatch + numMsgs / 2);
         consumer = pulsarClient.newConsumer()
                     .topic(topicName)
@@ -662,7 +662,7 @@ public void testBatchAndNonBatchCumulativeAcks(BatcherBuilder builder) throws Ex
             consumer.acknowledgeCumulative(lastunackedMsg);
         }
 
-        retryStrategically(t -> topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog() == 0, 100, 100);
+        retryStrategically(t -> topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(false) == 0, 100, 100);
 
         consumer.close();
         producer.close();
@@ -721,7 +721,7 @@ public void testConcurrentBatchMessageAck(BatcherBuilder builder) throws Excepti
         PersistentDispatcherMultipleConsumers dispatcher = (PersistentDispatcherMultipleConsumers) topic
                 .getSubscription(subscriptionName).getDispatcher();
         // check strategically to let ack-message receive by broker
-        retryStrategically((test) -> dispatcher.getConsumers().get(0).getUnackedMessages() == 0, 5, 150);
+        retryStrategically((test) -> dispatcher.getConsumers().get(0).getUnackedMessages() == 0, 50, 150);
         assertEquals(dispatcher.getConsumers().get(0).getUnackedMessages(), 0);
 
         executor.shutdown();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
index 505038bede387..a2f27822d0008 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
@@ -153,7 +153,7 @@ public void testBrokerServicePersistentTopicStats() throws Exception {
         assertNotNull(topicRef);
 
         rolloverPerIntervalStats();
-        stats = topicRef.getStats();
+        stats = topicRef.getStats(false);
         subStats = stats.subscriptions.values().iterator().next();
 
         // subscription stats
@@ -171,7 +171,7 @@ public void testBrokerServicePersistentTopicStats() throws Exception {
         Thread.sleep(ASYNC_EVENT_COMPLETION_WAIT);
 
         rolloverPerIntervalStats();
-        stats = topicRef.getStats();
+        stats = topicRef.getStats(false);
         subStats = stats.subscriptions.values().iterator().next();
 
         // publisher stats
@@ -208,7 +208,7 @@ public void testBrokerServicePersistentTopicStats() throws Exception {
         Thread.sleep(ASYNC_EVENT_COMPLETION_WAIT);
 
         rolloverPerIntervalStats();
-        stats = topicRef.getStats();
+        stats = topicRef.getStats(false);
         subStats = stats.subscriptions.values().iterator().next();
 
         assertEquals(subStats.msgBacklog, 0);
@@ -221,13 +221,13 @@ public void testStatsOfStorageSizeWithSubscription() throws Exception {
         PersistentTopic topicRef = (PersistentTopic) pulsar.getBrokerService().getTopicReference(topicName).get();
 
         assertNotNull(topicRef);
-        assertEquals(topicRef.getStats().storageSize, 0);
+        assertEquals(topicRef.getStats(false).storageSize, 0);
 
         for (int i = 0; i < 10; i++) {
             producer.send(new byte[10]);
         }
 
-        assertTrue(topicRef.getStats().storageSize > 0);
+        assertTrue(topicRef.getStats(false).storageSize > 0);
     }
 
     @Test
@@ -246,7 +246,7 @@ public void testBrokerServicePersistentRedeliverTopicStats() throws Exception {
         assertNotNull(topicRef);
 
         rolloverPerIntervalStats();
-        stats = topicRef.getStats();
+        stats = topicRef.getStats(false);
         subStats = stats.subscriptions.values().iterator().next();
 
         // subscription stats
@@ -264,7 +264,7 @@ public void testBrokerServicePersistentRedeliverTopicStats() throws Exception {
         Thread.sleep(ASYNC_EVENT_COMPLETION_WAIT);
 
         rolloverPerIntervalStats();
-        stats = topicRef.getStats();
+        stats = topicRef.getStats(false);
         subStats = stats.subscriptions.values().iterator().next();
 
         // publisher stats
@@ -299,7 +299,7 @@ public void testBrokerServicePersistentRedeliverTopicStats() throws Exception {
         Thread.sleep(ASYNC_EVENT_COMPLETION_WAIT);
 
         rolloverPerIntervalStats();
-        stats = topicRef.getStats();
+        stats = topicRef.getStats(false);
         subStats = stats.subscriptions.values().iterator().next();
         assertTrue(subStats.msgRateRedeliver > 0.0);
         assertEquals(subStats.msgRateRedeliver, subStats.consumers.get(0).msgRateRedeliver);
@@ -313,7 +313,7 @@ public void testBrokerServicePersistentRedeliverTopicStats() throws Exception {
         Thread.sleep(ASYNC_EVENT_COMPLETION_WAIT);
 
         rolloverPerIntervalStats();
-        stats = topicRef.getStats();
+        stats = topicRef.getStats(false);
         subStats = stats.subscriptions.values().iterator().next();
 
         assertEquals(subStats.msgBacklog, 0);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java
index c8a2f86adb02e..feb1a1406bfb5 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceThrottlingTest.java
@@ -65,7 +65,7 @@ protected void cleanup() throws Exception {
     }
 
     /**
-     * Verifies: updating zk-thottling node reflects broker-maxConcurrentLookupRequest and updates semaphore.
+     * Verifies: updating zk-throttling node reflects broker-maxConcurrentLookupRequest and updates semaphore.
      *
      * @throws Exception
      */
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessagePublishBufferThrottleTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessagePublishBufferThrottleTest.java
new file mode 100644
index 0000000000000..5397725a99c67
--- /dev/null
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessagePublishBufferThrottleTest.java
@@ -0,0 +1,168 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.broker.service;
+
+import org.apache.pulsar.client.api.MessageId;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.common.util.FutureUtil;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ */
+public class MessagePublishBufferThrottleTest extends BrokerTestBase {
+
+    @Override
+    protected void setup() throws Exception {
+        //No-op
+    }
+
+    @Override
+    protected void cleanup() throws Exception {
+        //No-op
+    }
+
+    @Test
+    public void testMessagePublishBufferThrottleDisabled() throws Exception {
+        conf.setMaxMessagePublishBufferSizeInMB(-1);
+        conf.setMessagePublishBufferCheckIntervalInMillis(10);
+        super.baseSetup();
+        final String topic = "persistent://prop/ns-abc/testMessagePublishBufferThrottleDisabled";
+        Producer<byte[]> producer = pulsarClient.newProducer()
+            .topic(topic)
+            .producerName("producer-name")
+            .create();
+        Topic topicRef = pulsar.getBrokerService().getTopicReference(topic).get();
+        Assert.assertNotNull(topicRef);
+        ((AbstractTopic)topicRef).producers.get("producer-name").getCnx().setMessagePublishBufferSize(Long.MAX_VALUE / 2);
+        Thread.sleep(20);
+        Assert.assertFalse(pulsar.getBrokerService().isReachMessagePublishBufferThreshold());
+        List<CompletableFuture<MessageId>> futures = new ArrayList<>();
+        // Make sure the producer can publish succeed.
+        for (int i = 0; i < 10; i++) {
+            futures.add(producer.sendAsync(new byte[1024 * 1024]));
+        }
+        FutureUtil.waitForAll(futures).get();
+        for (CompletableFuture<MessageId> future : futures) {
+            Assert.assertNotNull(future.get());
+        }
+        Thread.sleep(20);
+        Assert.assertFalse(pulsar.getBrokerService().isReachMessagePublishBufferThreshold());
+        super.internalCleanup();
+    }
+
+    @Test
+    public void testMessagePublishBufferThrottleEnable() throws Exception {
+        conf.setMaxMessagePublishBufferSizeInMB(1);
+        conf.setMessagePublishBufferCheckIntervalInMillis(2);
+        super.baseSetup();
+        Thread.sleep(4);
+        Assert.assertFalse(pulsar.getBrokerService().isReachMessagePublishBufferThreshold());
+        final String topic = "persistent://prop/ns-abc/testMessagePublishBufferThrottleEnable";
+        Producer<byte[]> producer = pulsarClient.newProducer()
+            .topic(topic)
+            .producerName("producer-name")
+            .create();
+        Topic topicRef = pulsar.getBrokerService().getTopicReference(topic).get();
+        Assert.assertNotNull(topicRef);
+        ((AbstractTopic)topicRef).producers.get("producer-name").getCnx().setMessagePublishBufferSize(Long.MAX_VALUE / 2);
+        Thread.sleep(4);
+        Assert.assertTrue(pulsar.getBrokerService().isReachMessagePublishBufferThreshold());
+        // The first message can publish success, but the second message should be blocked
+        producer.sendAsync(new byte[1024]).get(1, TimeUnit.SECONDS);
+        MessageId messageId = null;
+        try {
+            messageId = producer.sendAsync(new byte[1024]).get(1, TimeUnit.SECONDS);
+            Assert.fail("should failed, because producer blocked by publish buffer limiting");
+        } catch (TimeoutException e) {
+            // No-op
+        }
+        Assert.assertNull(messageId);
+
+        ((AbstractTopic)topicRef).producers.get("producer-name").getCnx().setMessagePublishBufferSize(0L);
+        Thread.sleep(4);
+
+        List<CompletableFuture<MessageId>> futures = new ArrayList<>();
+        // Make sure the producer can publish succeed.
+        for (int i = 0; i < 10; i++) {
+            futures.add(producer.sendAsync(new byte[1024 * 1024]));
+        }
+        FutureUtil.waitForAll(futures).get();
+        for (CompletableFuture<MessageId> future : futures) {
+            Assert.assertNotNull(future.get());
+        }
+        Thread.sleep(4);
+        Assert.assertEquals(pulsar.getBrokerService().getCurrentMessagePublishBufferSize(), 0L);
+        super.internalCleanup();
+    }
+
+    @Test
+    public void testBlockByPublishRateLimiting() throws Exception {
+        conf.setMaxMessagePublishBufferSizeInMB(1);
+        conf.setMessagePublishBufferCheckIntervalInMillis(2);
+        super.baseSetup();
+        Thread.sleep(4);
+        Assert.assertFalse(pulsar.getBrokerService().isReachMessagePublishBufferThreshold());
+        final String topic = "persistent://prop/ns-abc/testMessagePublishBufferThrottleEnable";
+        Producer<byte[]> producer = pulsarClient.newProducer()
+            .topic(topic)
+            .producerName("producer-name")
+            .create();
+        Topic topicRef = pulsar.getBrokerService().getTopicReference(topic).get();
+        Assert.assertNotNull(topicRef);
+        ((AbstractTopic)topicRef).producers.get("producer-name").getCnx().setMessagePublishBufferSize(Long.MAX_VALUE / 2);
+        producer.sendAsync(new byte[1024]).get(1, TimeUnit.SECONDS);
+
+        Thread.sleep(4);
+        ((AbstractTopic)topicRef).producers.get("producer-name").getCnx().setAutoReadDisabledRateLimiting(true);
+        ((AbstractTopic)topicRef).producers.get("producer-name").getCnx().setMessagePublishBufferSize(0);
+        Thread.sleep(4);
+        Assert.assertFalse(pulsar.getBrokerService().isReachMessagePublishBufferThreshold());
+        MessageId messageId = null;
+        try {
+            messageId = producer.sendAsync(new byte[1024]).get(1, TimeUnit.SECONDS);
+            Assert.fail("should failed, because producer blocked by publish buffer limiting");
+        } catch (TimeoutException e) {
+            // No-op
+        }
+        Assert.assertNull(messageId);
+
+        ((AbstractTopic)topicRef).producers.get("producer-name").getCnx().setAutoReadDisabledRateLimiting(false);
+        ((AbstractTopic)topicRef).producers.get("producer-name").getCnx().enableCnxAutoRead();
+
+        List<CompletableFuture<MessageId>> futures = new ArrayList<>();
+        // Make sure the producer can publish succeed.
+        for (int i = 0; i < 10; i++) {
+            futures.add(producer.sendAsync(new byte[1024 * 1024]));
+        }
+        FutureUtil.waitForAll(futures).get();
+        for (CompletableFuture<MessageId> future : futures) {
+            Assert.assertNotNull(future.get());
+        }
+        Thread.sleep(4);
+        Assert.assertEquals(pulsar.getBrokerService().getCurrentMessagePublishBufferSize(), 0L);
+        super.internalCleanup();
+    }
+}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/NonPersistentTopicE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/NonPersistentTopicE2ETest.java
index cd475593dbb6a..78012df1198da 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/NonPersistentTopicE2ETest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/NonPersistentTopicE2ETest.java
@@ -21,8 +21,6 @@
 import java.util.Optional;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 
 import org.apache.pulsar.broker.service.schema.SchemaRegistry;
 import org.apache.pulsar.client.api.Consumer;
@@ -56,8 +54,6 @@ protected void cleanup() throws Exception {
     }
 
     @Data
-    @ToString
-    @EqualsAndHashCode
     private static class Foo {
         private String field1;
         private String field2;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentFailoverE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentFailoverE2ETest.java
index 21f3c03fa6097..eccaea6237244 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentFailoverE2ETest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentFailoverE2ETest.java
@@ -187,7 +187,7 @@ public void testSimpleConsumerEventsWithoutPartition() throws Exception {
 
         rolloverPerIntervalStats();
 
-        assertEquals(subRef.getNumberOfEntriesInBacklog(), numMsgs);
+        assertEquals(subRef.getNumberOfEntriesInBacklog(false), numMsgs);
         Thread.sleep(ASYNC_EVENT_COMPLETION_WAIT);
 
         // 3. consumer1 should have all the messages while consumer2 should have no messages
@@ -204,7 +204,7 @@ public void testSimpleConsumerEventsWithoutPartition() throws Exception {
 
         // 4. messages deleted on individual acks
         Thread.sleep(ASYNC_EVENT_COMPLETION_WAIT);
-        assertEquals(subRef.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(subRef.getNumberOfEntriesInBacklog(false), 0);
 
         for (int i = 0; i < numMsgs; i++) {
             String message = "my-message-" + i;
@@ -241,7 +241,7 @@ public void testSimpleConsumerEventsWithoutPartition() throws Exception {
 
         rolloverPerIntervalStats();
         Thread.sleep(ASYNC_EVENT_COMPLETION_WAIT);
-        assertEquals(subRef.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(subRef.getNumberOfEntriesInBacklog(false), 0);
 
         // 8. unsubscribe not allowed if multiple consumers connected
         try {
@@ -517,7 +517,7 @@ public void testActiveConsumerFailoverWithDelay() throws Exception {
         // wait for all messages to be dequeued
         int retry = 20;
         for (int i = 0; i < retry; i++) {
-            if (receivedMessages.size() >= numMsgs && subRef.getNumberOfEntriesInBacklog() == 0) {
+            if (receivedMessages.size() >= numMsgs && subRef.getNumberOfEntriesInBacklog(false) == 0) {
                 break;
             } else if (i != retry - 1) {
                 Thread.sleep(100);
@@ -526,7 +526,7 @@ public void testActiveConsumerFailoverWithDelay() throws Exception {
 
         // check if message duplication has occurred
         assertEquals(receivedMessages.size(), numMsgs);
-        assertEquals(subRef.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(subRef.getNumberOfEntriesInBacklog(false), 0);
         for (int i = 0; i < receivedMessages.size(); i++) {
             Assert.assertNotNull(receivedMessages.get(i));
             Assert.assertEquals(new String(receivedMessages.get(i).getData()), "my-message-" + i);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentMessageFinderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentMessageFinderTest.java
index ab0da31ada75e..a393ae3701bc5 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentMessageFinderTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentMessageFinderTest.java
@@ -162,7 +162,7 @@ void testPersistentMessageFinder() throws Exception {
         future = findMessage(result, c1, beginTimestamp);
         future.get();
         assertNull(result.exception);
-        assertEquals(result.position, c1.getFirstPosition());
+        assertNull(result.position);
 
         result.reset();
         future = findMessage(result, c1, endTimestamp);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentQueueE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentQueueE2ETest.java
index 7ffb00565c63c..495a9973b5322 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentQueueE2ETest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentQueueE2ETest.java
@@ -117,7 +117,7 @@ public void testSimpleConsumerEvents() throws Exception {
 
         rolloverPerIntervalStats();
 
-        assertEquals(subRef.getNumberOfEntriesInBacklog(), numMsgs * 2);
+        assertEquals(subRef.getNumberOfEntriesInBacklog(false), numMsgs * 2);
         Thread.sleep(ASYNC_EVENT_COMPLETION_WAIT);
 
         // both consumers will together consumer all messages
@@ -141,7 +141,7 @@ public void testSimpleConsumerEvents() throws Exception {
 
         // 3. messages deleted on individual acks
         Thread.sleep(ASYNC_EVENT_COMPLETION_WAIT);
-        assertEquals(subRef.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(subRef.getNumberOfEntriesInBacklog(false), 0);
 
         // 4. shared consumer unsubscribe not allowed
         try {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicE2ETest.java
index 38a080f0035e0..42190c7a18024 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicE2ETest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicE2ETest.java
@@ -161,7 +161,7 @@ public void testSimpleConsumerEvents() throws Exception {
 
         assertTrue(subRef.getDispatcher().isConsumerConnected());
         rolloverPerIntervalStats();
-        assertEquals(subRef.getNumberOfEntriesInBacklog(), numMsgs * 2);
+        assertEquals(subRef.getNumberOfEntriesInBacklog(false), numMsgs * 2);
 
         // 2. messages pushed before client receive
         Thread.sleep(ASYNC_EVENT_COMPLETION_WAIT);
@@ -179,7 +179,7 @@ public void testSimpleConsumerEvents() throws Exception {
 
         // 4. messages deleted on individual acks
         Thread.sleep(ASYNC_EVENT_COMPLETION_WAIT);
-        assertEquals(subRef.getNumberOfEntriesInBacklog(), numMsgs);
+        assertEquals(subRef.getNumberOfEntriesInBacklog(false), numMsgs);
 
         for (int i = 0; i < numMsgs; i++) {
             msg = consumer.receive();
@@ -192,7 +192,7 @@ public void testSimpleConsumerEvents() throws Exception {
 
         // 5. messages deleted on cumulative acks
         Thread.sleep(ASYNC_EVENT_COMPLETION_WAIT);
-        assertEquals(subRef.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(subRef.getNumberOfEntriesInBacklog(false), 0);
 
         // 6. consumer unsubscribe
         consumer.unsubscribe();
@@ -365,7 +365,7 @@ public Void call() throws Exception {
         PersistentSubscription subRef = topicRef.getSubscription(subName);
 
         // 1. cumulatively all threads drain the backlog
-        assertEquals(subRef.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(subRef.getNumberOfEntriesInBacklog(false), 0);
 
         // 2. flow control works the same as single consumer single thread
         Thread.sleep(ASYNC_EVENT_COMPLETION_WAIT);
@@ -848,13 +848,13 @@ public void testMessageExpiry() throws Exception {
         }
 
         rolloverPerIntervalStats();
-        assertEquals(subRef.getNumberOfEntriesInBacklog(), numMsgs);
+        assertEquals(subRef.getNumberOfEntriesInBacklog(false), numMsgs);
 
         Thread.sleep(TimeUnit.SECONDS.toMillis(messageTTLSecs));
         runMessageExpiryCheck();
 
         // 1. check all messages expired for this unconnected subscription
-        assertEquals(subRef.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(subRef.getNumberOfEntriesInBacklog(false), 0);
 
         // clean-up
         producer.close();
@@ -895,17 +895,17 @@ public void testMessageExpiryWithFewExpiredBacklog() throws Exception {
         }
 
         rolloverPerIntervalStats();
-        assertEquals(subRef.getNumberOfEntriesInBacklog(), numMsgs);
+        assertEquals(subRef.getNumberOfEntriesInBacklog(false), numMsgs);
 
         Thread.sleep(TimeUnit.SECONDS.toMillis(messageTTLSecs));
         runMessageExpiryCheck();
 
-        assertEquals(subRef.getNumberOfEntriesInBacklog(), numMsgs);
+        assertEquals(subRef.getNumberOfEntriesInBacklog(false), numMsgs);
 
         Thread.sleep(TimeUnit.SECONDS.toMillis(messageTTLSecs / 2));
         runMessageExpiryCheck();
 
-        assertEquals(subRef.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(subRef.getNumberOfEntriesInBacklog(false), 0);
     }
 
     @Test
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java
index da48dd9474aa1..aa5a843afcd0c 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java
@@ -87,7 +87,7 @@ public void testRemoveLocalClusterOnGlobalNamespace() throws Exception {
         admin1.namespaces().setNamespaceReplicationClusters(namespace, Sets.newHashSet("r2", "r3"));
 
         MockedPulsarServiceBaseTest
-                .retryStrategically((test) -> !pulsar1.getBrokerService().getTopics().containsKey(topicName), 5, 150);
+                .retryStrategically((test) -> !pulsar1.getBrokerService().getTopics().containsKey(topicName), 50, 150);
 
         Assert.assertFalse(pulsar1.getBrokerService().getTopics().containsKey(topicName));
         Assert.assertFalse(producer1.isConnected());
@@ -118,7 +118,7 @@ public void testForcefullyTopicDeletion() throws Exception {
         admin1.topics().delete(topicName, true);
 
         MockedPulsarServiceBaseTest
-                .retryStrategically((test) -> !pulsar1.getBrokerService().getTopics().containsKey(topicName), 5, 150);
+                .retryStrategically((test) -> !pulsar1.getBrokerService().getTopics().containsKey(topicName), 50, 150);
 
         Assert.assertFalse(pulsar1.getBrokerService().getTopics().containsKey(topicName));
 
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ResendRequestTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ResendRequestTest.java
index e6bdd71ad4de5..f9147250346b8 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ResendRequestTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ResendRequestTest.java
@@ -421,7 +421,8 @@ public void testExclusiveSingleAckedPartitionedTopic() throws Exception {
         final String messagePredicate = "my-message-" + key + "-";
         final int totalMessages = 10;
         final int numberOfPartitions = 4;
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName, numberOfPartitions);
         // Special step to create partitioned topic
 
@@ -476,7 +477,8 @@ public void testSharedSingleAckedPartitionedTopic() throws Exception {
         final String messagePredicate = "my-message-" + key + "-";
         final int totalMessages = 10;
         final int numberOfPartitions = 3;
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName, numberOfPartitions);
         Random rn = new Random();
         // Special step to create partitioned topic
@@ -576,7 +578,8 @@ public void testFailoverSingleAckedPartitionedTopic() throws Exception {
         final String messagePredicate = "my-message-" + key + "-";
         final int totalMessages = 10;
         final int numberOfPartitions = 3;
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName, numberOfPartitions);
         Random rn = new Random();
         // Special step to create partitioned topic
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
index 1a4231e83e98b..f01f771149a1c 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java
@@ -749,7 +749,7 @@ public void testDuplicateConcurrentSubscribeCommand() throws Exception {
         channel.writeInbound(clientCommand);
 
         Object response = getResponse();
-        assertTrue(response instanceof CommandError);
+        assertTrue(response instanceof CommandError, "Response is not CommandError but " + response);
         CommandError error = (CommandError) response;
         assertEquals(error.getError(), ServerError.ServiceNotReady);
     }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscriptionSeekTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscriptionSeekTest.java
index bbcb6b194b19b..c9cc07ccaed00 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscriptionSeekTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/SubscriptionSeekTest.java
@@ -76,19 +76,19 @@ public void testSeek() throws Exception {
         }
 
         PersistentSubscription sub = topicRef.getSubscription("my-subscription");
-        assertEquals(sub.getNumberOfEntriesInBacklog(), 10);
+        assertEquals(sub.getNumberOfEntriesInBacklog(false), 10);
 
         consumer.seek(MessageId.latest);
-        assertEquals(sub.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(sub.getNumberOfEntriesInBacklog(false), 0);
 
         // Wait for consumer to reconnect
         Thread.sleep(500);
         consumer.seek(MessageId.earliest);
-        assertEquals(sub.getNumberOfEntriesInBacklog(), 10);
+        assertEquals(sub.getNumberOfEntriesInBacklog(false), 10);
 
         Thread.sleep(500);
         consumer.seek(messageIds.get(5));
-        assertEquals(sub.getNumberOfEntriesInBacklog(), 5);
+        assertEquals(sub.getNumberOfEntriesInBacklog(false), 5);
     }
 
     @Test
@@ -131,16 +131,16 @@ public void testSeekTime() throws Exception {
             producer.send(message.getBytes());
         }
 
-        assertEquals(sub.getNumberOfEntriesInBacklog(), 10);
+        assertEquals(sub.getNumberOfEntriesInBacklog(false), 10);
 
         long currentTimestamp = System.currentTimeMillis();
         consumer.seek(currentTimestamp);
-        assertEquals(sub.getNumberOfEntriesInBacklog(), 1);
+        assertEquals(sub.getNumberOfEntriesInBacklog(false), 1);
 
         // Wait for consumer to reconnect
         Thread.sleep(1000);
         consumer.seek(currentTimestamp - resetTimeInMillis);
-        assertEquals(sub.getNumberOfEntriesInBacklog(), 10);
+        assertEquals(sub.getNumberOfEntriesInBacklog(false), 10);
     }
 
     @Test
@@ -176,7 +176,7 @@ public void testSeekTimeOnPartitionedTopic() throws Exception {
 
         long backlogs = 0;
         for (PersistentSubscription sub : subs) {
-            backlogs += sub.getNumberOfEntriesInBacklog();
+            backlogs += sub.getNumberOfEntriesInBacklog(false);
         }
 
         assertEquals(backlogs, 10);
@@ -185,7 +185,7 @@ public void testSeekTimeOnPartitionedTopic() throws Exception {
         long currentTimestamp = System.currentTimeMillis();
         consumer.seek(currentTimestamp);
         for (PersistentSubscription sub : subs) {
-            backlogs += sub.getNumberOfEntriesInBacklog();
+            backlogs += sub.getNumberOfEntriesInBacklog(false);
         }
         assertEquals(backlogs, 2);
 
@@ -195,7 +195,7 @@ public void testSeekTimeOnPartitionedTopic() throws Exception {
         backlogs = 0;
 
         for (PersistentSubscription sub : subs) {
-            backlogs += sub.getNumberOfEntriesInBacklog();
+            backlogs += sub.getNumberOfEntriesInBacklog(false);
         }
         assertEquals(backlogs, 10);
     }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicOwnerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicOwnerTest.java
index f33f28c0ad6ea..0ad182498b440 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicOwnerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicOwnerTest.java
@@ -103,7 +103,7 @@ public void testConnectToInvalidateBundleCacheBroker() throws Exception {
         // All brokers will invalidate bundles cache after namespace bundle split
         pulsarAdmins[0].namespaces().splitNamespaceBundle("my-tenant/my-ns",
                 pulsarServices[0].getNamespaceService().getBundle(TopicName.get(topic1)).getBundleRange(),
-                true);
+                true, null);
 
         PulsarClient client = PulsarClient.builder().
                 serviceUrl(serviceUrlForTopic1)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheckTest.java
index 4aa6dac4495de..09a0c44fbf312 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheckTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/JsonSchemaCompatibilityCheckTest.java
@@ -28,8 +28,6 @@
 import java.util.Map;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.client.api.SchemaSerializationException;
@@ -63,8 +61,6 @@ public void testJsonSchemaBackwardsCompatibility() throws JsonProcessingExceptio
     }
 
     @Data
-    @ToString
-    @EqualsAndHashCode
     private static class Foo {
         private String field1;
         private String field2;
@@ -73,8 +69,6 @@ private static class Foo {
     }
 
     @Data
-    @ToString
-    @EqualsAndHashCode
     private static class Bar {
         private boolean field1;
     }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheckTest.java
index d5912240b378e..df77979921a44 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheckTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/schema/KeyValueSchemaCompatibilityCheckTest.java
@@ -20,8 +20,6 @@
 
 import com.google.common.collect.Maps;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.apache.pulsar.client.api.schema.SchemaDefinition;
 import org.apache.pulsar.client.impl.schema.AvroSchema;
 import org.apache.pulsar.client.impl.schema.JSONSchema;
@@ -41,8 +39,6 @@ public class KeyValueSchemaCompatibilityCheckTest {
     private final Map<SchemaType, SchemaCompatibilityCheck> checkers = Maps.newHashMap();
 
     @Data
-    @ToString
-    @EqualsAndHashCode
     private static class Foo {
         private String field1;
         private String field2;
@@ -51,8 +47,6 @@ private static class Foo {
     }
 
     @Data
-    @ToString
-    @EqualsAndHashCode
     private static class Bar {
         private boolean field1;
     }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStatsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStatsTest.java
index bb010a61d05a2..c01173ee2511c 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStatsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/stats/prometheus/AggregatedNamespaceStatsTest.java
@@ -54,6 +54,7 @@ public void testSimpleAggregation() throws Exception {
         subStats1.msgBacklog = 50;
         subStats1.msgRateRedeliver = 1.5;
         subStats1.unackedMessages = 2;
+        subStats1.msgBacklogNoDelayed = 30;
         topicStats1.subscriptionStats.put(namespace, subStats1);
 
         TopicStats topicStats2 = new TopicStats();
@@ -81,6 +82,7 @@ public void testSimpleAggregation() throws Exception {
         subStats2.msgBacklog = 27;
         subStats2.msgRateRedeliver = 0.7;
         subStats2.unackedMessages = 0;
+        subStats2.msgBacklogNoDelayed = 20;
         topicStats2.subscriptionStats.put(namespace, subStats2);
 
         AggregatedNamespaceStats nsStats = new AggregatedNamespaceStats();
@@ -111,6 +113,7 @@ public void testSimpleAggregation() throws Exception {
         AggregatedSubscriptionStats nsSubStats = nsStats.subscriptionStats.get(namespace);
         assertNotNull(nsSubStats);
         assertEquals(nsSubStats.msgBacklog, 77);
+        assertEquals(nsSubStats.msgBacklogNoDelayed, 50);
         assertEquals(nsSubStats.msgRateRedeliver, 2.2);
         assertEquals(nsSubStats.unackedMessages, 2);
     }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java
index 42baae20f86c3..fb427473ea3e2 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java
@@ -20,7 +20,9 @@
 
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
+import static org.testng.Assert.assertEquals;
 
+import com.google.common.collect.Sets;
 import com.google.common.io.CharStreams;
 import com.google.common.io.Closeables;
 
@@ -33,6 +35,7 @@
 import java.security.PrivateKey;
 import java.security.SecureRandom;
 import java.security.cert.Certificate;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -45,6 +48,15 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 
+import lombok.Cleanup;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
 import org.apache.pulsar.broker.MockedBookKeeperClientFactory;
 import org.apache.pulsar.broker.NoOpShutdownService;
 import org.apache.pulsar.broker.PulsarService;
@@ -54,9 +66,12 @@
 import org.apache.pulsar.client.admin.PulsarAdminException.ConflictException;
 import org.apache.pulsar.client.impl.auth.AuthenticationTls;
 import org.apache.pulsar.common.policies.data.ClusterData;
+import org.apache.pulsar.common.policies.data.TenantInfo;
+import org.apache.pulsar.common.util.ObjectMapperFactory;
 import org.apache.pulsar.common.util.SecurityUtility;
 import org.apache.pulsar.zookeeper.MockedZooKeeperClientFactoryImpl;
 import org.apache.zookeeper.CreateMode;
+import org.apache.zookeeper.ZooDefs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
@@ -194,6 +209,48 @@ public void testSplitPath() {
         Assert.assertEquals(result, "topic1");
     }
 
+    @Test
+    public void testMaxRequestSize() throws Exception {
+        setupEnv(true, "1.0", true, false, false, false);
+
+        String url = pulsar.getWebServiceAddress() + "/admin/v2/tenants/my-tenant" + System.currentTimeMillis();
+
+        @Cleanup
+        CloseableHttpClient client = HttpClients.createDefault();
+        HttpPut httpPut = new HttpPut(url);
+        httpPut.setHeader("Content-Type", "application/json");
+        httpPut.setHeader("Accept", "application/json");
+
+        // HTTP server is configured to reject everything > 10K
+        TenantInfo info1 = new TenantInfo();
+        info1.setAdminRoles(Collections.singleton(StringUtils.repeat("*", 20 * 1024)));
+        httpPut.setEntity(new ByteArrayEntity(ObjectMapperFactory.getThreadLocal().writeValueAsBytes(info1)));
+
+        CloseableHttpResponse response = client.execute(httpPut);
+        // This should have failed
+        assertEquals(response.getStatusLine().getStatusCode(), 400);
+
+        // Create local cluster
+        String localCluster = "test";
+        String clusterPath = PulsarWebResource.path("clusters", localCluster);
+        byte[] content = ObjectMapperFactory.getThreadLocal().writeValueAsBytes(new ClusterData());
+        pulsar.getGlobalZkCache().getZooKeeper().create(clusterPath, content, ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+        TenantInfo info2 = new TenantInfo();
+        info2.setAdminRoles(Collections.singleton(StringUtils.repeat("*", 1 * 1024)));
+        info2.setAllowedClusters(Sets.newHashSet(localCluster));
+        httpPut.setEntity(new ByteArrayEntity(ObjectMapperFactory.getThreadLocal().writeValueAsBytes(info2)));
+
+        response = client.execute(httpPut);
+        assertEquals(response.getStatusLine().getStatusCode(), 204);
+
+        // Simple GET without content size should go through
+        HttpGet httpGet = new HttpGet(url);
+        httpGet.setHeader("Content-Type", "application/json");
+        httpGet.setHeader("Accept", "application/json");
+        response = client.execute(httpGet);
+        assertEquals(response.getStatusLine().getStatusCode(), 200);
+    }
+
     private String makeHttpRequest(boolean useTls, boolean useAuth) throws Exception {
         InputStream response = null;
         try {
@@ -256,6 +313,7 @@ private void setupEnv(boolean enableFilter, String minApiVersion, boolean allowU
         config.setClusterName("local");
         config.setAdvertisedAddress("localhost"); // TLS certificate expects localhost
         config.setZookeeperServers("localhost:2181");
+        config.setHttpMaxRequestSize(10 * 1024);
         pulsar = spy(new PulsarService(config));
         pulsar.setShutdownService(new NoOpShutdownService());
         doReturn(zkFactory).when(pulsar).getZooKeeperClientFactory();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java
index cb82e8acbdb04..0e926af5a055a 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java
@@ -161,7 +161,7 @@ public void testMultipleBrokerLookup() throws Exception {
         doReturn(true).when(loadManager2).isCentralized();
         loadManagerField.set(pulsar2.getNamespaceService(), new AtomicReference<>(loadManager2));
 
-        // mock: return Broker2 as a Least-loaded broker when leader receies request [3]
+        // mock: return Broker2 as a Least-loaded broker when leader receives request [3]
         doReturn(true).when(loadManager1).isCentralized();
         SimpleResourceUnit resourceUnit = new SimpleResourceUnit(pulsar2.getSafeWebServiceAddress(), null);
         doReturn(Optional.of(resourceUnit)).when(loadManager1).getLeastLoaded(any(ServiceUnitId.class));
@@ -206,7 +206,7 @@ public void testMultipleBrokerLookup() throws Exception {
 
     /**
      * Usecase: Redirection due to different cluster 1. Broker1 runs on cluster: "use" and Broker2 runs on cluster:
-     * "use2" 2. Broker1 receives "use2" cluster request => Broker1 reads "/clusters" from global-zookkeeper and
+     * "use2" 2. Broker1 receives "use2" cluster request => Broker1 reads "/clusters" from global-zookeeper and
      * redirects request to Broker2 which serves "use2" 3. Broker2 receives redirect request and own namespace bundle
      *
      * @throws Exception
@@ -252,7 +252,7 @@ public void testMultipleBrokerDifferentClusterLookup() throws Exception {
         Field loadManagerField = NamespaceService.class.getDeclaredField("loadManager");
         loadManagerField.setAccessible(true);
 
-        // mock: return Broker2 as a Least-loaded broker when leader receies request
+        // mock: return Broker2 as a Least-loaded broker when leader receives request
         doReturn(true).when(loadManager2).isCentralized();
         SimpleResourceUnit resourceUnit = new SimpleResourceUnit(pulsar2.getSafeWebServiceAddress(), null);
         doReturn(Optional.of(resourceUnit)).when(loadManager2).getLeastLoaded(any(ServiceUnitId.class));
@@ -291,7 +291,7 @@ public void testMultipleBrokerDifferentClusterLookup() throws Exception {
     }
 
     /**
-     * Create #PartitionedTopic and let it served by multiple brokers which requries a. tcp partitioned-metadata-lookup
+     * Create #PartitionedTopic and let it served by multiple brokers which requires a. tcp partitioned-metadata-lookup
      * b. multiple topic-lookup c. partitioned producer-consumer
      *
      * @throws Exception
@@ -324,7 +324,7 @@ public void testPartitionTopicLookup() throws Exception {
         Field loadManagerField = NamespaceService.class.getDeclaredField("loadManager");
         loadManagerField.setAccessible(true);
 
-        // mock: return Broker2 as a Least-loaded broker when leader receies request
+        // mock: return Broker2 as a Least-loaded broker when leader receives request
         doReturn(true).when(loadManager1).isCentralized();
         loadManagerField.set(pulsar.getNamespaceService(), new AtomicReference<>(loadManager1));
 
@@ -418,7 +418,7 @@ public void testWebserviceServiceTls() throws Exception {
         loadManagerField.set(pulsar2.getNamespaceService(), new AtomicReference<>(loadManager2));
         loadManagerField.set(pulsar.getNamespaceService(), new AtomicReference<>(loadManager1));
 
-        // mock: return Broker2 as a Least-loaded broker when leader receies
+        // mock: return Broker2 as a Least-loaded broker when leader receives
         // request [3]
         doReturn(true).when(loadManager1).isCentralized();
         doReturn(true).when(loadManager2).isCentralized();
@@ -844,7 +844,7 @@ public void testSplitUnloadLookupTest() throws Exception {
         // mock: redirect request to leader [2]
         doReturn(true).when(loadManager2).isCentralized();
         loadManagerField.set(pulsar2.getNamespaceService(), new AtomicReference<>(loadManager2));
-        // mock: return Broker1 as a Least-loaded broker when leader receies request [3]
+        // mock: return Broker1 as a Least-loaded broker when leader receives request [3]
         doReturn(true).when(loadManager1).isCentralized();
         SimpleResourceUnit resourceUnit = new SimpleResourceUnit(pulsar.getSafeWebServiceAddress(), null);
         doReturn(Optional.of(resourceUnit)).when(loadManager1).getLeastLoaded(any(ServiceUnitId.class));
@@ -871,7 +871,7 @@ public void testSplitUnloadLookupTest() throws Exception {
         assertEquals(bundleInBroker2.toString(), unsplitBundle);
 
         // (5) Split the bundle for topic-1
-        admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", true);
+        admin.namespaces().splitNamespaceBundle(namespace, "0x00000000_0xffffffff", true, null);
 
         // (6) Broker-2 should get the watch and update bundle cache
         final int retry = 5;
@@ -934,7 +934,7 @@ public void testModularLoadManagerSplitBundle() throws Exception {
             @Cleanup
             PulsarService pulsar2 = startBroker(conf2);
 
-            // configure broker-1 with ModularLoadlManager
+            // configure broker-1 with ModularLoadManager
             stopBroker();
             conf.setLoadManagerClassName(ModularLoadManagerImpl.class.getName());
             startBroker();
@@ -951,7 +951,7 @@ public void testModularLoadManagerSplitBundle() throws Exception {
             // mock: redirect request to leader [2]
             doReturn(true).when(loadManager2).isCentralized();
             loadManagerField.set(pulsar2.getNamespaceService(), new AtomicReference<>(loadManager2));
-            // mock: return Broker1 as a Least-loaded broker when leader receies request [3]
+            // mock: return Broker1 as a Least-loaded broker when leader receives request [3]
             doReturn(true).when(loadManager1).isCentralized();
             SimpleResourceUnit resourceUnit = new SimpleResourceUnit(pulsar.getSafeWebServiceAddress(), null);
             Optional<ResourceUnit> res = Optional.of(resourceUnit);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java
index 97e7869a8bb33..09bfb79ccdcd1 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java
@@ -182,11 +182,12 @@ public void testProducerDeduplicationWithDiscontinuousSequenceId() throws Except
         producer.flush();
 
         // Repeat the messages and verify they're not received by consumer
-        producer.newMessage().value("my-message-1".getBytes()).sequenceId(2).sendAsync();
-        producer.newMessage().value("my-message-2".getBytes()).sequenceId(4).sendAsync();
-        producer.close();
+        producer.newMessage().value("my-message-0".getBytes()).sequenceId(2).sendAsync();
+        producer.newMessage().value("my-message-1".getBytes()).sequenceId(4).sendAsync();
+        producer.newMessage().value("my-message-3".getBytes()).sequenceId(6).sendAsync();
+        producer.flush();
 
-        for (int i = 0; i < 3; i++) {
+        for (int i = 0; i < 4; i++) {
             Message<byte[]> msg = consumer.receive();
             assertEquals(new String(msg.getData()), "my-message-" + i);
             consumer.acknowledge(msg);
@@ -196,11 +197,12 @@ public void testProducerDeduplicationWithDiscontinuousSequenceId() throws Except
         Message<byte[]> msg = consumer.receive(1, TimeUnit.SECONDS);
         assertNull(msg);
 
+        producer.close();
         // Kill and restart broker
         restartBroker();
 
         producer = producerBuilder.create();
-        assertEquals(producer.getLastSequenceId(), 5L);
+        assertEquals(producer.getLastSequenceId(), 6L);
 
         // Repeat the messages and verify they're not received by consumer
         producer.newMessage().value("my-message-1".getBytes()).sequenceId(2).sendAsync();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientErrorsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientErrorsTest.java
index e384a51ae02cd..cfb7c02d47490 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientErrorsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientErrorsTest.java
@@ -572,7 +572,7 @@ public void testProducerReconnect() throws Exception {
             channelCtx.set(ctx);
             ctx.writeAndFlush(Commands.newConnected(connect.getProtocolVersion()));
             if (numOfConnections.incrementAndGet() == 2) {
-                // close the cnx immediately when trying to conenct the 2nd time
+                // close the cnx immediately when trying to connect the 2nd time
                 ctx.channel().close();
             }
         });
@@ -612,7 +612,7 @@ public void testConsumerReconnect() throws Exception {
             channelCtx.set(ctx);
             ctx.writeAndFlush(Commands.newConnected(connect.getProtocolVersion()));
             if (numOfConnections.incrementAndGet() == 2) {
-                // close the cnx immediately when trying to conenct the 2nd time
+                // close the cnx immediately when trying to connect the 2nd time
                 ctx.channel().close();
             }
             if (numOfConnections.get() == 3) {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerRedeliveryTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerRedeliveryTest.java
index 38ed31dac5e6a..e9cc8b7231374 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerRedeliveryTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ConsumerRedeliveryTest.java
@@ -58,8 +58,8 @@ protected void cleanup() throws Exception {
      * It verifies that redelivered messages are sorted based on the ledger-ids.
      * <pre>
      * 1. client publishes 100 messages across 50 ledgers
-     * 2. broker deliveres 100 messages to consumer
-     * 3. consumer ack every alternative message and doesn't ack 50 messsages
+     * 2. broker delivers 100 messages to consumer
+     * 3. consumer ack every alternative message and doesn't ack 50 messages
      * 4. broker sorts replay messages based on ledger and redelivers messages ledger by ledger
      * </pre>
      * @throws Exception
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DispatcherBlockConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DispatcherBlockConsumerTest.java
index bb7aa65d2398a..5cb4fc1383dae 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DispatcherBlockConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/DispatcherBlockConsumerTest.java
@@ -544,7 +544,7 @@ public void testBlockDispatcherStats() throws Exception {
             assertNotNull(topicRef);
 
             rolloverPerIntervalStats();
-            stats = topicRef.getStats();
+            stats = topicRef.getStats(false);
             subStats = stats.subscriptions.values().iterator().next();
 
             // subscription stats
@@ -562,7 +562,7 @@ public void testBlockDispatcherStats() throws Exception {
             Thread.sleep(timeWaitToSync);
 
             rolloverPerIntervalStats();
-            stats = topicRef.getStats();
+            stats = topicRef.getStats(false);
             subStats = stats.subscriptions.values().iterator().next();
 
             assertTrue(subStats.msgBacklog > 0);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java
index ff93d3aed297d..d75fcfd0e581b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/MessageDispatchThrottlingTest.java
@@ -18,14 +18,17 @@
  */
 package org.apache.pulsar.client.api;
 
-import com.google.common.collect.Sets;
-
 import static org.testng.Assert.assertNotNull;
 
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -37,6 +40,7 @@
 import org.apache.pulsar.broker.service.persistent.PersistentTopic;
 import org.apache.pulsar.common.policies.data.ClusterData;
 import org.apache.pulsar.common.policies.data.DispatchRate;
+import org.apache.pulsar.common.policies.data.Policies;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
@@ -101,6 +105,7 @@ enum DispatchRateType {
      *
      * @throws Exception
      */
+    @SuppressWarnings("deprecation")
     @Test
     public void testMessageRateDynamicallyChange() throws Exception {
 
@@ -116,7 +121,7 @@ public void testMessageRateDynamicallyChange() throws Exception {
         // (1) verify message-rate is -1 initially
         Assert.assertFalse(topic.getDispatchRateLimiter().isPresent());
 
-        // (1) change to 100
+        // (2) change to 100
         int messageRate = 100;
         DispatchRate dispatchRate = new DispatchRate(messageRate, -1, 360);
         admin.namespaces().setDispatchRate(namespace, dispatchRate);
@@ -134,8 +139,13 @@ public void testMessageRateDynamicallyChange() throws Exception {
         }
         Assert.assertTrue(isDispatchRateUpdate);
         Assert.assertEquals(admin.namespaces().getDispatchRate(namespace), dispatchRate);
+        Policies policies = admin.namespaces().getPolicies(namespace);
+        Map<String, DispatchRate> dispatchRateMap = Maps.newHashMap();
+        dispatchRateMap.put("test", dispatchRate);
+        Assert.assertEquals(policies.clusterDispatchRate, dispatchRateMap);
+        Assert.assertEquals(policies.topicDispatchRate, dispatchRateMap);
 
-        // (1) change to 500
+        // (3) change to 500
         messageRate = 500;
         dispatchRate = new DispatchRate(-1, messageRate, 360);
         admin.namespaces().setDispatchRate(namespace, dispatchRate);
@@ -152,6 +162,10 @@ public void testMessageRateDynamicallyChange() throws Exception {
         }
         Assert.assertTrue(isDispatchRateUpdate);
         Assert.assertEquals(admin.namespaces().getDispatchRate(namespace), dispatchRate);
+        policies = admin.namespaces().getPolicies(namespace);
+        dispatchRateMap.put("test", dispatchRate);
+        Assert.assertEquals(policies.clusterDispatchRate, dispatchRateMap);
+        Assert.assertEquals(policies.topicDispatchRate, dispatchRateMap);
 
         producer.close();
     }
@@ -896,6 +910,67 @@ public void testClosingRateLimiter(SubscriptionType subscription) throws Excepti
         log.info("-- Exiting {} test --", methodName);
     }
 
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testDispatchRateCompatibility1() throws Exception {
+        final String cluster = "test";
+
+        Optional<Policies> policies = Optional.of(new Policies());
+        DispatchRate clusterDispatchRate = new DispatchRate(100, 512, 1);
+        DispatchRate topicDispatchRate = new DispatchRate(200, 1024, 1);
+
+        // (1) If both clusterDispatchRate and topicDispatchRate are empty, dispatch throttling is disabled
+        DispatchRate dispatchRate = DispatchRateLimiter.getPoliciesDispatchRate(cluster, policies,
+                DispatchRateLimiter.Type.TOPIC);
+        Assert.assertNull(dispatchRate);
+
+        // (2) If topicDispatchRate is empty, clusterDispatchRate is effective
+        policies.get().clusterDispatchRate.put(cluster, clusterDispatchRate);
+        dispatchRate = DispatchRateLimiter.getPoliciesDispatchRate(cluster, policies, DispatchRateLimiter.Type.TOPIC);
+        Assert.assertEquals(dispatchRate, clusterDispatchRate);
+
+        // (3) If topicDispatchRate is not empty, topicDispatchRate is effective
+        policies.get().topicDispatchRate.put(cluster, topicDispatchRate);
+        dispatchRate = DispatchRateLimiter.getPoliciesDispatchRate(cluster, policies, DispatchRateLimiter.Type.TOPIC);
+        Assert.assertEquals(dispatchRate, topicDispatchRate);
+    }
+
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testDispatchRateCompatibility2() throws Exception {
+        final String namespace = "my-property/dispatch-rate-compatibility";
+        final String topicName = "persistent://" + namespace + "/t1";
+        final String cluster = "test";
+        admin.namespaces().createNamespace(namespace, Sets.newHashSet(cluster));
+        Producer<byte[]> producer = pulsarClient.newProducer().topic(topicName).create();
+        PersistentTopic topic = (PersistentTopic) pulsar.getBrokerService().getOrCreateTopic(topicName).get();
+        DispatchRateLimiter dispatchRateLimiter = new DispatchRateLimiter(topic, DispatchRateLimiter.Type.TOPIC);
+
+        Policies policies = new Policies();
+        DispatchRate clusterDispatchRate = new DispatchRate(100, 512, 1);
+        DispatchRate topicDispatchRate = new DispatchRate(200, 1024, 1);
+
+        // (1) If both clusterDispatchRate and topicDispatchRate are empty, dispatch throttling is disabled
+        dispatchRateLimiter.onPoliciesUpdate(policies);
+        Assert.assertEquals(dispatchRateLimiter.getDispatchRateOnMsg(), -1);
+        Assert.assertEquals(dispatchRateLimiter.getDispatchRateOnByte(), -1);
+
+        // (2) If topicDispatchRate is empty, clusterDispatchRate is effective
+        policies.clusterDispatchRate.put(cluster, clusterDispatchRate);
+        dispatchRateLimiter.onPoliciesUpdate(policies);
+        Assert.assertEquals(dispatchRateLimiter.getDispatchRateOnMsg(), 100);
+        Assert.assertEquals(dispatchRateLimiter.getDispatchRateOnByte(), 512);
+
+        // (3) If topicDispatchRate is not empty, topicDispatchRate is effective
+        policies.topicDispatchRate.put(cluster, topicDispatchRate);
+        dispatchRateLimiter.onPoliciesUpdate(policies);
+        Assert.assertEquals(dispatchRateLimiter.getDispatchRateOnMsg(), 200);
+        Assert.assertEquals(dispatchRateLimiter.getDispatchRateOnByte(), 1024);
+
+        producer.close();
+        topic.close().get();
+    }
+
     protected void deactiveCursors(ManagedLedgerImpl ledger) throws Exception {
         Field statsUpdaterField = BrokerService.class.getDeclaredField("statsUpdater");
         statsUpdaterField.setAccessible(true);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java
index 1e46fe86ca41e..9232642c02f9b 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java
@@ -438,7 +438,7 @@ public void testTopicStats() throws Exception {
         assertNotNull(topicRef);
 
         rolloverPerIntervalStats(pulsar);
-        stats = topicRef.getStats();
+        stats = topicRef.getStats(false);
         subStats = stats.getSubscriptions().values().iterator().next();
 
         // subscription stats
@@ -456,7 +456,7 @@ public void testTopicStats() throws Exception {
         Thread.sleep(timeWaitToSync);
 
         rolloverPerIntervalStats(pulsar);
-        stats = topicRef.getStats();
+        stats = topicRef.getStats(false);
         subStats = stats.getSubscriptions().values().iterator().next();
 
         assertTrue(subStats.msgRateOut > 0);
@@ -520,7 +520,7 @@ public void testReplicator() throws Exception {
             assertNotNull(replicatorR3);
 
             rolloverPerIntervalStats(replicationPulasr);
-            stats = topicRef.getStats();
+            stats = topicRef.getStats(false);
             subStats = stats.getSubscriptions().values().iterator().next();
 
             // subscription stats
@@ -591,7 +591,7 @@ public void testReplicator() throws Exception {
             Thread.sleep(timeWaitToSync);
 
             rolloverPerIntervalStats(replicationPulasr);
-            stats = topicRef.getStats();
+            stats = topicRef.getStats(false);
             subStats = stats.getSubscriptions().values().iterator().next();
 
             assertTrue(subStats.msgRateOut > 0);
@@ -812,7 +812,7 @@ public void testMsgDropStat() throws Exception {
 
             NonPersistentTopic topic = (NonPersistentTopic) pulsar.getBrokerService().getOrCreateTopic(topicName).get();
             pulsar.getBrokerService().updateRates();
-            NonPersistentTopicStats stats = topic.getStats();
+            NonPersistentTopicStats stats = topic.getStats(false);
             NonPersistentPublisherStats npStats = stats.getPublishers().get(0);
             NonPersistentSubscriptionStats sub1Stats = stats.getSubscriptions().get("subscriber-1");
             NonPersistentSubscriptionStats sub2Stats = stats.getSubscriptions().get("subscriber-2");
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PartitionCreationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PartitionCreationTest.java
index 2647bbba380a8..8fad844bc8a8e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PartitionCreationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/PartitionCreationTest.java
@@ -106,7 +106,7 @@ public void testCreateConsumerForNonPartitionedTopicWhenEnableTopicAutoCreation(
     @Test
     public void testCreateConsumerForPartitionedTopicUpdateWhenDisableTopicAutoCreation() throws PulsarClientException, PulsarAdminException {
         conf.setAllowAutoTopicCreation(false);
-        final String topic = "testCreateConsumerForPartitionedTopicUpdateWhenDisableTopicAutoCreation";
+        final String topic = "testCreateConsumerForPartitionedTopicUpdateWhenDisableTopicAutoCreation-" + System.currentTimeMillis();
         admin.topics().createPartitionedTopic(topic, 3);
         MultiTopicsConsumerImpl<byte[]> consumer = (MultiTopicsConsumerImpl<byte[]>) pulsarClient.newConsumer().topic(topic).subscriptionName("sub-1").subscribe();
         Assert.assertNotNull(consumer);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleSchemaTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleSchemaTest.java
index aa0f0e0c9018b..554808966ebed 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleSchemaTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleSchemaTest.java
@@ -31,10 +31,16 @@
 import org.apache.avro.reflect.ReflectData;
 import org.apache.avro.Schema.Parser;
 import org.apache.pulsar.broker.service.schema.LongSchemaVersion;
+import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.api.PulsarClientException.IncompatibleSchemaException;
 import org.apache.pulsar.client.api.PulsarClientException.InvalidMessageException;
 import org.apache.pulsar.client.api.schema.GenericRecord;
+import org.apache.pulsar.client.impl.BinaryProtoLookupService;
+import org.apache.pulsar.client.impl.HttpLookupService;
+import org.apache.pulsar.client.impl.LookupService;
+import org.apache.pulsar.client.impl.PulsarClientImpl;
 import org.apache.pulsar.client.impl.schema.writer.AvroWriter;
+import org.apache.pulsar.common.naming.TopicName;
 import org.apache.pulsar.common.protocol.schema.SchemaVersion;
 import org.apache.pulsar.common.schema.KeyValue;
 import org.apache.pulsar.common.schema.KeyValueEncodingType;
@@ -47,8 +53,10 @@
 import org.testng.annotations.Test;
 
 import java.io.ByteArrayInputStream;
+import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
 public class SimpleSchemaTest extends ProducerConsumerBase {
@@ -603,4 +611,29 @@ public void testAutoKeyValueConsume(boolean batching) throws Exception {
         }
     }
 
+    @Test
+    public void testGetSchemaByVersion() throws PulsarClientException, PulsarAdminException, ExecutionException, InterruptedException {
+        final String topic = "persistent://my-property/my-ns/testGetSchemaByVersion";
+
+        PulsarClientImpl httpProtocolClient = (PulsarClientImpl) PulsarClient.builder().serviceUrl(brokerUrl.toString()).build();
+        PulsarClientImpl binaryProtocolClient = (PulsarClientImpl) pulsarClient;
+
+        pulsarClient.newProducer(Schema.AVRO(V1Data.class))
+            .topic(topic)
+            .create();
+
+        pulsarClient.newProducer(Schema.AVRO(V2Data.class))
+            .topic(topic)
+            .create();
+
+        LookupService httpLookupService = httpProtocolClient.getLookup();
+        LookupService binaryLookupService = binaryProtocolClient.getLookup();
+        Assert.assertTrue(httpLookupService instanceof HttpLookupService);
+        Assert.assertTrue(binaryLookupService instanceof BinaryProtoLookupService);
+        Assert.assertEquals(admin.schemas().getAllSchemas(topic).size(), 2);
+        Assert.assertTrue(httpLookupService.getSchema(TopicName.get(topic), ByteBuffer.allocate(8).putLong(0).array()).get().isPresent());
+        Assert.assertTrue(httpLookupService.getSchema(TopicName.get(topic), ByteBuffer.allocate(8).putLong(1).array()).get().isPresent());
+        Assert.assertTrue(binaryLookupService.getSchema(TopicName.get(topic), ByteBuffer.allocate(8).putLong(0).array()).get().isPresent());
+        Assert.assertTrue(binaryLookupService.getSchema(TopicName.get(topic), ByteBuffer.allocate(8).putLong(1).array()).get().isPresent());
+    }
 }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerTest.java
index ac174d29dafe0..a54dcd853c701 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/v1/V1_ProducerConsumerTest.java
@@ -717,6 +717,7 @@ public void testActiveAndInActiveConsumerEntryCacheBehavior() throws Exception {
         msg = subscriber1.receive(5, TimeUnit.SECONDS);
 
         // Verify: as active-subscriber2 has not consumed messages: EntryCache must have those entries in cache
+        retryStrategically((test) -> entryCache.getSize() > 0, 10, 100);
         assertTrue(entryCache.getSize() != 0);
 
         // 3.b Close subscriber2: which will trigger cache to clear the cache
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java
index 56e8ecca3a595..15357d318c8d6 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/BrokerClientIntegrationTest.java
@@ -70,6 +70,7 @@
 import org.apache.pulsar.client.api.Consumer;
 import org.apache.pulsar.client.api.ConsumerBuilder;
 import org.apache.pulsar.client.api.Message;
+import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.api.Producer;
 import org.apache.pulsar.client.api.ProducerConsumerBase;
 import org.apache.pulsar.client.api.PulsarClient;
@@ -225,7 +226,7 @@ public void testDisconnectClientWithoutClosingConnection() throws Exception {
 
         // unload ns-bundle2 as well
         pulsar.getNamespaceService().unloadNamespaceBundle((NamespaceBundle) bundle2);
-        // let producer2 give some time to get disconnect signal and get disconencted
+        // let producer2 give some time to get disconnect signal and get disconnected
         Thread.sleep(200);
         verify(producer2, atLeastOnce()).connectionClosed(any());
 
@@ -343,9 +344,10 @@ public void testUnsupportedBatchMessageConsumer(SubscriptionType subType) throws
         versionField.set(cnx, 3);
 
         // (1) send non-batch message: consumer should be able to consume
+        MessageId lastNonBatchedMessageId = null;
         for (int i = 0; i < numMessagesPerBatch; i++) {
             String message = "my-message-" + i;
-            producer.send(message.getBytes());
+            lastNonBatchedMessageId = producer.send(message.getBytes());
         }
         Set<String> messageSet = Sets.newHashSet();
         Message<byte[]> msg = null;
@@ -362,7 +364,7 @@ public void testUnsupportedBatchMessageConsumer(SubscriptionType subType) throws
         consumer1.setClientCnx(null);
         // (2) send batch-message which should not be able to consume: as broker will disconnect the consumer
         for (int i = 0; i < numMessagesPerBatch; i++) {
-            String message = "my-message-" + i;
+            String message = "my-batch-message-" + i;
             batchProducer.sendAsync(message.getBytes());
         }
         batchProducer.flush();
@@ -378,13 +380,14 @@ public void testUnsupportedBatchMessageConsumer(SubscriptionType subType) throws
                 .subscriptionName(subscriptionName)
                 .subscriptionType(subType)
                 .subscribe();
+        consumer2.seek(lastNonBatchedMessageId);
 
         messageSet.clear();
         for (int i = 0; i < numMessagesPerBatch; i++) {
-            msg = consumer2.receive(1, TimeUnit.SECONDS);
+            msg = consumer2.receive();
             String receivedMessage = new String(msg.getData());
             log.debug("Received message: [{}]", receivedMessage);
-            String expectedMessage = "my-message-" + i;
+            String expectedMessage = "my-batch-message-" + i;
             testMessageOrderAndDuplicates(messageSet, receivedMessage, expectedMessage);
             consumer2.acknowledge(msg);
         }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageParserTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageParserTest.java
index 87278a4d0745b..9fcb129a373c8 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageParserTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageParserTest.java
@@ -124,7 +124,7 @@ public void testWithBatches() throws Exception {
         producer.send("hello-" + (n - 1));
 
         // Read through raw data
-        assertEquals(cursor.getNumberOfEntriesInBacklog(), 1);
+        assertEquals(cursor.getNumberOfEntriesInBacklog(false), 1);
         Entry entry = cursor.readEntriesOrWait(1).get(0);
 
         List<RawMessage> messages = Lists.newArrayList();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplTest.java
index a5b20f3586929..b14c1cd466090 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplTest.java
@@ -84,7 +84,8 @@ public void testPatternTopicsSubscribeWithBuilderFail() throws Exception {
         final String patternString = "persistent://my-property/my-ns/pattern-topic.*";
         Pattern pattern = Pattern.compile(patternString);
 
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName2, 2);
         admin.topics().createPartitionedTopic(topicName3, 3);
 
@@ -143,7 +144,8 @@ public void testBinaryProtoToGetTopicsOfNamespacePersistent() throws Exception {
         Pattern pattern = Pattern.compile("my-property/my-ns/pattern-topic.*");
 
         // 1. create partition
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName2, 2);
         admin.topics().createPartitionedTopic(topicName3, 3);
 
@@ -234,7 +236,8 @@ public void testBinaryProtoToGetTopicsOfNamespaceNonPersistent() throws Exceptio
         Pattern pattern = Pattern.compile("my-property/my-ns/np-pattern-topic.*");
 
         // 1. create partition
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName2, 2);
         admin.topics().createPartitionedTopic(topicName3, 3);
 
@@ -324,7 +327,8 @@ public void testBinaryProtoToGetTopicsOfNamespaceAll() throws Exception {
         Pattern pattern = Pattern.compile("my-property/my-ns/pattern-topic.*");
 
         // 1. create partition
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName2, 2);
         admin.topics().createPartitionedTopic(topicName3, 3);
 
@@ -473,7 +477,8 @@ public void testStartEmptyPatternConsumer() throws Exception {
         Pattern pattern = Pattern.compile("persistent://my-property/my-ns/pattern-topic.*");
 
         // 1. create partition
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName2, 2);
         admin.topics().createPartitionedTopic(topicName3, 3);
 
@@ -560,7 +565,8 @@ public void testAutoSubscribePatternConsumer() throws Exception {
         Pattern pattern = Pattern.compile("persistent://my-property/my-ns/pattern-topic.*");
 
         // 1. create partition
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName2, 2);
         admin.topics().createPartitionedTopic(topicName3, 3);
 
@@ -668,7 +674,8 @@ public void testAutoUnbubscribePatternConsumer() throws Exception {
         Pattern pattern = Pattern.compile("persistent://my-property/my-ns/pattern-topic.*");
 
         // 1. create partition
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName2, 2);
         admin.topics().createPartitionedTopic(topicName3, 3);
 
@@ -691,7 +698,7 @@ public void testAutoUnbubscribePatternConsumer() throws Exception {
 
         Consumer<byte[]> consumer = pulsarClient.newConsumer()
             .topicsPattern(pattern)
-            .patternAutoDiscoveryPeriod(2)
+            .patternAutoDiscoveryPeriod(10, TimeUnit.SECONDS)
             .subscriptionName(subscriptionName)
             .subscriptionType(SubscriptionType.Shared)
             .ackTimeout(ackTimeOutMillis, TimeUnit.MILLISECONDS)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PerMessageUnAcknowledgedRedeliveryTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PerMessageUnAcknowledgedRedeliveryTest.java
index 508de46482db0..8b91af6f87fd7 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PerMessageUnAcknowledgedRedeliveryTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PerMessageUnAcknowledgedRedeliveryTest.java
@@ -403,7 +403,8 @@ public void testSharedAckedPartitionedTopic() throws Exception {
         final String messagePredicate = "my-message-" + key + "-";
         final int totalMessages = 15;
         final int numberOfPartitions = 3;
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName, numberOfPartitions);
 
         // 1. producer connect
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerSemaphoreTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerSemaphoreTest.java
index ff45d5680950f..d435938c33f72 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerSemaphoreTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/ProducerSemaphoreTest.java
@@ -36,7 +36,11 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class ProducerSemaphoreTest extends ProducerConsumerBase {
+    private static final Logger log = LoggerFactory.getLogger(ProducerSemaphoreTest.class);
 
     @Override
     @BeforeMethod
@@ -65,34 +69,54 @@ public void testProducerSemaphoreAcquireAndRelease() throws PulsarClientExceptio
 
         final int messages = 10;
         final List<CompletableFuture<MessageId>> futures = new ArrayList<>(messages);
-        for (int i = 0; i < messages; i++) {
-            futures.add(producer.newMessage().value(("Semaphore-test-" + i).getBytes()).sendAsync());
+        producer.getClientCnx().channel().config().setAutoRead(false);
+        try {
+            for (int i = 0; i < messages; i++) {
+                futures.add(producer.newMessage().value(("Semaphore-test-" + i).getBytes()).sendAsync());
+            }
+            Assert.assertEquals(producer.getSemaphore().availablePermits(), pendingQueueSize - messages);
+        } finally {
+            producer.getClientCnx().channel().config().setAutoRead(true);
         }
-
         FutureUtil.waitForAll(futures).get();
         Assert.assertEquals(producer.getSemaphore().availablePermits(), pendingQueueSize);
         futures.clear();
 
         // Simulate replicator, non batching message but `numMessagesInBatch` of message metadata > 1
-        for (int i = 0; i < messages / 2; i++) {
-            PulsarApi.MessageMetadata.Builder builder = PulsarApi.MessageMetadata.newBuilder();
-            builder.setNumMessagesInBatch(10);
-            MessageImpl<byte[]> msg = MessageImpl.create(builder, ByteBuffer.wrap(new byte[0]), Schema.BYTES);
-            futures.add(producer.sendAsync(msg));
+        producer.getClientCnx().channel().config().setAutoRead(false);
+        try {
+            for (int i = 0; i < messages / 2; i++) {
+                PulsarApi.MessageMetadata.Builder builder = PulsarApi.MessageMetadata.newBuilder();
+                builder.setNumMessagesInBatch(10);
+                MessageImpl<byte[]> msg = MessageImpl.create(builder, ByteBuffer.wrap(new byte[0]), Schema.BYTES);
+                futures.add(producer.sendAsync(msg));
+            }
+            Assert.assertEquals(producer.getSemaphore().availablePermits(), pendingQueueSize - messages/2);
+        } finally {
+            producer.getClientCnx().channel().config().setAutoRead(true);
         }
         FutureUtil.waitForAll(futures).get();
+        Assert.assertEquals(producer.getSemaphore().availablePermits(), pendingQueueSize);
+        futures.clear();
 
         // Here must ensure that the semaphore available permits is 0
         Assert.assertEquals(producer.getSemaphore().availablePermits(), pendingQueueSize);
 
         // Acquire 5 and not wait the send ack call back
-        for (int i = 0; i < messages / 2; i++) {
-            producer.newMessage().value(("Semaphore-test-" + i).getBytes()).sendAsync();
-        }
+        producer.getClientCnx().channel().config().setAutoRead(false);
+        try {
+            for (int i = 0; i < messages / 2; i++) {
+                futures.add(producer.newMessage().value(("Semaphore-test-" + i).getBytes()).sendAsync());
+            }
 
-        // Here must ensure that the Semaphore a acquired 5
-        Assert.assertEquals(producer.getSemaphore().availablePermits(), pendingQueueSize - messages / 2);
+            // Here must ensure that the Semaphore a acquired 5
+            Assert.assertEquals(producer.getSemaphore().availablePermits(), pendingQueueSize - messages / 2);
+        } finally {
+            producer.getClientCnx().channel().config().setAutoRead(true);
 
+        }
+        FutureUtil.waitForAll(futures).get();
+        Assert.assertEquals(producer.getSemaphore().availablePermits(), pendingQueueSize);
     }
 
     /**
@@ -101,8 +125,7 @@ public void testProducerSemaphoreAcquireAndRelease() throws PulsarClientExceptio
      * dead lock happens {https://github.com/apache/pulsar/issues/5585}
      */
     @Test(timeOut = 30000)
-    public void testEnsureNotBlockOnThePendingQueue() throws PulsarClientException {
-
+    public void testEnsureNotBlockOnThePendingQueue() throws Exception {
         final int pendingQueueSize = 10;
 
         @Cleanup
@@ -110,26 +133,63 @@ public void testEnsureNotBlockOnThePendingQueue() throws PulsarClientException {
                 .topic("testProducerSemaphoreAcquire")
                 .maxPendingMessages(pendingQueueSize)
                 .enableBatching(false)
-                .blockIfQueueFull(true)
                 .create();
 
-        final int messages = 20;
-        final List<CompletableFuture<MessageId>> futures = new ArrayList<>(messages);
+        final List<CompletableFuture<MessageId>> futures = new ArrayList<>();
 
         // Simulate replicator, non batching message but `numMessagesInBatch` of message metadata > 1
-        for (int i = 0; i < messages; i++) {
-            PulsarApi.MessageMetadata.Builder builder = PulsarApi.MessageMetadata.newBuilder();
-            builder.setNumMessagesInBatch(10);
-            MessageImpl<byte[]> msg = MessageImpl.create(builder, ByteBuffer.wrap(new byte[0]), Schema.BYTES);
-            futures.add(producer.sendAsync(msg));
+        // Test that when we fill the queue with "replicator" messages, we are notified
+        // (replicator itself would block)
+        Assert.assertEquals(producer.getSemaphore().availablePermits(), pendingQueueSize);
+        producer.getClientCnx().channel().config().setAutoRead(false);
+        try {
+            for (int i = 0; i < pendingQueueSize; i++) {
+                PulsarApi.MessageMetadata.Builder builder = PulsarApi.MessageMetadata.newBuilder();
+                builder.setNumMessagesInBatch(10);
+
+                MessageImpl<byte[]> msg = MessageImpl.create(builder, ByteBuffer.wrap(new byte[0]), Schema.BYTES);
+                futures.add(producer.sendAsync(msg));
+            }
+            Assert.assertEquals(producer.getSemaphore().availablePermits(), 0);
+            try {
+                PulsarApi.MessageMetadata.Builder builder = PulsarApi.MessageMetadata.newBuilder();
+                builder.setNumMessagesInBatch(10);
+
+                MessageImpl<byte[]> msg = MessageImpl.create(builder, ByteBuffer.wrap(new byte[0]), Schema.BYTES);
+                producer.sendAsync(msg).get();
+                Assert.fail("Shouldn't be able to send message");
+            } catch (ExecutionException ee) {
+                Assert.assertEquals(ee.getCause().getClass(),
+                                    PulsarClientException.ProducerQueueIsFullError.class);
+                Assert.assertEquals(producer.getSemaphore().availablePermits(), 0);
+            }
+        } finally {
+            producer.getClientCnx().channel().config().setAutoRead(true);
         }
-
-        FutureUtil.waitForAll(futures);
+        FutureUtil.waitForAll(futures).get();
         futures.clear();
 
-        for (int i = 0; i < messages; i++) {
-            futures.add(producer.newMessage().value(("Semaphore-test-" + i).getBytes()).sendAsync());
+        // Test that when we fill the queue with normal messages, we get an error
+        Assert.assertEquals(producer.getSemaphore().availablePermits(), pendingQueueSize);
+        producer.getClientCnx().channel().config().setAutoRead(false);
+        try {
+            for (int i = 0; i < pendingQueueSize; i++) {
+                futures.add(producer.newMessage().value(("Semaphore-test-" + i).getBytes()).sendAsync());
+            }
+            Assert.assertEquals(producer.getSemaphore().availablePermits(), 0);
+
+            try {
+                producer.newMessage().value(("Semaphore-test-Q-full").getBytes()).sendAsync().get();
+            } catch (ExecutionException ee) {
+                Assert.assertEquals(ee.getCause().getClass(),
+                                    PulsarClientException.ProducerQueueIsFullError.class);
+                Assert.assertEquals(producer.getSemaphore().availablePermits(), 0);
+
+            }
+        } finally {
+            producer.getClientCnx().channel().config().setAutoRead(true);
         }
-        Assert.assertEquals(producer.getSemaphore().availablePermits(), 0);
+        FutureUtil.waitForAll(futures).get();
+        Assert.assertEquals(producer.getSemaphore().availablePermits(), pendingQueueSize);
     }
 }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java
index e57e88d72e9a1..b0c7cd1830055 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java
@@ -74,10 +74,16 @@ public void cleanup() throws Exception {
     }
 
     private Set<String> publishMessages(String topic, int count) throws Exception {
+        return publishMessages(topic, count, false);
+    }
+
+    private Set<String> publishMessages(String topic, int count, boolean batching) throws Exception {
         Set<String> keys = new HashSet<>();
 
         try (Producer<byte[]> producer = pulsarClient.newProducer()
-            .enableBatching(false)
+            .enableBatching(batching)
+            // easier to create enough batches with a small batch size
+            .batchingMaxMessages(10)
             .messageRoutingMode(MessageRoutingMode.SinglePartition)
             .maxPendingMessages(count)
             .topic(topic)
@@ -233,6 +239,34 @@ public void testFlowControl() throws Exception {
         Assert.assertEquals(keys.size(), numMessages);
     }
 
+    @Test
+    public void testFlowControlBatch() throws Exception {
+        int numMessages = RawReaderImpl.DEFAULT_RECEIVER_QUEUE_SIZE * 5;
+        String topic = "persistent://my-property/my-ns/my-raw-topic";
+
+        publishMessages(topic, numMessages, true);
+
+        RawReader reader = RawReader.create(pulsarClient, topic, subscription).get();
+        Set<String> keys = new HashSet<>();
+
+        while (true) {
+            try (RawMessage m = reader.readNextAsync().get(1, TimeUnit.SECONDS)) {
+                Assert.assertTrue(RawBatchConverter.isReadableBatch(m));
+                List<ImmutablePair<MessageId, String>> batchKeys = RawBatchConverter.extractIdsAndKeys(m);
+                // Assert each key is unique
+                for (ImmutablePair<MessageId, String> pair : batchKeys) {
+                    String key = pair.right;
+                    Assert.assertTrue(
+                            keys.add(key),
+                            "Received duplicated key '" + key + "' : already received keys = " + keys);
+                }
+            } catch (TimeoutException te) {
+                break;
+            }
+        }
+        Assert.assertEquals(keys.size(), numMessages);
+    }
+
     @Test
     public void testBatchingExtractKeysAndIds() throws Exception {
         String topic = "persistent://my-property/my-ns/my-raw-topic";
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicsConsumerImplTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicsConsumerImplTest.java
index 0d693663b76fc..c6883c63e0670 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicsConsumerImplTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TopicsConsumerImplTest.java
@@ -88,7 +88,8 @@ public void testDifferentTopicsNameSubscribe() throws Exception {
         final String topicName3 = "persistent://prop/use/ns-abc3/topic-3-" + key;
         List<String> topicNames = Lists.newArrayList(topicName1, topicName2, topicName3);
 
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName2, 2);
         admin.topics().createPartitionedTopic(topicName3, 3);
 
@@ -116,7 +117,8 @@ public void testGetConsumersAndGetTopics() throws Exception {
         final String topicName3 = "persistent://prop/use/ns-abc/topic-3-" + key;
         List<String> topicNames = Lists.newArrayList(topicName1, topicName2);
 
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName2, 2);
         admin.topics().createPartitionedTopic(topicName3, 3);
 
@@ -159,7 +161,8 @@ public void testSyncProducerAndConsumer() throws Exception {
         final String topicName3 = "persistent://prop/use/ns-abc/topic-3-" + key;
         List<String> topicNames = Lists.newArrayList(topicName1, topicName2, topicName3);
 
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName2, 2);
         admin.topics().createPartitionedTopic(topicName3, 3);
 
@@ -224,7 +227,8 @@ public void testAsyncConsumer() throws Exception {
         final String topicName3 = "persistent://prop/use/ns-abc/topic-3-" + key;
         List<String> topicNames = Lists.newArrayList(topicName1, topicName2, topicName3);
 
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName2, 2);
         admin.topics().createPartitionedTopic(topicName3, 3);
 
@@ -308,7 +312,8 @@ public void testConsumerUnackedRedelivery() throws Exception {
         final String topicName3 = "persistent://prop/use/ns-abc/topic-3-" + key;
         List<String> topicNames = Lists.newArrayList(topicName1, topicName2, topicName3);
 
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName2, 2);
         admin.topics().createPartitionedTopic(topicName3, 3);
 
@@ -451,7 +456,8 @@ public void testSubscribeUnsubscribeSingleTopic() throws Exception {
         final String topicName3 = "persistent://prop/use/ns-abc/topic-3-" + key;
         List<String> topicNames = Lists.newArrayList(topicName1, topicName2, topicName3);
 
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName2, 2);
         admin.topics().createPartitionedTopic(topicName3, 3);
 
@@ -575,7 +581,8 @@ public void testTopicsNameSubscribeWithBuilderFail() throws Exception {
         final String topicName2 = "persistent://prop/use/ns-abc/topic-2-" + key;
         final String topicName3 = "persistent://prop/use/ns-abc/topic-3-" + key;
 
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName2, 2);
         admin.topics().createPartitionedTopic(topicName3, 3);
 
@@ -644,7 +651,8 @@ public void testMultiTopicsMessageListener() throws Exception {
         final String topicName1 = "persistent://prop/use/ns-abc/topic-1-" + key;
         List<String> topicNames = Lists.newArrayList(topicName1);
 
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName1, 2);
 
         // 1. producer connect
@@ -707,7 +715,8 @@ public void testTopicAutoUpdatePartitions() throws Exception {
         final String topicName2 = "persistent://prop/use/ns-abc/topic-2-" + key;
         List<String> topicNames = Lists.newArrayList(topicName1, topicName2);
 
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName1, 2);
         admin.topics().createPartitionedTopic(topicName2, 2);
 
@@ -794,9 +803,9 @@ public void testDefaultBacklogTTL() throws Exception {
 
         topic.get().checkMessageExpiry();
 
-        retryStrategically((test) -> subscription.getNumberOfEntriesInBacklog() == 0, 5, 200);
+        retryStrategically((test) -> subscription.getNumberOfEntriesInBacklog(false) == 0, 5, 200);
 
-        assertEquals(subscription.getNumberOfEntriesInBacklog(), 0);
+        assertEquals(subscription.getNumberOfEntriesInBacklog(false), 0);
     }
 
     @Test(timeOut = testTimeout)
@@ -811,7 +820,8 @@ public void testGetLastMessageId() throws Exception {
         final String topicName3 = "persistent://prop/use/ns-abc/topic-3-" + key;
         List<String> topicNames = Lists.newArrayList(topicName1, topicName2, topicName3);
 
-        admin.tenants().createTenant("prop", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("prop", tenantInfo);
         admin.topics().createPartitionedTopic(topicName2, 2);
         admin.topics().createPartitionedTopic(topicName3, 3);
 
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundlesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundlesTest.java
index 4093899bf811b..2a2521d4e1cf0 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundlesTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/NamespaceBundlesTest.java
@@ -182,7 +182,7 @@ public void testsplitBundles() throws Exception {
         NamespaceBundle bundle = bundles.findBundle(topicName);
         final int numberSplitBundles = 4;
         // (1) split in 4
-        Pair<NamespaceBundles, List<NamespaceBundle>> splitBundles = factory.splitBundles(bundle, numberSplitBundles);
+        Pair<NamespaceBundles, List<NamespaceBundle>> splitBundles = factory.splitBundles(bundle, numberSplitBundles, null);
         // existing_no_bundles(1) +
         // additional_new_split_bundle(4) -
         // parent_target_bundle(1)
@@ -225,7 +225,7 @@ public void testSplitBundleInTwo() throws Exception {
         NamespaceBundles bundles = factory.getBundles(nsname);
         NamespaceBundle bundle = bundles.findBundle(topicName);
         // (1) split : [0x00000000,0xffffffff] => [0x00000000_0x7fffffff,0x7fffffff_0xffffffff]
-        Pair<NamespaceBundles, List<NamespaceBundle>> splitBundles = factory.splitBundles(bundle, NO_BUNDLES);
+        Pair<NamespaceBundles, List<NamespaceBundle>> splitBundles = factory.splitBundles(bundle, NO_BUNDLES, null);
         assertNotNull(splitBundles);
         assertBundleDivideInTwo(bundle, splitBundles.getRight(), NO_BUNDLES);
 
@@ -248,6 +248,29 @@ public void testSplitBundleInTwo() throws Exception {
 
     }
 
+    @Test
+    public void testSplitBundleByFixBoundary() throws Exception {
+        NamespaceName nsname = NamespaceName.get("pulsar/global/ns1");
+        NamespaceBundles bundles = factory.getBundles(nsname);
+        NamespaceBundle bundleToSplit = bundles.getBundles().get(0);
+
+        try {
+            factory.splitBundles(bundleToSplit, 0, bundleToSplit.getLowerEndpoint());
+        } catch (IllegalArgumentException e) {
+            //No-op
+        }
+        try {
+            factory.splitBundles(bundleToSplit, 0, bundleToSplit.getUpperEndpoint());
+        } catch (IllegalArgumentException e) {
+            //No-op
+        }
+
+        Long fixBoundary = bundleToSplit.getLowerEndpoint() + 10;
+        Pair<NamespaceBundles, List<NamespaceBundle>> splitBundles = factory.splitBundles(bundleToSplit, 0, fixBoundary);
+        assertEquals(splitBundles.getRight().get(0).getLowerEndpoint(), bundleToSplit.getLowerEndpoint());
+        assertEquals(splitBundles.getRight().get(1).getLowerEndpoint().longValue(), bundleToSplit.getLowerEndpoint() + fixBoundary);
+    }
+
     private void validateSplitBundlesRange(NamespaceBundle fullBundle, List<NamespaceBundle> splitBundles) {
         assertNotNull(fullBundle);
         assertNotNull(splitBundles);
@@ -267,7 +290,7 @@ private Pair<NamespaceBundles, List<NamespaceBundle>> splitBundlesUtilFactory(Na
         bCacheField.setAccessible(true);
         ((AsyncLoadingCache<NamespaceName, NamespaceBundles>) bCacheField.get(utilityFactory)).put(nsname,
                 CompletableFuture.completedFuture(bundles));
-        return utilityFactory.splitBundles(targetBundle, numBundles);
+        return utilityFactory.splitBundles(targetBundle, numBundles, null);
     }
 
     private void assertBundles(NamespaceBundleFactory utilityFactory, NamespaceName nsname, NamespaceBundle bundle,
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/ServiceConfigurationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/ServiceConfigurationTest.java
index c154d29a0ef6b..258c1234411c1 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/ServiceConfigurationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/common/naming/ServiceConfigurationTest.java
@@ -61,6 +61,9 @@ public void testInit() throws Exception {
                 && config.getBrokerServicePort().get().equals(brokerServicePort));
         assertEquals(config.getBootstrapNamespaces().get(1), "ns2");
         assertEquals(config.getBrokerDeleteInactiveTopicsMode(), InactiveTopicDeleteMode.delete_when_subscriptions_caught_up);
+        assertEquals(config.getDefaultNamespaceBundleSplitAlgorithm(), "topic_count_equally_divide");
+        assertEquals(config.getSupportedNamespaceBundleSplitAlgorithms().size(), 1);
+        assertEquals(config.getMaxMessagePublishBufferSizeInMB(), -1);
     }
 
     @Test
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java
index 81d063ec28a98..233246ca7ad4e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java
@@ -64,6 +64,7 @@
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 public class CompactionTest extends MockedPulsarServiceBaseTest {
@@ -1250,11 +1251,16 @@ public void testEmptyPayloadDeletesWhenEncrypted() throws Exception {
         }
     }
 
-    @Test(timeOut = 20000)
-    public void testCompactionWithLastDeletedKey() throws Exception {
+    @DataProvider(name = "lastDeletedBatching")
+    public static Object[][] lastDeletedBatching() {
+        return new Object[][] {{true}, {false}};
+    }
+
+    @Test(timeOut = 20000, dataProvider = "lastDeletedBatching")
+    public void testCompactionWithLastDeletedKey(boolean batching) throws Exception {
         String topic = "persistent://my-property/use/my-ns/my-topic1";
 
-        Producer<byte[]> producer = pulsarClient.newProducer().topic(topic).enableBatching(false)
+        Producer<byte[]> producer = pulsarClient.newProducer().topic(topic).enableBatching(batching)
                 .messageRoutingMode(MessageRoutingMode.SinglePartition).create();
 
         pulsarClient.newConsumer().topic(topic).subscriptionName("sub1").readCompacted(true).subscribe().close();
@@ -1277,11 +1283,11 @@ public void testCompactionWithLastDeletedKey() throws Exception {
         }
     }
 
-    @Test(timeOut = 20000)
-    public void testEmptyCompactionLedger() throws Exception {
+    @Test(timeOut = 20000, dataProvider = "lastDeletedBatching")
+    public void testEmptyCompactionLedger(boolean batching) throws Exception {
         String topic = "persistent://my-property/use/my-ns/my-topic1";
 
-        Producer<byte[]> producer = pulsarClient.newProducer().topic(topic).enableBatching(false)
+        Producer<byte[]> producer = pulsarClient.newProducer().topic(topic).enableBatching(batching)
                 .messageRoutingMode(MessageRoutingMode.SinglePartition).create();
 
         pulsarClient.newConsumer().topic(topic).subscriptionName("sub1").readCompacted(true).subscribe().close();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorTest.java
index f418bc56d1ea6..130793d78b173 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactorTest.java
@@ -207,7 +207,7 @@ public void testCompactedInOrder() throws Exception {
         Assert.assertEquals(keyOrder, Lists.newArrayList("c", "b", "a"));
     }
 
-    @Test(expectedExceptions = ExecutionException.class)
+    @Test
     public void testCompactEmptyTopic() throws Exception {
         String topic = "persistent://my-property/use/my-ns/my-topic1";
 
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionE2ESecurityTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionE2ESecurityTest.java
index 6dfe06ae3b331..ebe79b13c0531 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionE2ESecurityTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionE2ESecurityTest.java
@@ -332,7 +332,7 @@ public void testAuthorizationWithAnonymousUser() throws Exception {
                 } catch (PulsarAdminException e) {
                     return false;
                 }
-            }, 5, 150));
+            }, 50, 150));
             // validate pulsar sink consumer has started on the topic
             assertEquals(admin1.topics().getStats(sourceTopic).subscriptions.size(), 1);
 
@@ -352,7 +352,7 @@ public void testAuthorizationWithAnonymousUser() throws Exception {
                     } catch (PulsarAdminException e) {
                         return false;
                     }
-                }, 5, 150);
+                }, 50, 150);
 
                 Message<String> msg = consumer.receive(5, TimeUnit.SECONDS);
                 String receivedPropertyValue = msg.getProperty(propertyKey);
@@ -384,7 +384,7 @@ public void testAuthorizationWithAnonymousUser() throws Exception {
                     } catch (PulsarAdminException e) {
                         return false;
                     }
-                }, 5, 150));
+                }, 50, 150));
 
                 // test getFunctionInfo
                 try {
@@ -603,7 +603,7 @@ public void testAuthorization() throws Exception {
                 } catch (PulsarAdminException e) {
                     return false;
                 }
-            }, 5, 150));
+            }, 50, 150));
             // validate pulsar sink consumer has started on the topic
             assertEquals(admin1.topics().getStats(sourceTopic).subscriptions.size(), 1);
 
@@ -623,7 +623,7 @@ public void testAuthorization() throws Exception {
                     } catch (PulsarAdminException e) {
                         return false;
                     }
-                }, 5, 150);
+                }, 50, 150);
 
                 Message<String> msg = consumer.receive(5, TimeUnit.SECONDS);
                 String receivedPropertyValue = msg.getProperty(propertyKey);
@@ -655,7 +655,7 @@ public void testAuthorization() throws Exception {
                 } catch (PulsarAdminException e) {
                     return false;
                 }
-            }, 5, 150));
+            }, 50, 150));
 
             // test getFunctionInfo
             try {
@@ -796,7 +796,7 @@ public void testAuthorization() throws Exception {
                 } catch (PulsarAdminException e) {
                     return false;
                 }
-            }, 5, 150));
+            }, 50, 150));
         }
     }
 }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java
index 72f158f677286..48bb83fb26aed 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionLocalRunTest.java
@@ -412,7 +412,7 @@ private void testE2EPulsarFunctionLocalRun(String jarFilePathUrl) throws Excepti
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
         // validate pulsar sink consumer has started on the topic
         TopicStats stats = admin.topics().getStats(sourceTopic);
         assertTrue(stats.subscriptions.get(subscriptionName) != null
@@ -430,7 +430,7 @@ private void testE2EPulsarFunctionLocalRun(String jarFilePathUrl) throws Excepti
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         for (int i = 0; i < totalMsgs; i++) {
             Message<String> msg = consumer.receive(5, TimeUnit.SECONDS);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionPublishTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionPublishTest.java
index eab8be6e89331..8a4928f73bdfc 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionPublishTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarFunctionPublishTest.java
@@ -304,7 +304,7 @@ public void testPulsarFunctionState() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
         // validate pulsar sink consumer has started on the topic
         assertEquals(admin.topics().getStats(sourceTopic).subscriptions.size(), 1);
 
@@ -320,7 +320,7 @@ public void testPulsarFunctionState() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         retryStrategically((test) -> {
             try {
@@ -329,7 +329,7 @@ public void testPulsarFunctionState() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         for (int i = 0; i < 5; i++) {
             Message<String> msg = consumer.receive(5, TimeUnit.SECONDS);
@@ -353,7 +353,7 @@ public void testPulsarFunctionState() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         // make sure subscriptions are cleanup
         assertEquals(admin.topics().getStats(sourceTopic).subscriptions.size(), 0);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarWorkerAssignmentTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarWorkerAssignmentTest.java
index d5a6f08bcebb6..ca9ce3b028bb3 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarWorkerAssignmentTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/functions/worker/PulsarWorkerAssignmentTest.java
@@ -193,7 +193,7 @@ public void testFunctionAssignments() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
         // validate 2 instances have been started
         assertEquals(admin.topics().getStats(sinkTopic).subscriptions.size(), 1);
         assertEquals(admin.topics().getStats(sinkTopic).subscriptions.values().iterator().next().consumers.size(), 2);
@@ -210,7 +210,7 @@ public void testFunctionAssignments() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
         // validate pulsar sink consumer has started on the topic
         log.info("admin.topics().getStats(sinkTopic): {}", new Gson().toJson(admin.topics().getStats(sinkTopic)));
         assertEquals(admin.topics().getStats(sinkTopic).subscriptions.values().iterator().next().consumers.size(), 1);
@@ -250,7 +250,7 @@ public void testFunctionAssignmentsWithRestart() throws Exception {
             } catch (Exception e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         // Validate registered assignments
         Map<String, Assignment> assignments = runtimeManager.getCurrentAssignments().values().iterator().next();
@@ -279,7 +279,7 @@ public void testFunctionAssignmentsWithRestart() throws Exception {
             } catch (Exception e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         // Validate registered assignments
         assignments = runtimeManager.getCurrentAssignments().values().iterator().next();
@@ -298,7 +298,7 @@ public void testFunctionAssignmentsWithRestart() throws Exception {
             } catch (Exception e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         // Validate registered assignments
         assignments = runtimeManager2.getCurrentAssignments().values().iterator().next();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java
index 1d963e9b9ce44..c5b605a766a23 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionE2ETest.java
@@ -441,7 +441,7 @@ private void testE2EPulsarFunction(String jarFilePathUrl) throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
         // validate pulsar sink consumer has started on the topic
         assertEquals(admin.topics().getStats(sourceTopic).subscriptions.size(), 1);
 
@@ -457,7 +457,7 @@ private void testE2EPulsarFunction(String jarFilePathUrl) throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         Message<String> msg = consumer.receive(5, TimeUnit.SECONDS);
         String receivedPropertyValue = msg.getProperty(propertyKey);
@@ -477,7 +477,7 @@ private void testE2EPulsarFunction(String jarFilePathUrl) throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         // make sure subscriptions are cleanup
         assertEquals(admin.topics().getStats(sourceTopic).subscriptions.size(), 0);
@@ -708,7 +708,7 @@ private void testPulsarSinkStats(String jarFilePathUrl) throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         // make sure subscriptions are cleanup
         assertEquals(admin.topics().getStats(sourceTopic).subscriptions.size(), 0);
@@ -905,7 +905,7 @@ public void testPulsarFunctionStats() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
         // validate pulsar sink consumer has started on the topic
         assertEquals(admin.topics().getStats(sourceTopic).subscriptions.size(), 1);
 
@@ -1197,7 +1197,7 @@ public void testPulsarFunctionStats() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         // make sure subscriptions are cleanup
         assertEquals(admin.topics().getStats(sourceTopic).subscriptions.size(), 0);
@@ -1241,7 +1241,7 @@ public void testPulsarFunctionStatus() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
         // validate pulsar sink consumer has started on the topic
         assertEquals(admin.topics().getStats(sourceTopic).subscriptions.size(), 1);
 
@@ -1284,7 +1284,7 @@ public void testPulsarFunctionStatus() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         // make sure subscriptions are cleanup
         assertEquals(admin.topics().getStats(sourceTopic).subscriptions.size(), 0);
@@ -1348,7 +1348,7 @@ public void testFunctionStopAndRestartApi() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         SubscriptionStats subStats = admin.topics().getStats(sourceTopic).subscriptions.get(subscriptionName);
         assertEquals(subStats.consumers.size(), 1);
@@ -1363,7 +1363,7 @@ public void testFunctionStopAndRestartApi() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         subStats = admin.topics().getStats(sourceTopic).subscriptions.get(subscriptionName);
         assertEquals(subStats.consumers.size(), 0);
@@ -1378,7 +1378,7 @@ public void testFunctionStopAndRestartApi() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         subStats = admin.topics().getStats(sourceTopic).subscriptions.get(subscriptionName);
         assertEquals(subStats.consumers.size(), 1);
@@ -1421,7 +1421,7 @@ public void testFunctionAutomaticSubCleanup() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
         assertFalse(admin.functions().getFunction(tenant, namespacePortion, functionName).getCleanupSubscription());
 
         retryStrategically((test) -> {
@@ -1430,7 +1430,7 @@ public void testFunctionAutomaticSubCleanup() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
         // validate pulsar source consumer has started on the topic
         assertEquals(admin.topics().getStats(sourceTopic).subscriptions.size(), 1);
 
@@ -1444,7 +1444,7 @@ public void testFunctionAutomaticSubCleanup() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
         assertTrue(admin.functions().getFunction(tenant, namespacePortion, functionName).getCleanupSubscription());
 
         int totalMsgs = 10;
@@ -1487,7 +1487,7 @@ public void testFunctionAutomaticSubCleanup() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         // make sure subscriptions are cleanup
         assertEquals(admin.topics().getStats(sourceTopic).subscriptions.size(), 0);
@@ -1503,7 +1503,7 @@ public void testFunctionAutomaticSubCleanup() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
         // validate pulsar source consumer has started on the topic
         assertEquals(admin.topics().getStats(sourceTopic).subscriptions.size(), 1);
 
@@ -1514,7 +1514,7 @@ public void testFunctionAutomaticSubCleanup() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
         assertFalse(admin.functions().getFunction(tenant, namespacePortion, functionName).getCleanupSubscription());
 
         // test update another config and making sure that subscription cleanup remains unchanged
@@ -1528,7 +1528,7 @@ public void testFunctionAutomaticSubCleanup() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
         assertFalse(admin.functions().getFunction(tenant, namespacePortion, functionName).getCleanupSubscription());
 
         // delete functions
@@ -1540,7 +1540,7 @@ public void testFunctionAutomaticSubCleanup() throws Exception {
             } catch (PulsarAdminException e) {
                 return false;
             }
-        }, 5, 150);
+        }, 50, 150);
 
         // make sure subscriptions are cleanup
         assertEquals(admin.topics().getStats(sourceTopic).subscriptions.size(), 1);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/Schemas.java b/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/Schemas.java
index 6b63a25e5448a..0978547b9d1e9 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/Schemas.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/schema/compatibility/Schemas.java
@@ -20,20 +20,12 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
 import org.apache.avro.reflect.AvroDefault;
 
 public class Schemas {
 
     @Data
-    @Getter
-    @Setter
-    @ToString
-    @EqualsAndHashCode
     @NoArgsConstructor
     @AllArgsConstructor
     public static class PersonOne{
@@ -41,10 +33,6 @@ public static class PersonOne{
     }
 
     @Data
-    @Getter
-    @Setter
-    @ToString
-    @EqualsAndHashCode
     @AllArgsConstructor
     @NoArgsConstructor
     public static class PersonTwo{
@@ -55,10 +43,6 @@ public static class PersonTwo{
     }
 
     @Data
-    @Getter
-    @Setter
-    @ToString
-    @EqualsAndHashCode
     @AllArgsConstructor
     @NoArgsConstructor
     public static class PersonThree{
@@ -68,10 +52,6 @@ public static class PersonThree{
     }
 
     @Data
-    @Getter
-    @Setter
-    @ToString
-    @EqualsAndHashCode
     @AllArgsConstructor
     @NoArgsConstructor
     public static class PersonFour{
diff --git a/pulsar-broker/src/test/resources/configurations/pulsar_broker_test.conf b/pulsar-broker/src/test/resources/configurations/pulsar_broker_test.conf
index 5d37a11ec60f4..cffb006d5b350 100644
--- a/pulsar-broker/src/test/resources/configurations/pulsar_broker_test.conf
+++ b/pulsar-broker/src/test/resources/configurations/pulsar_broker_test.conf
@@ -86,3 +86,6 @@ replicationConnectionsPerBroker=16
 replicationProducerQueueSize=1000
 replicatorPrefix=pulsar.repl
 brokerDeleteInactiveTopicsMode=delete_when_subscriptions_caught_up
+supportedNamespaceBundleSplitAlgorithms=[range_equally_divide]
+defaultNamespaceBundleSplitAlgorithm=topic_count_equally_divide
+maxMessagePublishBufferSizeInMB=-1
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Namespaces.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Namespaces.java
index 8b858ba53f93f..bfd4b7bf93fed 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Namespaces.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Namespaces.java
@@ -33,6 +33,8 @@
 import org.apache.pulsar.common.policies.data.BookieAffinityGroupData;
 import org.apache.pulsar.common.policies.data.BundlesData;
 import org.apache.pulsar.common.policies.data.DispatchRate;
+import org.apache.pulsar.common.policies.data.DelayedDeliveryPolicies;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.apache.pulsar.common.policies.data.PersistencePolicies;
 import org.apache.pulsar.common.policies.data.Policies;
 import org.apache.pulsar.common.policies.data.PublishRate;
@@ -928,7 +930,7 @@ void setBookieAffinityGroup(String namespace, BookieAffinityGroupData bookieAffi
      * @throws PulsarAdminException
      *             Unexpected error
      */
-    void splitNamespaceBundle(String namespace, String bundle, boolean unloadSplitBundles) throws PulsarAdminException;
+    void splitNamespaceBundle(String namespace, String bundle, boolean unloadSplitBundles, String splitAlgorithmName) throws PulsarAdminException;
 
     /**
      * Set message-publish-rate (topics under this namespace can publish this many messages per second)
@@ -1152,7 +1154,69 @@ CompletableFuture<Void> clearNamespaceBundleBacklogForSubscriptionAsync(String n
      */
     void setEncryptionRequiredStatus(String namespace, boolean encryptionRequired) throws PulsarAdminException;
 
-     /**
+    /**
+     * Get the delayed delivery messages for all topics within a namespace.
+     * <p>
+     * If disabled, messages will be immediately delivered and there will
+     * be no tracking overhead.
+     * <p>
+     * Request example:
+     *
+     * <pre>
+     * <code>
+     * {
+     *     "active" : true,   // Enable or disable delayed delivery for messages on a namespace
+     *     "tickTime" : 1000, // The tick time for when retrying on delayed delivery messages
+     * }
+     * </code>
+     * </pre>
+     *
+     * @param namespace
+     *            Namespace name
+     * @return delayedDeliveryPolicies
+     *            Whether to enable the delayed delivery for messages.
+     *
+     * @throws NotAuthorizedException
+     *             Don't have admin permission
+     * @throws NotFoundException
+     *             Namespace does not exist
+     * @throws PulsarAdminException
+     *             Unexpected error
+     */
+    DelayedDeliveryPolicies getDelayedDelivery(String namespace) throws PulsarAdminException;
+
+    /**
+     * Set the delayed delivery messages for all topics within a namespace.
+     * <p>
+     * If disabled, messages will be immediately delivered and there will
+     * be no tracking overhead.
+     * <p>
+     * Request example:
+     *
+     * <pre>
+     * <code>
+     * {
+     *     "tickTime" : 1000, // Enable or disable delayed delivery for messages on a namespace
+     *     "active" : true,   // The tick time for when retrying on delayed delivery messages
+     * }
+     * </code>
+     * </pre>
+     *
+     * @param namespace
+     *            Namespace name
+     * @param delayedDeliveryPolicies
+     *            Whether to enable the delayed delivery for messages.
+     *
+     * @throws NotAuthorizedException
+     *             Don't have admin permission
+     * @throws NotFoundException
+     *             Namespace does not exist
+     * @throws PulsarAdminException
+     *             Unexpected error
+     */
+    void setDelayedDeliveryMessages(String namespace, DelayedDeliveryPolicies delayedDeliveryPolicies) throws PulsarAdminException;
+
+    /**
      * Set the given subscription auth mode on all topics on a namespace
      *
      * @param namespace
@@ -1293,6 +1357,94 @@ CompletableFuture<Void> clearNamespaceBundleBacklogForSubscriptionAsync(String n
      */
     void setMaxConsumersPerSubscription(String namespace, int maxConsumersPerSubscription) throws PulsarAdminException;
 
+    /**
+     * Get the maxUnackedMessagesPerConsumer for a namespace.
+     * <p>
+     * Response example:
+     *
+     * <pre>
+     * <code>0</code>
+     * </pre>
+     *
+     * @param namespace
+     *            Namespace name
+     *
+     * @throws NotAuthorizedException
+     *             Don't have admin permission
+     * @throws NotFoundException
+     *             Namespace does not exist
+     * @throws PulsarAdminException
+     *             Unexpected error
+     */
+    int getMaxUnackedMessagesPerConsumer(String namespace) throws PulsarAdminException;
+
+    /**
+     * Set maxUnackedMessagesPerConsumer for a namespace.
+     * <p>
+     * Request example:
+     *
+     * <pre>
+     * <code>10</code>
+     * </pre>
+     *
+     * @param namespace
+     *            Namespace name
+     * @param maxUnackedMessagesPerConsumer
+     *            maxUnackedMessagesPerConsumer value for a namespace
+     *
+     * @throws NotAuthorizedException
+     *             Don't have admin permission
+     * @throws NotFoundException
+     *             Namespace does not exist
+     * @throws PulsarAdminException
+     *             Unexpected error
+     */
+    void setMaxUnackedMessagesPerConsumer(String namespace, int maxUnackedMessagesPerConsumer) throws PulsarAdminException;
+
+    /**
+     * Get the maxUnackedMessagesPerSubscription for a namespace.
+     * <p>
+     * Response example:
+     *
+     * <pre>
+     * <code>0</code>
+     * </pre>
+     *
+     * @param namespace
+     *            Namespace name
+     *
+     * @throws NotAuthorizedException
+     *             Don't have admin permission
+     * @throws NotFoundException
+     *             Namespace does not exist
+     * @throws PulsarAdminException
+     *             Unexpected error
+     */
+    int getMaxUnackedMessagesPerSubscription(String namespace) throws PulsarAdminException;
+
+    /**
+     * Set maxUnackedMessagesPerSubscription for a namespace.
+     * <p>
+     * Request example:
+     *
+     * <pre>
+     * <code>10</code>
+     * </pre>
+     *
+     * @param namespace
+     *            Namespace name
+     * @param maxUnackedMessagesPerSubscription
+     *            Max number of unacknowledged messages allowed per shared subscription.
+     *
+     * @throws NotAuthorizedException
+     *             Don't have admin permission
+     * @throws NotFoundException
+     *             Namespace does not exist
+     * @throws PulsarAdminException
+     *             Unexpected error
+     */
+    void setMaxUnackedMessagesPerSubscription(String namespace, int maxUnackedMessagesPerSubscription) throws PulsarAdminException;
+
     /**
      * Get the compactionThreshold for a namespace. The maximum number of bytes topics in the namespace
      * can have before compaction is triggered. 0 disables.
@@ -1591,4 +1743,74 @@ boolean getIsAllowAutoUpdateSchema(String namespace)
      */
     void setIsAllowAutoUpdateSchema(String namespace, boolean isAllowAutoUpdateSchema)
             throws PulsarAdminException;
+
+    /**
+     * Set the offload configuration for all the topics in a namespace.
+     * <p/>
+     * Set the offload configuration in a namespace. This operation requires pulsar tenant access.
+     * <p/>
+     * Request parameter example:
+     * <p/>
+     *
+     * <pre>
+     * <code>
+     * {
+     *     "region" : "us-east-2",                   // The long term storage region
+     *     "bucket" : "bucket",                      // Bucket to place offloaded ledger into
+     *     "endpoint" : "endpoint",                  // Alternative endpoint to connect to
+     *     "maxBlockSize" : 1024,                    // Max Block Size, default 64MB
+     *     "readBufferSize" : 1024,                  // Read Buffer Size, default 1MB
+     * }
+     * </code>
+     * </pre>
+     *
+     * @param namespace
+     *            Namespace name
+     * @param offloadPolicies
+     *            Offload configuration
+     *
+     * @throws NotAuthorizedException
+     *             Don't have admin permission
+     * @throws NotFoundException
+     *             Namespace does not exist
+     * @throws ConflictException
+     *             Concurrent modification
+     * @throws PulsarAdminException
+     *             Unexpected error
+     */
+    void setOffloadPolicies(String namespace, OffloadPolicies offloadPolicies) throws PulsarAdminException;
+
+    /**
+     * Get the offload configuration for a namespace.
+     * <p/>
+     * Get the offload configuration for a namespace.
+     * <p/>
+     * Response example:
+     * <p/>
+     *
+     * <pre>
+     * <code>
+     * {
+     *     "region" : "us-east-2",                   // The long term storage region
+     *     "bucket" : "bucket",                      // Bucket to place offloaded ledger into
+     *     "endpoint" : "endpoint",                  // Alternative endpoint to connect to
+     *     "maxBlockSize" : 1024,                    // Max Block Size, default 64MB
+     *     "readBufferSize" : 1024,                  // Read Buffer Size, default 1MB
+     * }
+     * </code>
+     * </pre>
+     *
+     * @param namespace
+     *            Namespace name
+     * @throws NotAuthorizedException
+     *             Don't have admin permission
+     * @throws NotFoundException
+     *             Namespace does not exist
+     * @throws ConflictException
+     *             Concurrent modification
+     * @throws PulsarAdminException
+     *             Unexpected error
+     */
+    OffloadPolicies getOffloadPolicies(String namespace) throws PulsarAdminException;
+
 }
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Topics.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Topics.java
index c5ec04120c022..0a004628de6b0 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Topics.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Topics.java
@@ -565,6 +565,8 @@ List<String> getListInBundle(String namespace, String bundleRange)
      *
      * @param topic
      *            topic name
+     * @param getPreciseBacklog
+     *            Set to true to get precise backlog, Otherwise get imprecise backlog.
      * @return the topic statistics
      *
      * @throws NotAuthorizedException
@@ -574,7 +576,11 @@ List<String> getListInBundle(String namespace, String bundleRange)
      * @throws PulsarAdminException
      *             Unexpected error
      */
-    TopicStats getStats(String topic) throws PulsarAdminException;
+    TopicStats getStats(String topic, boolean getPreciseBacklog) throws PulsarAdminException;
+
+    default TopicStats getStats(String topic) throws PulsarAdminException {
+        return getStats(topic, false);
+    }
 
     /**
      * Get the stats for the topic asynchronously. All the rates are computed over a 1 minute window and are relative
@@ -582,11 +588,17 @@ List<String> getListInBundle(String namespace, String bundleRange)
      *
      * @param topic
      *            topic name
+     * @param getPreciseBacklog
+     *            Set to true to get precise backlog, Otherwise get imprecise backlog.
      *
      * @return a future that can be used to track when the topic statistics are returned
      *
      */
-    CompletableFuture<TopicStats> getStatsAsync(String topic);
+    CompletableFuture<TopicStats> getStatsAsync(String topic, boolean getPreciseBacklog);
+
+    default CompletableFuture<TopicStats> getStatsAsync(String topic) {
+        return getStatsAsync(topic, false);
+    }
 
     /**
      * Get the internal stats for the topic.
@@ -716,7 +728,11 @@ List<String> getListInBundle(String namespace, String bundleRange)
      *             Unexpected error
      *
      */
-    PartitionedTopicStats getPartitionedStats(String topic, boolean perPartition) throws PulsarAdminException;
+    PartitionedTopicStats getPartitionedStats(String topic, boolean perPartition, boolean getPreciseBacklog) throws PulsarAdminException;
+
+    default PartitionedTopicStats getPartitionedStats(String topic, boolean perPartition) throws PulsarAdminException {
+        return getPartitionedStats(topic, perPartition, false);
+    }
 
     /**
      * Get the stats for the partitioned topic asynchronously
@@ -727,7 +743,11 @@ List<String> getListInBundle(String namespace, String bundleRange)
      *            flag to get stats per partition
      * @return a future that can be used to track when the partitioned topic statistics are returned
      */
-    CompletableFuture<PartitionedTopicStats> getPartitionedStatsAsync(String topic, boolean perPartition);
+    CompletableFuture<PartitionedTopicStats> getPartitionedStatsAsync(String topic, boolean perPartition, boolean getPreciseBacklog);
+
+    default CompletableFuture<PartitionedTopicStats> getPartitionedStatsAsync(String topic, boolean perPartition) {
+        return getPartitionedStatsAsync(topic, perPartition, false);
+    }
 
     /**
      * Get the stats for the partitioned topic
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/NamespacesImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/NamespacesImpl.java
index 7ab7762c7612d..3b60fa278cd76 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/NamespacesImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/NamespacesImpl.java
@@ -42,7 +42,9 @@
 import org.apache.pulsar.common.policies.data.BacklogQuota.BacklogQuotaType;
 import org.apache.pulsar.common.policies.data.BundlesData;
 import org.apache.pulsar.common.policies.data.DispatchRate;
+import org.apache.pulsar.common.policies.data.DelayedDeliveryPolicies;
 import org.apache.pulsar.common.policies.data.ErrorData;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.apache.pulsar.common.policies.data.PersistencePolicies;
 import org.apache.pulsar.common.policies.data.Policies;
 import org.apache.pulsar.common.policies.data.PublishRate;
@@ -525,12 +527,13 @@ public CompletableFuture<Void> unloadNamespaceBundleAsync(String namespace, Stri
     }
 
     @Override
-    public void splitNamespaceBundle(String namespace, String bundle, boolean unloadSplitBundles)
+    public void splitNamespaceBundle(String namespace, String bundle, boolean unloadSplitBundles, String splitAlgorithmName)
             throws PulsarAdminException {
         try {
             NamespaceName ns = NamespaceName.get(namespace);
             WebTarget path = namespacePath(ns, bundle, "split");
-            request(path.queryParam("unload", Boolean.toString(unloadSplitBundles)))
+            request(path.queryParam("unload", Boolean.toString(unloadSplitBundles))
+                    .queryParam("splitAlgorithmName", splitAlgorithmName))
                     .put(Entity.entity("", MediaType.APPLICATION_JSON), ErrorData.class);
         } catch (Exception e) {
             throw getApiException(e);
@@ -766,6 +769,28 @@ public void setEncryptionRequiredStatus(String namespace, boolean encryptionRequ
         }
     }
 
+    @Override
+    public DelayedDeliveryPolicies getDelayedDelivery(String namespace) throws PulsarAdminException {
+        try {
+            NamespaceName ns = NamespaceName.get(namespace);
+            WebTarget path = namespacePath(ns, "delayedDelivery");
+            return request(path).get(DelayedDeliveryPolicies.class);
+        } catch (Exception e) {
+            throw getApiException(e);
+        }
+    }
+
+    @Override
+    public void setDelayedDeliveryMessages(String namespace, DelayedDeliveryPolicies delayedDeliveryPolicies) throws PulsarAdminException {
+        try {
+            NamespaceName ns = NamespaceName.get(namespace);
+            WebTarget path = namespacePath(ns, "delayedDelivery");
+            request(path).post(Entity.entity(delayedDeliveryPolicies, MediaType.APPLICATION_JSON), ErrorData.class);
+        } catch (Exception e) {
+            throw getApiException(e);
+        }
+    }
+
     @Override
     public int getMaxProducersPerTopic(String namespace) throws PulsarAdminException {
         try {
@@ -832,6 +857,50 @@ public void setMaxConsumersPerSubscription(String namespace, int maxConsumersPer
         }
     }
 
+    @Override
+    public int getMaxUnackedMessagesPerConsumer(String namespace) throws PulsarAdminException {
+        try {
+            NamespaceName ns = NamespaceName.get(namespace);
+            WebTarget path = namespacePath(ns, "maxUnackedMessagesPerConsumer");
+            return request(path).get(Integer.class);
+        } catch (Exception e) {
+            throw getApiException(e);
+        }
+    }
+
+    @Override
+    public void setMaxUnackedMessagesPerConsumer(String namespace, int maxUnackedMessagesPerConsumer) throws PulsarAdminException {
+        try {
+            NamespaceName ns = NamespaceName.get(namespace);
+            WebTarget path = namespacePath(ns, "maxUnackedMessagesPerConsumer");
+            request(path).post(Entity.entity(maxUnackedMessagesPerConsumer, MediaType.APPLICATION_JSON), ErrorData.class);
+        } catch (Exception e) {
+            throw getApiException(e);
+        }
+    }
+
+    @Override
+    public int getMaxUnackedMessagesPerSubscription(String namespace) throws PulsarAdminException {
+        try {
+            NamespaceName ns = NamespaceName.get(namespace);
+            WebTarget path = namespacePath(ns, "maxUnackedMessagesPerSubscription");
+            return request(path).get(Integer.class);
+        } catch (Exception e) {
+            throw getApiException(e);
+        }
+    }
+
+    @Override
+    public void setMaxUnackedMessagesPerSubscription(String namespace, int maxUnackedMessagesPerSubscription) throws PulsarAdminException {
+        try {
+            NamespaceName ns = NamespaceName.get(namespace);
+            WebTarget path = namespacePath(ns, "maxUnackedMessagesPerSubscription");
+            request(path).post(Entity.entity(maxUnackedMessagesPerSubscription, MediaType.APPLICATION_JSON), ErrorData.class);
+        } catch (Exception e) {
+            throw getApiException(e);
+        }
+    }
+
     @Override
     public long getCompactionThreshold(String namespace) throws PulsarAdminException {
         try {
@@ -1006,6 +1075,28 @@ public void setIsAllowAutoUpdateSchema(String namespace, boolean isAllowAutoUpda
         }
     }
 
+    @Override
+    public void setOffloadPolicies(String namespace, OffloadPolicies offloadPolicies) throws PulsarAdminException {
+        try {
+            NamespaceName ns = NamespaceName.get(namespace);
+            WebTarget path = namespacePath(ns, "offloadPolicies");
+            request(path).post(Entity.entity(offloadPolicies, MediaType.APPLICATION_JSON), ErrorData.class);
+        } catch (Exception e) {
+            throw getApiException(e);
+        }
+    }
+
+    @Override
+    public OffloadPolicies getOffloadPolicies(String namespace) throws PulsarAdminException {
+        try {
+            NamespaceName ns = NamespaceName.get(namespace);
+            WebTarget path = namespacePath(ns, "offloadPolicies");
+            return request(path).get(OffloadPolicies.class);
+        } catch (Exception e) {
+            throw getApiException(e);
+        }
+    }
+
     private WebTarget namespacePath(NamespaceName namespace, String... parts) {
         final WebTarget base = namespace.isV2() ? adminV2Namespaces : adminNamespaces;
         WebTarget namespacePath = base.path(namespace.toString());
diff --git a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicsImpl.java b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicsImpl.java
index 75c3d59a55d7c..c61359a74f0b5 100644
--- a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicsImpl.java
+++ b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/TopicsImpl.java
@@ -437,9 +437,9 @@ public void failed(Throwable throwable) {
     }
 
     @Override
-    public TopicStats getStats(String topic) throws PulsarAdminException {
+    public TopicStats getStats(String topic, boolean getPreciseBacklog) throws PulsarAdminException {
         try {
-            return getStatsAsync(topic).get(this.readTimeoutMs, TimeUnit.MILLISECONDS);
+            return getStatsAsync(topic, getPreciseBacklog).get(this.readTimeoutMs, TimeUnit.MILLISECONDS);
         } catch (ExecutionException e) {
             throw (PulsarAdminException) e.getCause();
         } catch (InterruptedException e) {
@@ -451,9 +451,9 @@ public TopicStats getStats(String topic) throws PulsarAdminException {
     }
 
     @Override
-    public CompletableFuture<TopicStats> getStatsAsync(String topic) {
+    public CompletableFuture<TopicStats> getStatsAsync(String topic, boolean getPreciseBacklog) {
         TopicName tn = validateTopic(topic);
-        WebTarget path = topicPath(tn, "stats");
+        WebTarget path = topicPath(tn, "stats").queryParam("getPreciseBacklog", getPreciseBacklog);
         final CompletableFuture<TopicStats> future = new CompletableFuture<>();
         asyncGetRequest(path,
                 new InvocationCallback<TopicStats>() {
@@ -542,10 +542,10 @@ public void failed(Throwable throwable) {
     }
 
     @Override
-    public PartitionedTopicStats getPartitionedStats(String topic, boolean perPartition)
+    public PartitionedTopicStats getPartitionedStats(String topic, boolean perPartition, boolean getPreciseBacklog)
             throws PulsarAdminException {
         try {
-            return getPartitionedStatsAsync(topic, perPartition).get(this.readTimeoutMs, TimeUnit.MILLISECONDS);
+            return getPartitionedStatsAsync(topic, perPartition, getPreciseBacklog).get(this.readTimeoutMs, TimeUnit.MILLISECONDS);
         } catch (ExecutionException e) {
             throw (PulsarAdminException) e.getCause();
         } catch (InterruptedException e) {
@@ -558,10 +558,10 @@ public PartitionedTopicStats getPartitionedStats(String topic, boolean perPartit
 
     @Override
     public CompletableFuture<PartitionedTopicStats> getPartitionedStatsAsync(String topic,
-            boolean perPartition) {
+            boolean perPartition, boolean getPreciseBacklog) {
         TopicName tn = validateTopic(topic);
         WebTarget path = topicPath(tn, "partitioned-stats");
-        path = path.queryParam("perPartition", perPartition);
+        path = path.queryParam("perPartition", perPartition).queryParam("getPreciseBacklog", getPreciseBacklog);
         final CompletableFuture<PartitionedTopicStats> future = new CompletableFuture<>();
         asyncGetRequest(path,
                 new InvocationCallback<PartitionedTopicStats>() {
diff --git a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerBuilder.java b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerBuilder.java
index f63e95fb0f0bf..0f26cabe626e5 100644
--- a/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerBuilder.java
+++ b/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ConsumerBuilder.java
@@ -374,6 +374,21 @@ public interface ConsumerBuilder<T> extends Cloneable {
      */
     ConsumerBuilder<T> patternAutoDiscoveryPeriod(int periodInMinutes);
 
+
+    /**
+     * Set topics auto discovery period when using a pattern for topics consumer.
+     *
+     * @param interval
+     *            the amount of delay between checks for
+     *            new topics matching pattern set with {@link #topicsPattern(String)}
+     * @param unit
+     *            the unit of the topics auto discovery period
+     *
+     * @return the consumer builder instance
+     */
+    ConsumerBuilder<T> patternAutoDiscoveryPeriod(int interval, TimeUnit unit);
+
+
     /**
      * <b>Shared subscription</b>
      * Sets priority level for the shared subscription consumers to which broker gives more priority while dispatching
@@ -527,7 +542,7 @@ public interface ConsumerBuilder<T> extends Cloneable {
      * <p>Or
      * <pre>
      * client.newConsumer()
-     *          .keySharedPolicy(KeySharedPolicy.autoSplitHashRange().hashRangeTotal(100))
+     *          .keySharedPolicy(KeySharedPolicy.autoSplitHashRange())
      *          .subscribe();
      * </pre>
      * Details about auto split hash range policy, please see {@link KeySharedPolicy.KeySharedPolicyAutoSplit}.
diff --git a/pulsar-client-cpp/CMakeLists.txt b/pulsar-client-cpp/CMakeLists.txt
index 55740b2e32a88..6357021ba2be3 100644
--- a/pulsar-client-cpp/CMakeLists.txt
+++ b/pulsar-client-cpp/CMakeLists.txt
@@ -27,6 +27,8 @@ if(CCACHE_PROGRAM)
     MESSAGE(STATUS "Using CCache")
 endif(CCACHE_PROGRAM)
 
+MESSAGE(STATUS "ARCHITECTURE: ${CMAKE_SYSTEM_PROCESSOR}")
+
 option(BUILD_TESTS "Build tests" ON)
 MESSAGE(STATUS "BUILD_TESTS:  " ${BUILD_TESTS})
 
@@ -49,12 +51,16 @@ set(Boost_NO_BOOST_CMAKE ON)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_C_STANDARD 11)
 
-if (NOT MSVC)
-    add_compile_options(-msse4.2 -mpclmul -Werror=switch -Wno-deprecated-declarations)
-else()
+if (MSVC)
+    # Visual Studio compiler flags
     add_definitions(-DWIN32_LEAN_AND_MEAN -DNOGDI -D_WIN32_WINNT=0x0501 -D_CRT_SECURE_NO_WARNINGS)
     add_compile_options(/wd4244 /wd4267 /wd4018 /wd4715 /wd4251 /wd4275)
-endif(NOT MSVC)
+else()
+    add_compile_options(-Werror=switch -Wno-deprecated-declarations)
+    if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+        add_compile_options(-msse4.2 -mpclmul)
+    endif()
+endif(MSVC)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
@@ -68,6 +74,12 @@ endif(NOT LOG_CATEGORY_NAME)
 add_definitions(-DLOG_CATEGORY_NAME=${LOG_CATEGORY_NAME} -DBUILDING_PULSAR -DBOOST_ALL_NO_LIB -DBOOST_ALLOW_DEPRECATED_HEADERS)
 
 if (LINK_STATIC)
+    find_library(ZLIB_LIBRARIES REQUIRED NAMES libz.a z)
+    find_library(Protobuf_LITE_LIBRARIES NAMES libprotobuf-lite.a)
+    find_library(CURL_LIBRARIES NAMES libcurl.a curl curl_a)
+    find_library(LIB_ZSTD NAMES libzstd.a)
+    find_library(LIB_SNAPPY NAMES libsnappy.a)
+
     if (USE_LOG4CXX)
         if (LOG4CXX_USE_DYNAMIC_LIBS)
             find_library(LOG4CXX_LIBRARY_PATH log4cxx)
@@ -98,6 +110,19 @@ if (LINK_STATIC)
     SET(OPENSSL_USE_STATIC_LIBS TRUE)
 else()
     # Link to shared libraries
+    find_package(ZLIB REQUIRED)
+    set(ZLIB_LIBRARIES ${ZLIB_LIBRARIES})
+    if (NOT PROTOBUF_LIBRARIES)
+        find_package(ProtoBuf QUIET)
+        if (NOT Protobuf_FOUND OR NOT Protobuf_LITE_LIBRARIES)
+            find_library(Protobuf_LITE_LIBRARIES protobuf-lite libprotobuf-lite)
+            find_path(Protobuf_INCLUDE_DIRS google/protobuf/stubs/common.h)
+        endif()
+    endif (NOT PROTOBUF_LIBRARIES)
+
+    find_library(LIB_ZSTD zstd)
+    find_library(LIB_SNAPPY snappy libsnappy)
+    find_library(CURL_LIBRARIES curl)
     if (USE_LOG4CXX)
         find_library(LOG4CXX_LIBRARY_PATH log4cxx)
         find_path(LOG4CXX_INCLUDE_PATH log4cxx/logger.h)
@@ -110,24 +135,6 @@ else()
   find_package(Boost REQUIRED COMPONENTS program_options regex system)
 endif()
 
-find_package(ZLIB REQUIRED)
-
-find_package(Protobuf QUIET)
-if (NOT Protobuf_FOUND OR NOT Protobuf_LITE_LIBRARIES)
-    find_library(Protobuf_LITE_LIBRARIES protobuf-lite libprotobuf-lite)
-    find_path(Protobuf_INCLUDE_DIRS google/protobuf/stubs/common.h)
-endif()
-
-find_package(CURL QUIET)
-if (NOT CURL_FOUND)
-    find_library(CURL_LIBRARIES NAMES curl libcurl_a)
-    find_path(CURL_INCLUDE_DIRS curl/curl.h)
-endif()
-
-find_library(LIB_ZSTD zstd libzstd)
-
-find_library(LIB_SNAPPY snappy libsnappy)
-
 if (BUILD_PYTHON_WRAPPER)
     find_package(PythonLibs REQUIRED)
     MESSAGE(STATUS "PYTHON: " ${PYTHONLIBS_VERSION_STRING})
diff --git a/pulsar-client-cpp/lib/ClientConnection.cc b/pulsar-client-cpp/lib/ClientConnection.cc
index 384789aea96fc..e40f2f831d6c6 100644
--- a/pulsar-client-cpp/lib/ClientConnection.cc
+++ b/pulsar-client-cpp/lib/ClientConnection.cc
@@ -145,11 +145,11 @@ ClientConnection::ClientConnection(const std::string& logicalAddress, const std:
       resolver_(executor_->createTcpResolver()),
       socket_(executor_->createSocket()),
 #if BOOST_VERSION >= 107000
-      strand_(boost::asio::make_strand(executor_->io_service_.get_executor())),
+      strand_(boost::asio::make_strand(executor_->io_service_->get_executor())),
 #elif BOOST_VERSION >= 106600
-      strand_(executor_->io_service_.get_executor()),
+      strand_(executor_->io_service_->get_executor()),
 #else
-      strand_(executor_->io_service_),
+      strand_(*(executor_->io_service_)),
 #endif
       logicalAddress_(logicalAddress),
       physicalAddress_(physicalAddress),
@@ -253,9 +253,10 @@ void ClientConnection::handlePulsarConnected(const CommandConnected& cmdConnecte
 
     if (serverProtocolVersion_ >= v1) {
         // Only send keep-alive probes if the broker supports it
-        keepAliveTimer_ = executor_->createDeadlineTimer();
-        keepAliveTimer_->expires_from_now(boost::posix_time::seconds(KeepAliveIntervalInSeconds));
-        keepAliveTimer_->async_wait(std::bind(&ClientConnection::handleKeepAliveTimeout, shared_from_this()));
+        DeadlineTimerPtr keepAliveTimer = executor_->createDeadlineTimer();
+        keepAliveTimer->expires_from_now(boost::posix_time::seconds(KeepAliveIntervalInSeconds));
+        keepAliveTimer->async_wait(std::bind(&ClientConnection::handleKeepAliveTimeout, shared_from_this()));
+        keepAliveTimer_ = keepAliveTimer;
     }
 
     if (serverProtocolVersion_ >= v8) {
@@ -284,10 +285,14 @@ void ClientConnection::startConsumerStatsTimer(std::vector<uint64_t> consumerSta
          it != pendingConsumerStatsMap_.end(); ++it) {
         consumerStatsRequests.push_back(it->first);
     }
-    consumerStatsRequestTimer_->expires_from_now(operationsTimeout_);
-    consumerStatsRequestTimer_->async_wait(std::bind(&ClientConnection::handleConsumerStatsTimeout,
-                                                     shared_from_this(), std::placeholders::_1,
-                                                     consumerStatsRequests));
+
+    DeadlineTimerPtr timer = consumerStatsRequestTimer_;
+    if (timer) {
+        timer->expires_from_now(operationsTimeout_);
+        timer->async_wait(std::bind(&ClientConnection::handleConsumerStatsTimeout, shared_from_this(),
+                                    std::placeholders::_1, consumerStatsRequests));
+    }
+
     lock.unlock();
     // Complex logic since promises need to be fulfilled outside the lock
     for (int i = 0; i < consumerStatsPromises.size(); i++) {
diff --git a/pulsar-client-cpp/lib/ConsumerImpl.cc b/pulsar-client-cpp/lib/ConsumerImpl.cc
index 9a7e506f94059..e90aef9b29fcf 100644
--- a/pulsar-client-cpp/lib/ConsumerImpl.cc
+++ b/pulsar-client-cpp/lib/ConsumerImpl.cc
@@ -80,8 +80,7 @@ ConsumerImpl::ConsumerImpl(const ClientImplPtr client, const std::string& topic,
     unsigned int statsIntervalInSeconds = client->getClientConfig().getStatsIntervalInSeconds();
     if (statsIntervalInSeconds) {
         consumerStatsBasePtr_ = std::make_shared<ConsumerStatsImpl>(
-            consumerStr_, client->getIOExecutorProvider()->get()->createDeadlineTimer(),
-            statsIntervalInSeconds);
+            consumerStr_, client->getIOExecutorProvider()->get(), statsIntervalInSeconds);
     } else {
         consumerStatsBasePtr_ = std::make_shared<ConsumerStatsDisabled>();
     }
diff --git a/pulsar-client-cpp/lib/ExecutorService.cc b/pulsar-client-cpp/lib/ExecutorService.cc
index 4d3e4eda2a9ba..8de04599bea88 100644
--- a/pulsar-client-cpp/lib/ExecutorService.cc
+++ b/pulsar-client-cpp/lib/ExecutorService.cc
@@ -25,15 +25,28 @@
 namespace pulsar {
 
 ExecutorService::ExecutorService()
-    : io_service_(), work_(new BackgroundWork(io_service_)), worker_([&]() { io_service_.run(); }) {}
+    : io_service_(new boost::asio::io_service()),
+      work_(new BackgroundWork(*io_service_)),
+      worker_(std::bind(&ExecutorService::startWorker, this, io_service_)) {}
+
+ExecutorService::~ExecutorService() {
+    close();
+    // If the worker_ is still not joinable at this point just detach
+    // the thread so its destructor does not terminate the app
+    if (worker_.joinable()) {
+        worker_.detach();
+    }
+}
 
-ExecutorService::~ExecutorService() { close(); }
+void ExecutorService::startWorker(std::shared_ptr<boost::asio::io_service> io_service) { io_service_->run(); }
 
 /*
  *  factory method of boost::asio::ip::tcp::socket associated with io_service_ instance
  *  @ returns shared_ptr to this socket
  */
-SocketPtr ExecutorService::createSocket() { return SocketPtr(new boost::asio::ip::tcp::socket(io_service_)); }
+SocketPtr ExecutorService::createSocket() {
+    return SocketPtr(new boost::asio::ip::tcp::socket(*io_service_));
+}
 
 TlsSocketPtr ExecutorService::createTlsSocket(SocketPtr &socket, boost::asio::ssl::context &ctx) {
     return std::shared_ptr<boost::asio::ssl::stream<boost::asio::ip::tcp::socket &> >(
@@ -45,24 +58,25 @@ TlsSocketPtr ExecutorService::createTlsSocket(SocketPtr &socket, boost::asio::ss
  *  @returns shraed_ptr to resolver object
  */
 TcpResolverPtr ExecutorService::createTcpResolver() {
-    return TcpResolverPtr(new boost::asio::ip::tcp::resolver(io_service_));
+    return TcpResolverPtr(new boost::asio::ip::tcp::resolver(*io_service_));
 }
 
 DeadlineTimerPtr ExecutorService::createDeadlineTimer() {
-    return DeadlineTimerPtr(new boost::asio::deadline_timer(io_service_));
+    return DeadlineTimerPtr(new boost::asio::deadline_timer(*io_service_));
 }
 
 void ExecutorService::close() {
-    // Ensure this service has not already been closed. This is
-    // because worker_.join() is not re-entrant on Windows
-    if (work_) {
-        io_service_.stop();
-        work_.reset();
+    io_service_->stop();
+    work_.reset();
+    // If this thread is attempting to join itself, do not. The destructor's
+    // call to close will handle joining if it does not occur here. This also ensures
+    // join is not called twice since it is not re-entrant on windows
+    if (std::this_thread::get_id() != worker_.get_id() && worker_.joinable()) {
         worker_.join();
     }
 }
 
-void ExecutorService::postWork(std::function<void(void)> task) { io_service_.post(task); }
+void ExecutorService::postWork(std::function<void(void)> task) { io_service_->post(task); }
 
 /////////////////////
 
diff --git a/pulsar-client-cpp/lib/ExecutorService.h b/pulsar-client-cpp/lib/ExecutorService.h
index 716273224577f..b673b791724fc 100644
--- a/pulsar-client-cpp/lib/ExecutorService.h
+++ b/pulsar-client-cpp/lib/ExecutorService.h
@@ -51,12 +51,12 @@ class PULSAR_PUBLIC ExecutorService : private boost::noncopyable {
     /*
      *  only called once and within lock so no need to worry about thread-safety
      */
-    void startWorker();
+    void startWorker(std::shared_ptr<boost::asio::io_service> io_service);
 
     /*
      * io_service is our interface to os, io object schedule async ops on this object
      */
-    boost::asio::io_service io_service_;
+    std::shared_ptr<boost::asio::io_service> io_service_;
 
     /*
      * work will not let io_service.run() return even after it has finished work
@@ -70,7 +70,7 @@ class PULSAR_PUBLIC ExecutorService : private boost::noncopyable {
      * background invoking async handlers as they are finished and result is available from
      * io_service
      */
-    boost::asio::detail::thread worker_;
+    std::thread worker_;
 };
 
 typedef std::shared_ptr<ExecutorService> ExecutorServicePtr;
diff --git a/pulsar-client-cpp/lib/MultiTopicsConsumerImpl.cc b/pulsar-client-cpp/lib/MultiTopicsConsumerImpl.cc
index 25addb97a8ba5..c1ee3e945753b 100644
--- a/pulsar-client-cpp/lib/MultiTopicsConsumerImpl.cc
+++ b/pulsar-client-cpp/lib/MultiTopicsConsumerImpl.cc
@@ -256,7 +256,6 @@ void MultiTopicsConsumerImpl::unsubscribeAsync(ResultCallback callback) {
 
     for (ConsumerMap::const_iterator consumer = consumers_.begin(); consumer != consumers_.end();
          consumer++) {
-        LOG_DEBUG("Unsubcribing Consumer - " << consumer->first);
         (consumer->second)
             ->unsubscribeAsync(std::bind(&MultiTopicsConsumerImpl::handleUnsubscribedAsync,
                                          shared_from_this(), std::placeholders::_1, consumerUnsubed,
diff --git a/pulsar-client-cpp/lib/NegativeAcksTracker.cc b/pulsar-client-cpp/lib/NegativeAcksTracker.cc
index e307091f6c2e8..492e379459393 100644
--- a/pulsar-client-cpp/lib/NegativeAcksTracker.cc
+++ b/pulsar-client-cpp/lib/NegativeAcksTracker.cc
@@ -48,14 +48,14 @@ void NegativeAcksTracker::scheduleTimer() {
 }
 
 void NegativeAcksTracker::handleTimer(const boost::system::error_code &ec) {
-    std::lock_guard<std::mutex> lock(mutex_);
-    timer_ = nullptr;
-
     if (ec) {
         // Ignore cancelled events
         return;
     }
 
+    std::lock_guard<std::mutex> lock(mutex_);
+    timer_ = nullptr;
+
     if (nackedMessages_.empty()) {
         return;
     }
diff --git a/pulsar-client-cpp/lib/ProducerImpl.cc b/pulsar-client-cpp/lib/ProducerImpl.cc
index f38ed2ae5934f..4a798483f5167 100644
--- a/pulsar-client-cpp/lib/ProducerImpl.cc
+++ b/pulsar-client-cpp/lib/ProducerImpl.cc
@@ -67,8 +67,8 @@ ProducerImpl::ProducerImpl(ClientImplPtr client, const std::string& topic, const
 
     unsigned int statsIntervalInSeconds = client->getClientConfig().getStatsIntervalInSeconds();
     if (statsIntervalInSeconds) {
-        producerStatsBasePtr_ = std::make_shared<ProducerStatsImpl>(
-            producerStr_, executor_->createDeadlineTimer(), statsIntervalInSeconds);
+        producerStatsBasePtr_ =
+            std::make_shared<ProducerStatsImpl>(producerStr_, executor_, statsIntervalInSeconds);
     } else {
         producerStatsBasePtr_ = std::make_shared<ProducerStatsDisabled>();
     }
diff --git a/pulsar-client-cpp/lib/checksum/crc32c_sse42.cc b/pulsar-client-cpp/lib/checksum/crc32c_sse42.cc
index f20eb6c1b6d48..acb3097ea42d4 100644
--- a/pulsar-client-cpp/lib/checksum/crc32c_sse42.cc
+++ b/pulsar-client-cpp/lib/checksum/crc32c_sse42.cc
@@ -15,13 +15,19 @@
  ******************************************************************************/
 #include "crc32c_sse42.h"
 
+#include <boost/predef.h>
+
 #include <assert.h>
+#include <stdlib.h>
+
+#if BOOST_ARCH_X86_64
 #include <nmmintrin.h>  // SSE4.2
 #include <wmmintrin.h>  // PCLMUL
+#endif
 
 #ifdef _MSC_VER
 #include <intrin.h>
-#else
+#elif BOOST_ARCH_X86_64
 #include <cpuid.h>
 #endif
 
@@ -55,12 +61,15 @@ bool crc32c_initialize() {
         __cpuid(CPUInfo, 1);
         has_sse42 = (CPUInfo[2] & cpuid_ecx_sse42) != 0;
         has_pclmulqdq = (CPUInfo[2] & cpuid_ecx_pclmulqdq) != 0;
-#else
+#elif BOOST_ARCH_X86_64
         unsigned int eax, ebx, ecx, edx;
         if (__get_cpuid(1, &eax, &ebx, &ecx, &edx)) {
             has_sse42 = (ecx & cpuid_ecx_sse42) != 0;
             has_pclmulqdq = (ecx & cpuid_ecx_pclmulqdq) != 0;
         }
+#else
+        has_sse42 = false;
+        has_pclmulqdq = false;
 #endif
         DEBUG_PRINTF1("has_sse42 = %d\n", has_sse42);
         DEBUG_PRINTF1("has_pclmulqdq = %d\n", has_pclmulqdq);
@@ -88,6 +97,8 @@ void chunk_config::make_shift_table(size_t bytes, uint32_t table[256]) {
     for (unsigned int i = 0; i < 256; ++i) table[i] = (const bitvector<32>)mul(m, bitvector<32>(i));
 }
 
+#if BOOST_ARCH_X86_64
+
 static uint32_t crc32c_chunk(uint32_t crc, const void *buf, const chunk_config &config) {
     DEBUG_PRINTF3("  crc32c_chunk(crc = 0x%08x, buf = %p, config.words = " SIZE_T_FORMAT ")", crc, buf,
                   config.words);
@@ -228,3 +239,12 @@ uint32_t crc32c(uint32_t init, const void *buf, size_t len, const chunk_config *
     DEBUG_PRINTF1("crc = 0x%08x\n", crc);
     return crc;
 }
+
+#else  // ! BOOST_ARCH_X86_64
+
+uint32_t crc32c(uint32_t init, const void *buf, size_t len, const chunk_config *config) {
+    // SSE 4.2 extension for hw implementation are not present
+    abort();
+}
+
+#endif
\ No newline at end of file
diff --git a/pulsar-client-cpp/lib/stats/ConsumerStatsImpl.cc b/pulsar-client-cpp/lib/stats/ConsumerStatsImpl.cc
index b3ef0d2a716db..7e512d710044b 100644
--- a/pulsar-client-cpp/lib/stats/ConsumerStatsImpl.cc
+++ b/pulsar-client-cpp/lib/stats/ConsumerStatsImpl.cc
@@ -25,10 +25,11 @@
 namespace pulsar {
 DECLARE_LOG_OBJECT();
 
-ConsumerStatsImpl::ConsumerStatsImpl(std::string consumerStr, DeadlineTimerPtr timer,
+ConsumerStatsImpl::ConsumerStatsImpl(std::string consumerStr, ExecutorServicePtr executor,
                                      unsigned int statsIntervalInSeconds)
     : consumerStr_(consumerStr),
-      timer_(timer),
+      executor_(executor),
+      timer_(executor_->createDeadlineTimer()),
       statsIntervalInSeconds_(statsIntervalInSeconds),
       totalNumBytesRecieved_(0),
       numBytesRecieved_(0) {
diff --git a/pulsar-client-cpp/lib/stats/ConsumerStatsImpl.h b/pulsar-client-cpp/lib/stats/ConsumerStatsImpl.h
index 9195980992fd5..8afb924ac3d2b 100644
--- a/pulsar-client-cpp/lib/stats/ConsumerStatsImpl.h
+++ b/pulsar-client-cpp/lib/stats/ConsumerStatsImpl.h
@@ -37,6 +37,8 @@ class ConsumerStatsImpl : public ConsumerStatsBase {
     std::map<std::pair<Result, proto::CommandAck_AckType>, unsigned long> totalAckedMsgMap_;
 
     std::string consumerStr_;
+
+    ExecutorServicePtr executor_;
     DeadlineTimerPtr timer_;
     std::mutex mutex_;
     unsigned int statsIntervalInSeconds_;
@@ -46,7 +48,7 @@ class ConsumerStatsImpl : public ConsumerStatsBase {
     friend class PulsarFriend;
 
    public:
-    ConsumerStatsImpl(std::string, DeadlineTimerPtr, unsigned int);
+    ConsumerStatsImpl(std::string, ExecutorServicePtr, unsigned int);
     ConsumerStatsImpl(const ConsumerStatsImpl& stats);
     void flushAndReset(const boost::system::error_code&);
     virtual void receivedMessage(Message&, Result);
diff --git a/pulsar-client-cpp/lib/stats/ProducerStatsImpl.cc b/pulsar-client-cpp/lib/stats/ProducerStatsImpl.cc
index 070e21a1b2972..25d150dfa51a4 100644
--- a/pulsar-client-cpp/lib/stats/ProducerStatsImpl.cc
+++ b/pulsar-client-cpp/lib/stats/ProducerStatsImpl.cc
@@ -41,13 +41,14 @@ std::string ProducerStatsImpl::latencyToString(const LatencyAccumulator& obj) {
     return os.str();
 }
 
-ProducerStatsImpl::ProducerStatsImpl(std::string producerStr, DeadlineTimerPtr timer,
+ProducerStatsImpl::ProducerStatsImpl(std::string producerStr, ExecutorServicePtr executor,
                                      unsigned int statsIntervalInSeconds)
     : numMsgsSent_(0),
       numBytesSent_(0),
       totalMsgsSent_(0),
       totalBytesSent_(0),
-      timer_(timer),
+      executor_(executor),
+      timer_(executor->createDeadlineTimer()),
       producerStr_(producerStr),
       statsIntervalInSeconds_(statsIntervalInSeconds),
       mutex_(),
diff --git a/pulsar-client-cpp/lib/stats/ProducerStatsImpl.h b/pulsar-client-cpp/lib/stats/ProducerStatsImpl.h
index 71695a2ac3e10..3fdd9fdd07895 100644
--- a/pulsar-client-cpp/lib/stats/ProducerStatsImpl.h
+++ b/pulsar-client-cpp/lib/stats/ProducerStatsImpl.h
@@ -61,6 +61,8 @@ class ProducerStatsImpl : public std::enable_shared_from_this<ProducerStatsImpl>
     LatencyAccumulator totalLatencyAccumulator_;
 
     std::string producerStr_;
+
+    ExecutorServicePtr executor_;
     DeadlineTimerPtr timer_;
     std::mutex mutex_;
     unsigned int statsIntervalInSeconds_;
@@ -72,7 +74,7 @@ class ProducerStatsImpl : public std::enable_shared_from_this<ProducerStatsImpl>
     static std::string latencyToString(const LatencyAccumulator&);
 
    public:
-    ProducerStatsImpl(std::string, DeadlineTimerPtr, unsigned int);
+    ProducerStatsImpl(std::string, ExecutorServicePtr, unsigned int);
 
     ProducerStatsImpl(const ProducerStatsImpl& stats);
 
diff --git a/pulsar-client-cpp/perf/PerfProducer.cc b/pulsar-client-cpp/perf/PerfProducer.cc
index 19a102a6094ba..7cf31b1e5f5a7 100644
--- a/pulsar-client-cpp/perf/PerfProducer.cc
+++ b/pulsar-client-cpp/perf/PerfProducer.cc
@@ -369,7 +369,7 @@ int main(int argc, char** argv) {
 
     pulsar::Client client(pulsar::PulsarFriend::getClient(args.serviceURL, conf, false));
 
-    std::atomic<bool> exitCondition;
+    std::atomic<bool> exitCondition(false);
     startPerfProducer(args, producerConf, client, exitCondition);
 
     Clock::time_point oldTime = Clock::now();
diff --git a/pulsar-client-cpp/perf/RateLimiter.h b/pulsar-client-cpp/perf/RateLimiter.h
index 6812a4d81aa85..a79b6e6972294 100644
--- a/pulsar-client-cpp/perf/RateLimiter.h
+++ b/pulsar-client-cpp/perf/RateLimiter.h
@@ -50,7 +50,7 @@ RateLimiter::RateLimiter(double rate)
         : interval_(std::chrono::microseconds((long)(1e6 / rate))),
           storedPermits_(0.0),
           maxPermits_(rate),
-          nextFree_() {
+          nextFree_(Clock::now()) {
     assert(rate < 1e6 && "Exceeded maximum rate");
 }
 
diff --git a/pulsar-client-cpp/python/CMakeLists.txt b/pulsar-client-cpp/python/CMakeLists.txt
index 5421cbc78389e..1cbc9728d23f3 100644
--- a/pulsar-client-cpp/python/CMakeLists.txt
+++ b/pulsar-client-cpp/python/CMakeLists.txt
@@ -51,7 +51,7 @@ set(PYTHON_WRAPPER_LIBS ${Boost_PYTHON_LIBRARY} ${Boost_PYTHON3_LIBRARY}
                         ${Boost_PYTHON36_LIBRARY})
 
 if (APPLE)
-    set(PYTHON_WRAPPER_LIBS ${PYTHON_LIBRARIES} ${PYTHON_WRAPPER_LIBS}
+    set(PYTHON_WRAPPER_LIBS ${PYTHON_WRAPPER_LIBS}
                          ${Boost_PYTHON27-MT_LIBRARY_RELEASE} ${Boost_PYTHON37-MT_LIBRARY_RELEASE})
 
     if (LINK_STATIC)
@@ -71,6 +71,7 @@ if (NOT PYTHON_WRAPPER_LIBS)
 endif ()
 
 if (APPLE)
+    set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -undefined dynamic_lookup")
     target_link_libraries(_pulsar -Wl,-all_load pulsarStatic ${PYTHON_WRAPPER_LIBS} ${COMMON_LIBS} ${ICU_LIBS})
 else ()
     if (NOT MSVC)
diff --git a/pulsar-client-cpp/python/pulsar/__init__.py b/pulsar-client-cpp/python/pulsar/__init__.py
index c6b213d974239..3117cfc2e47d6 100644
--- a/pulsar-client-cpp/python/pulsar/__init__.py
+++ b/pulsar-client-cpp/python/pulsar/__init__.py
@@ -90,7 +90,7 @@
                     batching_max_publish_delay_ms=10
                 )
 
-    def send_callback(res, msg):
+    def send_callback(res, msg_id):
         print('Message published res=%s', res)
 
     while True:
@@ -549,7 +549,7 @@ def subscribe(self, topic, subscription_name,
                   This method will accept these forms:
                     - `topic='my-topic'`
                     - `topic=['topic-1', 'topic-2', 'topic-3']`
-                    - `topic=re.compile('topic-.*')`
+                    - `topic=re.compile('persistent://public/default/topic-*')`
         * `subscription`: The name of the subscription.
 
         **Options**
@@ -858,7 +858,7 @@ def send_async(self, content, callback,
         Example:
 
             #!python
-            def callback(res, msg):
+            def callback(res, msg_id):
                 print('Message published: %s' % res)
 
             producer.send_async(msg, callback)
diff --git a/pulsar-client-cpp/python/setup.py b/pulsar-client-cpp/python/setup.py
index c16b9cf7473dd..52617a2cde881 100644
--- a/pulsar-client-cpp/python/setup.py
+++ b/pulsar-client-cpp/python/setup.py
@@ -19,6 +19,8 @@
 
 from setuptools import setup
 from distutils.core import Extension
+from distutils.util import strtobool
+from os import environ
 import subprocess
 import sys
 
@@ -28,18 +30,32 @@
 from os.path import dirname, realpath, join
 
 def get_version():
+    use_full_pom_name = strtobool(environ.get('USE_FULL_POM_NAME', 'False'))
+
     # Get the pulsar version from pom.xml
     TOP_LEVEL_PATH = dirname(dirname(dirname(realpath(__file__))))
     POM_PATH = join(TOP_LEVEL_PATH, 'pom.xml')
     root = ET.XML(open(POM_PATH).read())
     version = root.find('{http://maven.apache.org/POM/4.0.0}version').text.strip()
 
-    # Strip the '-incubating' suffix, since it prevents the packages
-    # from being uploaded into PyPI
-    return version.split('-')[0]
+    if use_full_pom_name:    
+        return version
+    else:
+        # Strip the '-incubating' suffix, since it prevents the packages
+        # from being uploaded into PyPI
+        return version.split('-')[0]
+
 
+def get_name():
+    postfix = environ.get('NAME_POSTFIX', '')
+    base = 'pulsar-client'
+    return base + postfix
 
 VERSION = get_version()
+NAME = get_name()
+
+print(VERSION)
+print(NAME)
 
 if sys.version_info[0] == 2:
     PY2 = True
@@ -79,7 +95,7 @@ def build_extension(self, ext):
     dependencies += ['enum34']
 
 setup(
-    name="pulsar-client",
+    name=NAME,
     version=VERSION,
     packages=['pulsar', 'pulsar.schema', 'pulsar.functions'],
     cmdclass={'build_ext': my_build_ext},
diff --git a/pulsar-client-cpp/tests/BackoffTest.cc b/pulsar-client-cpp/tests/BackoffTest.cc
index 094548d47539c..8ecf5665a9740 100644
--- a/pulsar-client-cpp/tests/BackoffTest.cc
+++ b/pulsar-client-cpp/tests/BackoffTest.cc
@@ -59,7 +59,7 @@ TEST(BackoffTest, firstBackoffTimerTest) {
     backoff.reset();
     ASSERT_EQ(backoff.next().total_milliseconds(), 100);
     diffBackOffTime = PulsarFriend::getFirstBackoffTime(backoff) - firstBackOffTime;
-    ASSERT_TRUE(diffBackOffTime >= milliseconds(300) && diffBackOffTime < milliseconds(310));
+    ASSERT_TRUE(diffBackOffTime >= milliseconds(300) && diffBackOffTime < seconds(1));
 }
 
 TEST(BackoffTest, basicTest) {
diff --git a/pulsar-client-cpp/tests/BasicEndToEndTest.cc b/pulsar-client-cpp/tests/BasicEndToEndTest.cc
index 54077eaa055dd..0010c963fdcb3 100644
--- a/pulsar-client-cpp/tests/BasicEndToEndTest.cc
+++ b/pulsar-client-cpp/tests/BasicEndToEndTest.cc
@@ -38,6 +38,7 @@
 #include <functional>
 #include <thread>
 #include <chrono>
+#include <cstring>
 
 DECLARE_LOG_OBJECT()
 
@@ -608,6 +609,7 @@ TEST(BasicEndToEndTest, testMessageTooBig) {
 
     int size = Commands::DefaultMaxMessageSize + 1000 * 100;
     char *content = new char[size];
+    memset(content, 0, size);
     Message msg = MessageBuilder().setAllocatedContent(content, size).build();
     result = producer.send(msg);
     ASSERT_EQ(ResultMessageTooBig, result);
@@ -1161,6 +1163,7 @@ TEST(BasicEndToEndTest, testProduceMessageSize) {
 
     int size = Commands::DefaultMaxMessageSize + 1000 * 100;
     char *content = new char[size];
+    memset(content, 0, size);
     Message msg = MessageBuilder().setAllocatedContent(content, size).build();
     result = producer1.send(msg);
     ASSERT_EQ(ResultMessageTooBig, result);
@@ -1212,6 +1215,7 @@ TEST(BasicEndToEndTest, testBigMessageSizeBatching) {
 
     int size = Commands::DefaultMaxMessageSize + 1000 * 100;
     char *content = new char[size];
+    memset(content, 0, size);
     Message msg = MessageBuilder().setAllocatedContent(content, size).build();
     result = producer1.send(msg);
     ASSERT_EQ(ResultMessageTooBig, result);
@@ -2108,9 +2112,12 @@ TEST(BasicEndToEndTest, testPatternEmptyUnsubscribe) {
     ASSERT_EQ(consumer.getSubscriptionName(), subName);
     LOG_INFO("created topics consumer on a pattern that match 0 topics");
 
-    ASSERT_EQ(ResultOk, consumer.unsubscribe());
+    result = consumer.unsubscribe();
+    LOG_INFO("unsubscribed topics consumer : " << result);
+    ASSERT_EQ(ResultOk, result) << "expected " << ResultOk << " but found " << result;
 
-    client.shutdown();
+    // TODO: flaky test
+    // client.shutdown();
 }
 
 // create a pattern consumer, which contains no match topics at beginning.
diff --git a/pulsar-client-cpp/tests/LatchTest.cc b/pulsar-client-cpp/tests/LatchTest.cc
index 9f332fb3a57e2..c69141ef39872 100644
--- a/pulsar-client-cpp/tests/LatchTest.cc
+++ b/pulsar-client-cpp/tests/LatchTest.cc
@@ -66,19 +66,19 @@ TEST(LatchTest, testLatchCount) {
 }
 
 TEST(LatchTest, testTimedWait) {
-    // Wait for 7 seconds which is more than the maximum sleep time (5 seconds)
+    // Wait for at most 3 seconds which is more than the maximum sleep time (50 millis)
     Latch latch1(3);
     Service service1("service1", std::chrono::milliseconds(50), latch1);
     Service service2("service2", std::chrono::milliseconds(30), latch1);
     Service service3("service3", std::chrono::milliseconds(50), latch1);
-    ASSERT_TRUE(latch1.wait(std::chrono::milliseconds(70)));
+    ASSERT_TRUE(latch1.wait(std::chrono::seconds(3)));
 
-    // Wait for 3 seconds which is less than the maximum sleep time (5 seconds)
+    // Wait for up to 300 millis which is less than the maximum sleep time (500 millis)
     Latch latch2(3);
-    Service service4("service4", std::chrono::milliseconds(50), latch2);
-    Service service5("service5", std::chrono::milliseconds(30), latch2);
-    Service service6("service6", std::chrono::milliseconds(50), latch2);
-    ASSERT_FALSE(latch2.wait(std::chrono::milliseconds(30)));
+    Service service4("service4", std::chrono::milliseconds(500), latch2);
+    Service service5("service5", std::chrono::milliseconds(300), latch2);
+    Service service6("service6", std::chrono::milliseconds(500), latch2);
+    ASSERT_FALSE(latch2.wait(std::chrono::milliseconds(300)));
 
     // After the assert is passed and Service is destroyed because of join, the
     // main thread would not exit until service4 thread is returned.
diff --git a/pulsar-client-cpp/tests/MessageTest.cc b/pulsar-client-cpp/tests/MessageTest.cc
index 410bfe1d7e594..246203c3c162a 100644
--- a/pulsar-client-cpp/tests/MessageTest.cc
+++ b/pulsar-client-cpp/tests/MessageTest.cc
@@ -47,8 +47,8 @@ TEST(MessageTest, testMessageContents) {
 TEST(MessageTest, testAllocatedContents) {
     MessageBuilder msgBuilder;
     std::string str = "content";
-    char* content = new char[str.size()];
-    strcpy(content, str.c_str());
+    char* content = new char[str.length() + 1];
+    strncpy(content, str.c_str(), str.length());
     msgBuilder.setAllocatedContent(content, str.length());
     Message msg = msgBuilder.build();
     ASSERT_FALSE(strncmp("content", (char*)msg.getData(), msg.getLength()));
diff --git a/pulsar-client-go/go.mod b/pulsar-client-go/go.mod
index 614cf1438766d..2dd946aaa36d1 100644
--- a/pulsar-client-go/go.mod
+++ b/pulsar-client-go/go.mod
@@ -13,3 +13,5 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/yaml.v2 v2.2.2 // indirect
 )
+
+go 1.13
diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka/src/main/java/org/apache/kafka/clients/producer/PulsarKafkaProducer.java b/pulsar-client-kafka-compat/pulsar-client-kafka/src/main/java/org/apache/kafka/clients/producer/PulsarKafkaProducer.java
index cacca605ff923..13f97b52cfd0c 100644
--- a/pulsar-client-kafka-compat/pulsar-client-kafka/src/main/java/org/apache/kafka/clients/producer/PulsarKafkaProducer.java
+++ b/pulsar-client-kafka-compat/pulsar-client-kafka/src/main/java/org/apache/kafka/clients/producer/PulsarKafkaProducer.java
@@ -168,7 +168,9 @@ private PulsarKafkaProducer(ProducerConfig producerConfig, Schema<K> keySchema,
         // Kafka blocking semantic when blockOnBufferFull=false is different from Pulsar client
         // Pulsar throws error immediately when the queue is full and blockIfQueueFull=false
         // Kafka, on the other hand, still blocks for "max.block.ms" time and then gives error.
-        boolean shouldBlockPulsarProducer = sendTimeoutMillis > 0;
+        Boolean sendTimeOutConfigured = sendTimeoutMillis > 0;
+        boolean shouldBlockPulsarProducer = Boolean.getBoolean(properties
+                .getProperty(PulsarProducerKafkaConfig.BLOCK_IF_PRODUCER_QUEUE_FULL, sendTimeOutConfigured.toString()));
         pulsarProducerBuilder.blockIfQueueFull(shouldBlockPulsarProducer);
 
         interceptors = (List) producerConfig.getConfiguredInstances(
diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka/src/main/java/org/apache/pulsar/client/kafka/compat/PulsarProducerKafkaConfig.java b/pulsar-client-kafka-compat/pulsar-client-kafka/src/main/java/org/apache/pulsar/client/kafka/compat/PulsarProducerKafkaConfig.java
index 5a9a651527c34..7554faf7fd428 100644
--- a/pulsar-client-kafka-compat/pulsar-client-kafka/src/main/java/org/apache/pulsar/client/kafka/compat/PulsarProducerKafkaConfig.java
+++ b/pulsar-client-kafka-compat/pulsar-client-kafka/src/main/java/org/apache/pulsar/client/kafka/compat/PulsarProducerKafkaConfig.java
@@ -22,6 +22,7 @@
 
 import org.apache.pulsar.client.api.ProducerBuilder;
 import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.PulsarClientException.ProducerQueueIsFullError;
 
 public class PulsarProducerKafkaConfig {
 
@@ -33,6 +34,11 @@ public class PulsarProducerKafkaConfig {
     public static final String MAX_PENDING_MESSAGES_ACROSS_PARTITIONS = "pulsar.producer.max.pending.messages.across.partitions";
     public static final String BATCHING_ENABLED = "pulsar.producer.batching.enabled";
     public static final String BATCHING_MAX_MESSAGES = "pulsar.producer.batching.max.messages";
+    /**
+     * send operations will immediately fail with {@link ProducerQueueIsFullError} when there is no space left in
+     * pending queue.
+     **/
+    public static final String BLOCK_IF_PRODUCER_QUEUE_FULL = "pulsar.block.if.producer.queue.full";
 
     public static ProducerBuilder<byte[]> getProducerBuilder(PulsarClient client, Properties properties) {
         ProducerBuilder<byte[]> producerBuilder = client.newProducer();
diff --git a/pulsar-client-kafka-compat/pulsar-client-kafka/src/test/java/org/apache/kafka/clients/producer/PulsarKafkaProducerTest.java b/pulsar-client-kafka-compat/pulsar-client-kafka/src/test/java/org/apache/kafka/clients/producer/PulsarKafkaProducerTest.java
index 21a4f8d1cc354..b1069ad61770f 100644
--- a/pulsar-client-kafka-compat/pulsar-client-kafka/src/test/java/org/apache/kafka/clients/producer/PulsarKafkaProducerTest.java
+++ b/pulsar-client-kafka-compat/pulsar-client-kafka/src/test/java/org/apache/kafka/clients/producer/PulsarKafkaProducerTest.java
@@ -116,11 +116,13 @@ public void testPulsarKafkaProducer() {
         properties.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, Arrays.asList("pulsar://localhost:6650"));
         properties.put(ProducerConfig.CONNECTIONS_MAX_IDLE_MS_CONFIG, "1000000");
         properties.put(ProducerConfig.REQUEST_TIMEOUT_MS_CONFIG, "1000000");
+        properties.put(PulsarProducerKafkaConfig.BLOCK_IF_PRODUCER_QUEUE_FULL, Boolean.FALSE.toString());
 
         new PulsarKafkaProducer<>(properties);
 
         verify(mockClientBuilder, times(1)).keepAliveInterval(1000, TimeUnit.SECONDS);
         verify(mockProducerBuilder, times(1)).sendTimeout(1000000, TimeUnit.MILLISECONDS);
+        verify(mockProducerBuilder, times(1)).blockIfQueueFull(false);
     }
 
     @Test
diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java
index d9bc24888936c..04d833b3ffc74 100644
--- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java
+++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java
@@ -185,6 +185,8 @@ public void testCreateFunction() throws Exception {
             "--tenant", "sample",
             "--namespace", "ns1",
             "--className", DummyFunction.class.getName(),
+            "--dead-letter-topic", "test-dead-letter-topic",
+            "--custom-runtime-options", "custom-runtime-options"
         });
 
         CreateFunction creater = cmd.getCreater();
@@ -192,6 +194,8 @@ public void testCreateFunction() throws Exception {
         assertEquals(inputTopicName, creater.getInputs());
         assertEquals(outputTopicName, creater.getOutput());
         assertEquals(new Boolean(false), creater.getAutoAck());
+        assertEquals("test-dead-letter-topic", creater.getDeadLetterTopic());
+        assertEquals("custom-runtime-options", creater.getCustomRuntimeOptions());
 
         verify(functions, times(1)).createFunction(any(FunctionConfig.class), anyString());
 
diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
index b62e4f473ffde..283c5fe7c12ac 100644
--- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
+++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
@@ -62,7 +62,9 @@
 import org.apache.pulsar.common.policies.data.BundlesData;
 import org.apache.pulsar.common.policies.data.ClusterData;
 import org.apache.pulsar.common.policies.data.DispatchRate;
+import org.apache.pulsar.common.policies.data.DelayedDeliveryPolicies;
 import org.apache.pulsar.common.policies.data.FailureDomain;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.apache.pulsar.common.policies.data.PersistencePolicies;
 import org.apache.pulsar.common.policies.data.Policies;
 import org.apache.pulsar.common.policies.data.PublishRate;
@@ -308,7 +310,7 @@ void namespaces() throws Exception {
         verify(mockNamespaces).unloadNamespaceBundle("myprop/clust/ns1", "0x80000000_0xffffffff");
 
         namespaces.run(split("split-bundle myprop/clust/ns1 -b 0x00000000_0xffffffff"));
-        verify(mockNamespaces).splitNamespaceBundle("myprop/clust/ns1", "0x00000000_0xffffffff", false);
+        verify(mockNamespaces).splitNamespaceBundle("myprop/clust/ns1", "0x00000000_0xffffffff", false, null);
 
         namespaces.run(split("get-backlog-quotas myprop/clust/ns1"));
         verify(mockNamespaces).getBacklogQuotaMap("myprop/clust/ns1");
@@ -375,6 +377,12 @@ void namespaces() throws Exception {
         namespaces.run(split("get-retention myprop/clust/ns1"));
         verify(mockNamespaces).getRetention("myprop/clust/ns1");
 
+        namespaces.run(split("set-delayed-delivery myprop/clust/ns1 -e -t 1s"));
+        verify(mockNamespaces).setDelayedDeliveryMessages("myprop/clust/ns1", new DelayedDeliveryPolicies(1000, true));
+
+        namespaces.run(split("get-delayed-delivery myprop/clust/ns1"));
+        verify(mockNamespaces).getDelayedDelivery("myprop/clust/ns1");
+
         namespaces.run(split("clear-backlog myprop/clust/ns1 -force"));
         verify(mockNamespaces).clearNamespaceBacklog("myprop/clust/ns1");
 
@@ -432,6 +440,18 @@ void namespaces() throws Exception {
         namespaces.run(split("set-max-consumers-per-subscription myprop/clust/ns1 -c 3"));
         verify(mockNamespaces).setMaxConsumersPerSubscription("myprop/clust/ns1", 3);
 
+        namespaces.run(split("get-max-unacked-messages-per-subscription myprop/clust/ns1"));
+        verify(mockNamespaces).getMaxUnackedMessagesPerSubscription("myprop/clust/ns1");
+
+        namespaces.run(split("set-max-unacked-messages-per-subscription myprop/clust/ns1 -c 3"));
+        verify(mockNamespaces).setMaxUnackedMessagesPerSubscription("myprop/clust/ns1", 3);
+
+        namespaces.run(split("get-max-unacked-messages-per-consumer myprop/clust/ns1"));
+        verify(mockNamespaces).getMaxUnackedMessagesPerConsumer("myprop/clust/ns1");
+
+        namespaces.run(split("set-max-unacked-messages-per-consumer myprop/clust/ns1 -c 3"));
+        verify(mockNamespaces).setMaxUnackedMessagesPerConsumer("myprop/clust/ns1", 3);
+
         mockNamespaces = mock(Namespaces.class);
         when(admin.namespaces()).thenReturn(mockNamespaces);
         namespaces = new CmdNamespaces(admin);
@@ -480,6 +500,14 @@ void namespaces() throws Exception {
 
         namespaces.run(split("clear-offload-deletion-lag myprop/clust/ns1"));
         verify(mockNamespaces).clearOffloadDeleteLag("myprop/clust/ns1");
+
+        namespaces.run(split("set-offload-policies myprop/clust/ns1 -r test-region -d aws-s3 -b test-bucket -e http://test.endpoint -mbs 32M -rbs 5M"));
+        verify(mockNamespaces).setOffloadPolicies("myprop/clust/ns1",
+                OffloadPolicies.create("aws-s3", "test-region", "test-bucket",
+                        "http://test.endpoint", 32 * 1024 * 1024, 5 * 1024 * 1024));
+
+        namespaces.run(split("get-offload-policies myprop/clust/ns1"));
+        verify(mockNamespaces).getOffloadPolicies("myprop/clust/ns1");
     }
 
     @Test
@@ -614,7 +642,7 @@ void topics() throws Exception {
         verify(mockTopics).deleteSubscription("persistent://myprop/clust/ns1/ds1", "sub1");
 
         cmdTopics.run(split("stats persistent://myprop/clust/ns1/ds1"));
-        verify(mockTopics).getStats("persistent://myprop/clust/ns1/ds1");
+        verify(mockTopics).getStats("persistent://myprop/clust/ns1/ds1", false);
 
         cmdTopics.run(split("stats-internal persistent://myprop/clust/ns1/ds1"));
         verify(mockTopics).getInternalStats("persistent://myprop/clust/ns1/ds1");
@@ -623,7 +651,7 @@ void topics() throws Exception {
         verify(mockTopics).getInternalInfo("persistent://myprop/clust/ns1/ds1");
 
         cmdTopics.run(split("partitioned-stats persistent://myprop/clust/ns1/ds1 --per-partition"));
-        verify(mockTopics).getPartitionedStats("persistent://myprop/clust/ns1/ds1", true);
+        verify(mockTopics).getPartitionedStats("persistent://myprop/clust/ns1/ds1", true, false);
 
         cmdTopics.run(split("clear-backlog persistent://myprop/clust/ns1/ds1 -s sub1"));
         verify(mockTopics).skipAllMessages("persistent://myprop/clust/ns1/ds1", "sub1");
diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolTest.java
index bac300aebcf74..21b71eb042755 100644
--- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolTest.java
+++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/client/cli/PulsarClientToolTest.java
@@ -29,7 +29,6 @@
 
 import org.apache.pulsar.broker.service.BrokerTestBase;
 import org.apache.pulsar.client.admin.PulsarAdminException;
-import org.apache.pulsar.client.cli.PulsarClientTool;
 import org.apache.pulsar.common.policies.data.TenantInfo;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -60,7 +59,8 @@ public void testInitialzation() throws MalformedURLException, InterruptedExcepti
 
         String tenantName = UUID.randomUUID().toString();
 
-        admin.tenants().createTenant(tenantName, new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant(tenantName, tenantInfo);
 
         String topicName = String.format("persistent://%s/ns/topic-scale-ns-0/topic", tenantName);
 
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
index d305301fd6f4d..bd063d2e54e95 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
@@ -257,6 +257,8 @@ abstract class FunctionDetailsCommand extends BaseCommand {
         protected Boolean DEPRECATED_retainOrdering;
         @Parameter(names = "--retain-ordering", description = "Function consumes and processes messages in order")
         protected Boolean retainOrdering;
+        @Parameter(names = "--forward-source-message-property", description = "Forwarding input message's properties to output topic when processing")
+        protected Boolean forwardSourceMessageProperty = true;
         @Parameter(names = "--subs-name", description = "Pulsar source subscription name if user wants a specific subscription-name for input-topic consumer")
         protected String subsName;
         @Parameter(names = "--parallelism", description = "The parallelism factor of a Pulsar Function (i.e. the number of function instances to run)")
@@ -299,9 +301,9 @@ abstract class FunctionDetailsCommand extends BaseCommand {
         protected Long timeoutMs;
         @Parameter(names = "--max-message-retries", description = "How many times should we try to process a message before giving up")
         protected Integer maxMessageRetries;
-        @Parameter(names = "--dead-letter-topic", description = "The topic where messages that are not processed successfully are sent to")
-        protected String customRuntimeOptions;
         @Parameter(names = "--custom-runtime-options", description = "A string that encodes options to customize the runtime, see docs for configured runtime for details")
+        protected String customRuntimeOptions;
+        @Parameter(names = "--dead-letter-topic", description = "The topic where messages that are not processed successfully are sent to")
         protected String deadLetterTopic;
         protected FunctionConfig functionConfig;
         protected String userCodeFile;
@@ -389,10 +391,14 @@ void processArguments() throws Exception {
                 functionConfig.setProcessingGuarantees(processingGuarantees);
             }
 
-            if (retainOrdering != null) {
+            if (null != retainOrdering) {
                 functionConfig.setRetainOrdering(retainOrdering);
             }
 
+            if (null != forwardSourceMessageProperty) {
+                functionConfig.setForwardSourceMessageProperty(forwardSourceMessageProperty);
+            }
+
             if (isNotBlank(subsName)) {
                 functionConfig.setSubName(subsName);
             }
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java
index 3c56c732033ae..d77b8ec187311 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdNamespaces.java
@@ -22,6 +22,7 @@
 import com.beust.jcommander.ParameterException;
 import com.beust.jcommander.Parameters;
 import com.beust.jcommander.converters.CommaParameterSplitter;
+import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 
@@ -29,9 +30,9 @@
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.pulsar.admin.cli.utils.IOUtils;
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.PulsarAdminException;
@@ -40,6 +41,8 @@
 import org.apache.pulsar.common.policies.data.BookieAffinityGroupData;
 import org.apache.pulsar.common.policies.data.BundlesData;
 import org.apache.pulsar.common.policies.data.DispatchRate;
+import org.apache.pulsar.common.policies.data.DelayedDeliveryPolicies;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.apache.pulsar.common.policies.data.PersistencePolicies;
 import org.apache.pulsar.common.policies.data.Policies;
 import org.apache.pulsar.common.policies.data.PublishRate;
@@ -512,10 +515,15 @@ private class SplitBundle extends CliCommand {
                 "-u" }, description = "Unload newly split bundles after splitting old bundle", required = false)
         private boolean unload;
 
+        @Parameter(names = { "--split-algorithm-name", "-san" }, description = "Algorithm name for split namespace bundle.\n" +
+            " Valid options are: [range_equally_divide, topic_count_equally_divide].\n" +
+            " Use broker side config if absent", required = false)
+        private String splitAlgorithmName;
+
         @Override
         void run() throws PulsarAdminException {
             String namespace = validateNamespace(params);
-            admin.namespaces().splitNamespaceBundle(namespace, bundle, unload);
+            admin.namespaces().splitNamespaceBundle(namespace, bundle, unload, splitAlgorithmName);
         }
     }
 
@@ -883,6 +891,46 @@ void run() throws PulsarAdminException {
         }
     }
 
+    @Parameters(commandDescription = "Get the delayed delivery policy for a namespace")
+    private class GetDelayedDelivery extends CliCommand {
+        @Parameter(description = "tenant/namespace\n", required = true)
+        private java.util.List<String> params;
+
+        @Override
+        void run() throws PulsarAdminException {
+            String namespace = validateNamespace(params);
+            print(admin.namespaces().getDelayedDelivery(namespace));
+        }
+    }
+
+    @Parameters(commandDescription = "Set the delayed delivery policy on a namespace")
+    private class SetDelayedDelivery extends CliCommand {
+        @Parameter(description = "tenant/namespace", required = true)
+        private java.util.List<String> params;
+
+        @Parameter(names = { "--enable", "-e" }, description = "Enable delayed delivery messages")
+        private boolean enable = false;
+
+        @Parameter(names = { "--disable", "-d" }, description = "Disable delayed delivery messages")
+        private boolean disable = false;
+
+        @Parameter(names = { "--time", "-t" }, description = "The tick time for when retrying on delayed delivery messages, " +
+                "affecting the accuracy of the delivery time compared to the scheduled time. (eg: 1s, 10s, 1m, 5h, 3d)")
+        private String delayedDeliveryTimeStr = "1s";
+
+        @Override
+        void run() throws PulsarAdminException {
+            String namespace = validateNamespace(params);
+            long delayedDeliveryTimeInMills = TimeUnit.SECONDS.toMillis(RelativeTimeUtil.parseRelativeTimeInSeconds(delayedDeliveryTimeStr));
+
+            if (enable == disable) {
+                throw new ParameterException("Need to specify either --enable or --disable");
+            }
+
+            admin.namespaces().setDelayedDeliveryMessages(namespace, new DelayedDeliveryPolicies(delayedDeliveryTimeInMills, enable));
+        }
+    }
+
     @Parameters(commandDescription = "Set subscription auth mode on a namespace")
     private class SetSubscriptionAuthMode extends CliCommand {
         @Parameter(description = "tenant/namespace", required = true)
@@ -980,6 +1028,60 @@ void run() throws PulsarAdminException {
         }
     }
 
+    @Parameters(commandDescription = "Get maxUnackedMessagesPerConsumer for a namespace")
+    private class GetMaxUnackedMessagesPerConsumer extends CliCommand {
+        @Parameter(description = "tenant/namespace\n", required = true)
+        private java.util.List<String> params;
+
+        @Override
+        void run() throws PulsarAdminException {
+            String namespace = validateNamespace(params);
+            print(admin.namespaces().getMaxUnackedMessagesPerConsumer(namespace));
+        }
+    }
+
+    @Parameters(commandDescription = "Set maxUnackedMessagesPerConsumer for a namespace")
+    private class SetMaxUnackedMessagesPerConsumer extends CliCommand {
+        @Parameter(description = "tenant/namespace", required = true)
+        private java.util.List<String> params;
+
+        @Parameter(names = { "--max-unacked-messages-per-topic", "-c" }, description = "maxUnackedMessagesPerConsumer for a namespace", required = true)
+        private int maxUnackedMessagesPerConsumer;
+
+        @Override
+        void run() throws PulsarAdminException {
+            String namespace = validateNamespace(params);
+            admin.namespaces().setMaxUnackedMessagesPerConsumer(namespace, maxUnackedMessagesPerConsumer);
+        }
+    }
+
+    @Parameters(commandDescription = "Get maxUnackedMessagesPerSubscription for a namespace")
+    private class GetMaxUnackedMessagesPerSubscription extends CliCommand {
+        @Parameter(description = "tenant/namespace\n", required = true)
+        private java.util.List<String> params;
+
+        @Override
+        void run() throws PulsarAdminException {
+            String namespace = validateNamespace(params);
+            print(admin.namespaces().getMaxUnackedMessagesPerSubscription(namespace));
+        }
+    }
+
+    @Parameters(commandDescription = "Set maxUnackedMessagesPerSubscription for a namespace")
+    private class SetMaxUnackedMessagesPerSubscription extends CliCommand {
+        @Parameter(description = "tenant/namespace", required = true)
+        private java.util.List<String> params;
+
+        @Parameter(names = { "--max-unacked-messages-per-subscription", "-c" }, description = "maxUnackedMessagesPerSubscription for a namespace", required = true)
+        private int maxUnackedMessagesPerSubscription;
+
+        @Override
+        void run() throws PulsarAdminException {
+            String namespace = validateNamespace(params);
+            admin.namespaces().setMaxUnackedMessagesPerSubscription(namespace, maxUnackedMessagesPerSubscription);
+        }
+    }
+
     @Parameters(commandDescription = "Get compactionThreshold for a namespace")
     private class GetCompactionThreshold extends CliCommand {
         @Parameter(description = "tenant/namespace\n", required = true)
@@ -1246,6 +1348,129 @@ void run() throws PulsarAdminException {
         }
     }
 
+    @Parameters(commandDescription = "Set the offload policies for a namespace")
+    private class SetOffloadPolicies extends CliCommand {
+        @Parameter(description = "tenant/namespace", required = true)
+        private java.util.List<String> params;
+
+        @Parameter(
+                names = {"--driver", "-d"},
+                description = "Driver to use to offload old data to long term storage, " +
+                        "(Possible values: S3, aws-s3, google-cloud-storage)",
+                required = true)
+        private String driver;
+
+        @Parameter(
+                names = {"--region", "-r"},
+                description = "The long term storage region, " +
+                        "default is s3ManagedLedgerOffloadRegion or gcsManagedLedgerOffloadRegion in broker.conf",
+                required = false)
+        private String region;
+
+        @Parameter(
+                names = {"--bucket", "-b"},
+                description = "Bucket to place offloaded ledger into",
+                required = true)
+        private String bucket;
+
+        @Parameter(
+                names = {"--endpoint", "-e"},
+                description = "Alternative endpoint to connect to, " +
+                        "s3 default is s3ManagedLedgerOffloadServiceEndpoint in broker.conf",
+                required = false)
+        private String endpoint;
+
+        @Parameter(
+                names = {"--maxBlockSize", "-mbs"},
+                description = "Max block size (eg: 32M, 64M), default is 64MB",
+                required = false)
+        private String maxBlockSizeStr;
+
+        @Parameter(
+                names = {"--readBufferSize", "-rbs"},
+                description = "Read buffer size (eg: 1M, 5M), default is 1MB",
+                required = false)
+        private String readBufferSizeStr;
+
+        private final String[] DRIVER_NAMES = {"S3", "aws-s3", "google-cloud-storage"};
+
+        public boolean driverSupported(String driver) {
+            return Arrays.stream(DRIVER_NAMES).anyMatch(d -> d.equalsIgnoreCase(driver));
+        }
+
+        public boolean isS3Driver(String driver) {
+            if (StringUtils.isEmpty(driver)) {
+                return false;
+            }
+            return driver.equalsIgnoreCase(DRIVER_NAMES[0]) || driver.equalsIgnoreCase(DRIVER_NAMES[1]);
+        }
+
+        public boolean positiveCheck(String paramName, long value) {
+            if (value <= 0) {
+                throw new ParameterException(paramName + " is not be negative or 0!");
+            }
+            return true;
+        }
+
+        public boolean maxValueCheck(String paramName, long value, long maxValue) {
+            if (value > maxValue) {
+                throw new ParameterException(paramName + " is not bigger than " + maxValue + "!");
+            }
+            return true;
+        }
+
+        @Override
+        void run() throws PulsarAdminException {
+            String namespace = validateNamespace(params);
+
+            if (!driverSupported(driver)) {
+                throw new ParameterException(
+                        "The driver " + driver + " is not supported, " +
+                                "(Possible values: S3, aws-s3, google-cloud-storage).");
+            }
+
+            if (isS3Driver(driver) && Strings.isNullOrEmpty(region) && Strings.isNullOrEmpty(endpoint)) {
+                throw new ParameterException(
+                        "Either s3ManagedLedgerOffloadRegion or s3ManagedLedgerOffloadServiceEndpoint must be set"
+                                + " if s3 offload enabled");
+            }
+
+            int maxBlockSizeInBytes = OffloadPolicies.DEFAULT_MAX_BLOCK_SIZE_IN_BYTES;
+            if (StringUtils.isNotEmpty(maxBlockSizeStr)) {
+                long maxBlockSize = validateSizeString(maxBlockSizeStr);
+                if (positiveCheck("MaxBlockSize", maxBlockSize)
+                        && maxValueCheck("MaxBlockSize", maxBlockSize, Integer.MAX_VALUE)) {
+                    maxBlockSizeInBytes = new Long(maxBlockSize).intValue();
+                }
+            }
+
+            int readBufferSizeInBytes = OffloadPolicies.DEFAULT_READ_BUFFER_SIZE_IN_BYTES;
+            if (StringUtils.isNotEmpty(readBufferSizeStr) ) {
+                long readBufferSize = validateSizeString(readBufferSizeStr);
+                if (positiveCheck("ReadBufferSize", readBufferSize)
+                        && maxValueCheck("ReadBufferSize", readBufferSize, Integer.MAX_VALUE)) {
+                    readBufferSizeInBytes = new Long(readBufferSize).intValue();
+                }
+            }
+
+            OffloadPolicies offloadPolicies = OffloadPolicies.create(driver, region, bucket, endpoint,
+                    maxBlockSizeInBytes, readBufferSizeInBytes);
+            admin.namespaces().setOffloadPolicies(namespace, offloadPolicies);
+        }
+    }
+
+    @Parameters(commandDescription = "Get the offload policies for a namespace")
+    private class GetOffloadPolicies extends CliCommand {
+        @Parameter(description = "tenant/namespace\n", required = true)
+        private java.util.List<String> params;
+
+        @Override
+        void run() throws PulsarAdminException {
+            String namespace = validateNamespace(params);
+            print(admin.namespaces().getOffloadPolicies(namespace));
+        }
+    }
+
     public CmdNamespaces(PulsarAdmin admin) {
         super("namespaces", admin);
         jcommander.addCommand("list", new GetNamespacesPerProperty());
@@ -1317,12 +1542,19 @@ public CmdNamespaces(PulsarAdmin admin) {
         jcommander.addCommand("set-encryption-required", new SetEncryptionRequired());
         jcommander.addCommand("set-subscription-auth-mode", new SetSubscriptionAuthMode());
 
+        jcommander.addCommand("set-delayed-delivery", new SetDelayedDelivery());
+        jcommander.addCommand("get-delayed-delivery", new GetDelayedDelivery());
+
         jcommander.addCommand("get-max-producers-per-topic", new GetMaxProducersPerTopic());
         jcommander.addCommand("set-max-producers-per-topic", new SetMaxProducersPerTopic());
         jcommander.addCommand("get-max-consumers-per-topic", new GetMaxConsumersPerTopic());
         jcommander.addCommand("set-max-consumers-per-topic", new SetMaxConsumersPerTopic());
         jcommander.addCommand("get-max-consumers-per-subscription", new GetMaxConsumersPerSubscription());
         jcommander.addCommand("set-max-consumers-per-subscription", new SetMaxConsumersPerSubscription());
+        jcommander.addCommand("get-max-unacked-messages-per-subscription", new GetMaxUnackedMessagesPerSubscription());
+        jcommander.addCommand("set-max-unacked-messages-per-subscription", new SetMaxUnackedMessagesPerSubscription());
+        jcommander.addCommand("get-max-unacked-messages-per-consumer", new GetMaxUnackedMessagesPerConsumer());
+        jcommander.addCommand("set-max-unacked-messages-per-consumer", new SetMaxUnackedMessagesPerConsumer());
 
         jcommander.addCommand("get-compaction-threshold", new GetCompactionThreshold());
         jcommander.addCommand("set-compaction-threshold", new SetCompactionThreshold());
@@ -1345,5 +1577,8 @@ public CmdNamespaces(PulsarAdmin admin) {
 
         jcommander.addCommand("get-schema-validation-enforce", new GetSchemaValidationEnforced());
         jcommander.addCommand("set-schema-validation-enforce", new SetSchemaValidationEnforced());
+
+        jcommander.addCommand("set-offload-policies", new SetOffloadPolicies());
+        jcommander.addCommand("get-offload-policies", new GetOffloadPolicies());
     }
 }
diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java
index af5aa02e7a2a3..f5954cf38bac4 100644
--- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java
+++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdTopics.java
@@ -370,10 +370,14 @@ private class GetStats extends CliCommand {
         @Parameter(description = "persistent://tenant/namespace/topic\n", required = true)
         private java.util.List<String> params;
 
+        @Parameter(names = { "-gpb",
+            "--get-precise-backlog" }, description = "Set true to get precise backlog")
+        private boolean getPreciseBacklog = false;
+
         @Override
         void run() throws PulsarAdminException {
             String topic = validateTopicName(params);
-            print(topics.getStats(topic));
+            print(topics.getStats(topic, getPreciseBacklog));
         }
     }
 
@@ -412,10 +416,14 @@ private class GetPartitionedStats extends CliCommand {
         @Parameter(names = "--per-partition", description = "Get per partition stats")
         private boolean perPartition = false;
 
+        @Parameter(names = { "-gpb",
+            "--get-precise-backlog" }, description = "Set true to get precise backlog")
+        private boolean getPreciseBacklog = false;
+
         @Override
         void run() throws Exception {
             String topic = validateTopicName(params);
-            print(topics.getPartitionedStats(topic, perPartition));
+            print(topics.getPartitionedStats(topic, perPartition, getPreciseBacklog));
         }
     }
 
diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml
index e3eab8b3cb649..dca5f4f81987d 100644
--- a/pulsar-client/pom.xml
+++ b/pulsar-client/pom.xml
@@ -151,6 +151,13 @@
       <version>${project.parent.version}</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.skyscreamer</groupId>
+      <artifactId>jsonassert</artifactId>
+      <version>${skyscreamer.version}</version>
+      <scope>test</scope>
+    </dependency> 
   </dependencies>
 
   <build>
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerImpl.java
index d4772cef1b388..bcbd1c351f177 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageContainerImpl.java
@@ -69,6 +69,7 @@ public boolean add(MessageImpl<?> msg, SendCallback callback) {
         if (++numMessagesInBatch == 1) {
             // some properties are common amongst the different messages in the batch, hence we just pick it up from
             // the first message
+            messageMetadata.setSequenceId(msg.getSequenceId());
             lowestSequenceId = Commands.initBatchMessageMetadata(messageMetadata, msg.getMessageBuilder());
             this.firstCallback = callback;
             batchedMessageMetadataAndPayload = PulsarByteBufAllocator.DEFAULT
@@ -87,7 +88,7 @@ public boolean add(MessageImpl<?> msg, SendCallback callback) {
             messageMetadata.setSequenceId(lowestSequenceId);
         }
         highestSequenceId = msg.getSequenceId();
-        producer.lastSequenceIdPushed = msg.getSequenceId();
+        producer.lastSequenceIdPushed = Math.max(producer.lastSequenceIdPushed, msg.getSequenceId());
 
         return isBatchFull();
     }
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageIdImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageIdImpl.java
index d66e242feb4e0..2bf892884bc45 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageIdImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/BatchMessageIdImpl.java
@@ -27,7 +27,7 @@ public class BatchMessageIdImpl extends MessageIdImpl {
     private final static int NO_BATCH = -1;
     private final int batchIndex;
 
-    private final BatchMessageAcker acker;
+    private final transient BatchMessageAcker acker;
 
     public BatchMessageIdImpl(long ledgerId, long entryId, int partitionIndex, int batchIndex) {
         this(ledgerId, entryId, partitionIndex, batchIndex, BatchMessageAckerDisabled.INSTANCE);
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
index e0bba366bb655..dfa60e8294df5 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ClientCnx.java
@@ -336,7 +336,10 @@ protected void handleAuthChallenge(CommandAuthChallenge authChallenge) {
                     connectionFuture.completeExceptionally(writeFuture.cause());
                 }
             });
-            state = State.Connecting;
+
+            if (state == State.SentConnectFrame) {
+                state = State.Connecting;
+            }
         } catch (Exception e) {
             log.error("{} Error mutual verify: {}", ctx.channel(), e);
             connectionFuture.completeExceptionally(e);
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBuilderImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBuilderImpl.java
index f7848b6688cb9..872abb7b24f43 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBuilderImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerBuilderImpl.java
@@ -278,7 +278,15 @@ public ConsumerBuilder<T> readCompacted(boolean readCompacted) {
     @Override
     public ConsumerBuilder<T> patternAutoDiscoveryPeriod(int periodInMinutes) {
         checkArgument(periodInMinutes >= 0, "periodInMinutes needs to be >= 0");
-        conf.setPatternAutoDiscoveryPeriod(periodInMinutes);
+        patternAutoDiscoveryPeriod(periodInMinutes, TimeUnit.MINUTES);
+        return this;
+    }
+
+    @Override
+    public ConsumerBuilder<T> patternAutoDiscoveryPeriod(int interval, TimeUnit unit) {
+        checkArgument(interval >= 0, "interval needs to be >= 0");
+        int intervalSeconds = (int) unit.toSeconds(interval);
+        conf.setPatternAutoDiscoveryPeriod(intervalSeconds);
         return this;
     }
 
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
index 33f05192aee33..919a280238676 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
@@ -1142,7 +1142,7 @@ void increaseAvailablePermits(ClientCnx currentCnx) {
         increaseAvailablePermits(currentCnx, 1);
     }
 
-    private void increaseAvailablePermits(ClientCnx currentCnx, int delta) {
+    protected void increaseAvailablePermits(ClientCnx currentCnx, int delta) {
         int available = AVAILABLE_PERMITS_UPDATER.addAndGet(this, delta);
 
         while (available >= receiverQueueRefillThreshold && !paused) {
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HttpLookupService.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HttpLookupService.java
index 6a0746c8af327..5bc3bcd135fd1 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HttpLookupService.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/HttpLookupService.java
@@ -24,6 +24,7 @@
 
 import java.net.InetSocketAddress;
 import java.net.URI;
+import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Base64;
 import java.util.List;
@@ -46,9 +47,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.yahoo.sketches.Util.bytesToLong;
-
-class HttpLookupService implements LookupService {
+public class HttpLookupService implements LookupService {
 
     private final HttpClient httpClient;
     private final boolean useTls;
@@ -152,7 +151,7 @@ public CompletableFuture<Optional<SchemaInfo>> getSchema(TopicName topicName, by
         if (version != null) {
             path = String.format("admin/v2/schemas/%s/schema/%s",
                     schemaName,
-                    bytesToLong(version));
+                    ByteBuffer.wrap(version).getLong());
         }
         httpClient.get(path, GetSchemaResponse.class).thenAccept(response -> {
             future.complete(Optional.of(SchemaInfoUtil.newSchemaInfo(schemaName, response)));
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PatternMultiTopicsConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PatternMultiTopicsConsumerImpl.java
index 0941a5804721c..347583088f097 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PatternMultiTopicsConsumerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/PatternMultiTopicsConsumerImpl.java
@@ -46,7 +46,7 @@ public class PatternMultiTopicsConsumerImpl<T> extends MultiTopicsConsumerImpl<T
     private final Pattern topicsPattern;
     private final TopicsChangedListener topicsChangeListener;
     private final Mode subscriptionMode;
-    private volatile Timeout recheckPatternTimeout = null;
+    private volatile Timeout recheckPatternTimeout;
 
     public PatternMultiTopicsConsumerImpl(Pattern topicsPattern,
                                           PulsarClientImpl client,
@@ -65,7 +65,7 @@ public PatternMultiTopicsConsumerImpl(Pattern topicsPattern,
         checkArgument(getNameSpaceFromPattern(topicsPattern).toString().equals(this.namespaceName.toString()));
 
         this.topicsChangeListener = new PatternTopicsChangedListener();
-        recheckPatternTimeout = client.timer().newTimeout(this, Math.min(1, conf.getPatternAutoDiscoveryPeriod()), TimeUnit.MINUTES);
+        this.recheckPatternTimeout = client.timer().newTimeout(this, Math.max(1, conf.getPatternAutoDiscoveryPeriod()), TimeUnit.SECONDS);
     }
 
     public static NamespaceName getNameSpaceFromPattern(Pattern pattern) {
@@ -104,8 +104,8 @@ public void run(Timeout timeout) throws Exception {
         });
 
         // schedule the next re-check task
-        recheckPatternTimeout = client.timer().newTimeout(PatternMultiTopicsConsumerImpl.this,
-            Math.min(1, conf.getPatternAutoDiscoveryPeriod()), TimeUnit.MINUTES);
+        this.recheckPatternTimeout = client.timer().newTimeout(PatternMultiTopicsConsumerImpl.this,
+            Math.max(1, conf.getPatternAutoDiscoveryPeriod()), TimeUnit.SECONDS);
     }
 
     public Pattern getPattern() {
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
index 7805fa8ddfb17..776300deaec0a 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ProducerImpl.java
@@ -70,7 +70,6 @@
 import org.apache.pulsar.common.api.proto.PulsarApi.ProtocolVersion;
 import org.apache.pulsar.common.compression.CompressionCodec;
 import org.apache.pulsar.common.compression.CompressionCodecProvider;
-import org.apache.pulsar.common.naming.TopicName;
 import org.apache.pulsar.common.protocol.ByteBufPair;
 import org.apache.pulsar.common.protocol.Commands;
 import org.apache.pulsar.common.protocol.Commands.ChecksumType;
@@ -114,6 +113,7 @@ public class ProducerImpl<T> extends ProducerBase<T> implements TimerTask, Conne
 
     private volatile long lastSequenceIdPublished;
     protected volatile long lastSequenceIdPushed;
+    private volatile boolean isLastSequenceIdPotentialDuplicated;
 
     private MessageCrypto msgCrypto = null;
 
@@ -397,6 +397,7 @@ public void sendAsync(Message<?> message, SendCallback callback) {
                         // should trigger complete the batch message, new message will add to a new batch and new batch
                         // sequence id use the new message, so that broker can handle the message duplication
                         if (sequenceId <= lastSequenceIdPushed) {
+                            isLastSequenceIdPotentialDuplicated = true;
                             if (sequenceId <= lastSequenceIdPublished) {
                                 log.warn("Message with sequence id {} is definitely a duplicate", sequenceId);
                             } else {
@@ -405,14 +406,21 @@ public void sendAsync(Message<?> message, SendCallback callback) {
                             }
                             doBatchSendAndAdd(msg, callback, payload);
                         } else {
-                            // handle boundary cases where message being added would exceed
-                            // batch size and/or max message size
-                            boolean isBatchFull = batchMessageContainer.add(msg, callback);
-                            lastSendFuture = callback.getFuture();
-                            payload.release();
-                            if (isBatchFull) {
-                                batchMessageAndSend();
+                            // Should flush the last potential duplicated since can't combine potential duplicated messages
+                            // and non-duplicated messages into a batch.
+                            if (isLastSequenceIdPotentialDuplicated) {
+                                doBatchSendAndAdd(msg, callback, payload);
+                            } else {
+                                // handle boundary cases where message being added would exceed
+                                // batch size and/or max message size
+                                boolean isBatchFull = batchMessageContainer.add(msg, callback);
+                                lastSendFuture = callback.getFuture();
+                                payload.release();
+                                if (isBatchFull) {
+                                    batchMessageAndSend();
+                                }
                             }
+                            isLastSequenceIdPotentialDuplicated = false;
                         }
                     } else {
                         doBatchSendAndAdd(msg, callback, payload);
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ZeroQueueConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ZeroQueueConsumerImpl.java
index f7f402faf9744..b9249828bc1b1 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ZeroQueueConsumerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ZeroQueueConsumerImpl.java
@@ -45,6 +45,7 @@ public class ZeroQueueConsumerImpl<T> extends ConsumerImpl<T> {
     private final Lock zeroQueueLock = new ReentrantLock();
 
     private volatile boolean waitingOnReceiveForZeroQueueSize = false;
+    private volatile boolean waitingOnListenerForZeroQueueSize = false;
 
     public ZeroQueueConsumerImpl(PulsarClientImpl client, String topic, ConsumerConfigurationData<T> conf,
             ExecutorService listenerExecutor, int partitionIndex, boolean hasParentConsumer, CompletableFuture<Consumer<T>> subscribeFuture,
@@ -131,7 +132,7 @@ protected void consumerIsReconnectedToBroker(ClientCnx cnx, int currentQueueSize
         // or queue was not empty: send a flow command
         if (waitingOnReceiveForZeroQueueSize
                 || currentQueueSize > 0
-                || listener != null) {
+                || (listener != null && !waitingOnListenerForZeroQueueSize)) {
             sendFlowPermitsToBroker(cnx, 1);
         }
     }
@@ -157,6 +158,7 @@ private void triggerZeroQueueSizeListener(final Message<T> message) {
                     log.debug("[{}][{}] Calling message listener for unqueued message {}", topic, subscription,
                             message.getMessageId());
                 }
+                waitingOnListenerForZeroQueueSize = true;
                 trackMessage(message);
                 listener.received(ZeroQueueConsumerImpl.this, beforeConsume(message));
             } catch (Throwable t) {
@@ -164,6 +166,7 @@ private void triggerZeroQueueSizeListener(final Message<T> message) {
                         message.getMessageId(), t);
             }
             increaseAvailablePermits(cnx());
+            waitingOnListenerForZeroQueueSize = false;
         });
     }
 
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ConsumerConfigurationData.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ConsumerConfigurationData.java
index 823ca9e9e9384..6195b5f720844 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ConsumerConfigurationData.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/conf/ConsumerConfigurationData.java
@@ -92,7 +92,7 @@ public class ConsumerConfigurationData<T> implements Serializable, Cloneable {
 
     private SubscriptionInitialPosition subscriptionInitialPosition = SubscriptionInitialPosition.Latest;
 
-    private int patternAutoDiscoveryPeriod = 1;
+    private int patternAutoDiscoveryPeriod = 60;
 
     private RegexSubscriptionMode regexSubscriptionMode = RegexSubscriptionMode.PersistentOnly;
 
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java
index 3476c5a11ea2a..5620eb7f63a83 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ConsumerBuilderImplTest.java
@@ -237,10 +237,15 @@ public void testConsumerBuilderImplWhenMaxTotalReceiverQueueSizeAcrossPartitions
     }
 
     @Test(expectedExceptions = IllegalArgumentException.class)
-    public void testConsumerBuilderImplWhenPatternAutoDiscoveryPeriodPropertyIsNegative() {
+    public void testConsumerBuilderImplWhenPatternAutoDiscoveryPeriodPeriodInMinutesIsNegative() {
         consumerBuilderImpl.patternAutoDiscoveryPeriod(-1);
     }
 
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testConsumerBuilderImplWhenPatternAutoDiscoveryPeriodPeriodIsNegative() {
+        consumerBuilderImpl.patternAutoDiscoveryPeriod(-1, TimeUnit.MINUTES);
+    }
+
     @Test(expectedExceptions = IllegalArgumentException.class)
     public void testConsumerBuilderImplWhenBatchReceivePolicyIsNull() {
         consumerBuilderImpl.batchReceivePolicy(null);
@@ -261,6 +266,7 @@ public void testConsumerBuilderImplWhenNumericPropertiesAreValid() {
         consumerBuilderImpl.priorityLevel(1);
         consumerBuilderImpl.maxTotalReceiverQueueSizeAcrossPartitions(1);
         consumerBuilderImpl.patternAutoDiscoveryPeriod(1);
+        consumerBuilderImpl.patternAutoDiscoveryPeriod(1, TimeUnit.SECONDS);
     }
 
 }
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AvroSchemaTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AvroSchemaTest.java
index caeb8ac8393a6..0aa45aff4356b 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AvroSchemaTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/AvroSchemaTest.java
@@ -53,6 +53,8 @@
 import org.apache.pulsar.client.impl.schema.SchemaTestUtils.Foo;
 import org.apache.pulsar.common.schema.SchemaInfo;
 import org.apache.pulsar.common.schema.SchemaType;
+import org.json.JSONException;
+import org.skyscreamer.jsonassert.JSONAssert;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -142,13 +144,17 @@ public void testSchemaDefinition() throws SchemaValidationException {
         }
     }
 
+    public void assertJSONEquals(String s1, String s2) throws JSONException {
+        JSONAssert.assertEquals(s1, s2, false);
+    }
+
     @Test
-    public void testNotAllowNullSchema() {
+    public void testNotAllowNullSchema() throws JSONException {
         AvroSchema<Foo> avroSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).withAlwaysAllowNull(false).build());
         assertEquals(avroSchema.getSchemaInfo().getType(), SchemaType.AVRO);
         Schema.Parser parser = new Schema.Parser();
         String schemaJson = new String(avroSchema.getSchemaInfo().getSchema());
-        assertEquals(schemaJson, SCHEMA_AVRO_NOT_ALLOW_NULL);
+        assertJSONEquals(schemaJson, SCHEMA_AVRO_NOT_ALLOW_NULL);
         Schema schema = parser.parse(schemaJson);
 
         for (String fieldName : FOO_FIELDS) {
@@ -165,13 +171,13 @@ public void testNotAllowNullSchema() {
     }
 
     @Test
-    public void testAllowNullSchema() {
+    public void testAllowNullSchema() throws JSONException {
         AvroSchema<Foo> avroSchema = AvroSchema.of(SchemaDefinition.<Foo>builder().withPojo(Foo.class).build());
         assertEquals(avroSchema.getSchemaInfo().getType(), SchemaType.AVRO);
         Schema.Parser parser = new Schema.Parser();
         parser.setValidateDefaults(false);
         String schemaJson = new String(avroSchema.getSchemaInfo().getSchema());
-        assertEquals(schemaJson, SCHEMA_AVRO_ALLOW_NULL);
+        assertJSONEquals(schemaJson, SCHEMA_AVRO_ALLOW_NULL);
         Schema schema = parser.parse(schemaJson);
 
         for (String fieldName : FOO_FIELDS) {
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaBuilderTest.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaBuilderTest.java
index 72e9eafe6b226..bd887629ee922 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaBuilderTest.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaBuilderTest.java
@@ -22,8 +22,6 @@
 import static org.testng.Assert.assertEquals;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.apache.avro.reflect.Nullable;
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.client.api.schema.*;
@@ -60,8 +58,6 @@ private static class AllPrimitiveFields {
     }
 
     @Data
-    @ToString
-    @EqualsAndHashCode
     private static class People {
         private People1 people1;
         private People2 people2;
diff --git a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaTestUtils.java b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaTestUtils.java
index 478dc10e2bdc1..f78b858055404 100644
--- a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaTestUtils.java
+++ b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SchemaTestUtils.java
@@ -22,7 +22,6 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.apache.avro.reflect.AvroDefault;
 import org.apache.avro.reflect.Nullable;
 
@@ -32,8 +31,6 @@
 public class SchemaTestUtils {
 
     @Data
-    @ToString
-    @EqualsAndHashCode
     public static class Foo {
         @Nullable
         private String field1;
@@ -47,9 +44,8 @@ public static class Foo {
         @AvroDefault("\"defaultValue\"")
         private String fieldUnableNull;
     }
+
     @Data
-    @ToString
-    @EqualsAndHashCode
     public static class FooV2 {
         @Nullable
         private String field1;
@@ -57,31 +53,24 @@ public static class FooV2 {
     }
 
     @Data
-    @ToString
-    @EqualsAndHashCode
     public static class Bar {
         private boolean field1;
     }
 
     @Data
-    @ToString
-    @EqualsAndHashCode
     public static class NestedBar {
         private boolean field1;
         private Bar nested;
     }
 
     @Data
-    @ToString
-    @EqualsAndHashCode
     public static class NestedBarList {
         private boolean field1;
         private List<Bar> list;
     }
 
     @Data
-    @ToString
-    @EqualsAndHashCode
+    @EqualsAndHashCode(callSuper = false)
     public static class DerivedFoo extends Foo {
         private String field5;
         private int field6;
@@ -94,8 +83,7 @@ public enum  Color {
     }
 
     @Data
-    @ToString
-    @EqualsAndHashCode
+    @EqualsAndHashCode(callSuper = false)
     public static class DerivedDerivedFoo extends DerivedFoo {
         private String field7;
         private int field8;
diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml
index e2c2225f34506..a9cb2e2fdbbd3 100644
--- a/pulsar-common/pom.xml
+++ b/pulsar-common/pom.xml
@@ -81,11 +81,13 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-transport-native-epoll</artifactId>
+      <classifier>linux-x86_64</classifier>
     </dependency>
 
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-transport-native-unix-common</artifactId>
+      <classifier>linux-x86_64</classifier>
     </dependency>
 
     <dependency>
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/api/proto/PulsarApi.java b/pulsar-common/src/main/java/org/apache/pulsar/common/api/proto/PulsarApi.java
index 1e9ffd608fa6d..e282ddc1b2fe7 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/api/proto/PulsarApi.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/api/proto/PulsarApi.java
@@ -6374,6 +6374,10 @@ public interface CommandConnectOrBuilder
     // optional string original_auth_method = 9;
     boolean hasOriginalAuthMethod();
     String getOriginalAuthMethod();
+    
+    // optional .pulsar.proto.FeatureFlags feature_flags = 10;
+    boolean hasFeatureFlags();
+    org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags getFeatureFlags();
   }
   public static final class CommandConnect extends
       org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessageLite
@@ -6632,6 +6636,16 @@ private org.apache.pulsar.shaded.com.google.protobuf.v241.ByteString getOriginal
       }
     }
     
+    // optional .pulsar.proto.FeatureFlags feature_flags = 10;
+    public static final int FEATURE_FLAGS_FIELD_NUMBER = 10;
+    private org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags featureFlags_;
+    public boolean hasFeatureFlags() {
+      return ((bitField0_ & 0x00000200) == 0x00000200);
+    }
+    public org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags getFeatureFlags() {
+      return featureFlags_;
+    }
+    
     private void initFields() {
       clientVersion_ = "";
       authMethod_ = org.apache.pulsar.common.api.proto.PulsarApi.AuthMethod.AuthMethodNone;
@@ -6642,6 +6656,7 @@ private void initFields() {
       originalPrincipal_ = "";
       originalAuthData_ = "";
       originalAuthMethod_ = "";
+      featureFlags_ = org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -6691,6 +6706,9 @@ public void writeTo(org.apache.pulsar.common.util.protobuf.ByteBufCodedOutputStr
       if (((bitField0_ & 0x00000100) == 0x00000100)) {
         output.writeBytes(9, getOriginalAuthMethodBytes());
       }
+      if (((bitField0_ & 0x00000200) == 0x00000200)) {
+        output.writeMessage(10, featureFlags_);
+      }
     }
     
     private int memoizedSerializedSize = -1;
@@ -6735,6 +6753,10 @@ public int getSerializedSize() {
         size += org.apache.pulsar.shaded.com.google.protobuf.v241.CodedOutputStream
           .computeBytesSize(9, getOriginalAuthMethodBytes());
       }
+      if (((bitField0_ & 0x00000200) == 0x00000200)) {
+        size += org.apache.pulsar.shaded.com.google.protobuf.v241.CodedOutputStream
+          .computeMessageSize(10, featureFlags_);
+      }
       memoizedSerializedSize = size;
       return size;
     }
@@ -6866,6 +6888,8 @@ public Builder clear() {
         bitField0_ = (bitField0_ & ~0x00000080);
         originalAuthMethod_ = "";
         bitField0_ = (bitField0_ & ~0x00000100);
+        featureFlags_ = org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags.getDefaultInstance();
+        bitField0_ = (bitField0_ & ~0x00000200);
         return this;
       }
       
@@ -6935,6 +6959,10 @@ public org.apache.pulsar.common.api.proto.PulsarApi.CommandConnect buildPartial(
           to_bitField0_ |= 0x00000100;
         }
         result.originalAuthMethod_ = originalAuthMethod_;
+        if (((from_bitField0_ & 0x00000200) == 0x00000200)) {
+          to_bitField0_ |= 0x00000200;
+        }
+        result.featureFlags_ = featureFlags_;
         result.bitField0_ = to_bitField0_;
         return result;
       }
@@ -6968,6 +6996,9 @@ public Builder mergeFrom(org.apache.pulsar.common.api.proto.PulsarApi.CommandCon
         if (other.hasOriginalAuthMethod()) {
           setOriginalAuthMethod(other.getOriginalAuthMethod());
         }
+        if (other.hasFeatureFlags()) {
+          mergeFeatureFlags(other.getFeatureFlags());
+        }
         return this;
       }
       
@@ -7050,6 +7081,16 @@ public Builder mergeFrom(
               originalAuthMethod_ = input.readBytes();
               break;
             }
+            case 82: {
+              org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags.Builder subBuilder = org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags.newBuilder();
+              if (hasFeatureFlags()) {
+                subBuilder.mergeFrom(getFeatureFlags());
+              }
+              input.readMessage(subBuilder, extensionRegistry);
+              setFeatureFlags(subBuilder.buildPartial());
+              subBuilder.recycle();
+              break;
+            }
           }
         }
       }
@@ -7341,6 +7382,49 @@ void setOriginalAuthMethod(org.apache.pulsar.shaded.com.google.protobuf.v241.Byt
         
       }
       
+      // optional .pulsar.proto.FeatureFlags feature_flags = 10;
+      private org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags featureFlags_ = org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags.getDefaultInstance();
+      public boolean hasFeatureFlags() {
+        return ((bitField0_ & 0x00000200) == 0x00000200);
+      }
+      public org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags getFeatureFlags() {
+        return featureFlags_;
+      }
+      public Builder setFeatureFlags(org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        featureFlags_ = value;
+        
+        bitField0_ |= 0x00000200;
+        return this;
+      }
+      public Builder setFeatureFlags(
+          org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags.Builder builderForValue) {
+        featureFlags_ = builderForValue.build();
+        
+        bitField0_ |= 0x00000200;
+        return this;
+      }
+      public Builder mergeFeatureFlags(org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags value) {
+        if (((bitField0_ & 0x00000200) == 0x00000200) &&
+            featureFlags_ != org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags.getDefaultInstance()) {
+          featureFlags_ =
+            org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags.newBuilder(featureFlags_).mergeFrom(value).buildPartial();
+        } else {
+          featureFlags_ = value;
+        }
+        
+        bitField0_ |= 0x00000200;
+        return this;
+      }
+      public Builder clearFeatureFlags() {
+        featureFlags_ = org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags.getDefaultInstance();
+        
+        bitField0_ = (bitField0_ & ~0x00000200);
+        return this;
+      }
+      
       // @@protoc_insertion_point(builder_scope:pulsar.proto.CommandConnect)
     }
     
@@ -7352,6 +7436,326 @@ void setOriginalAuthMethod(org.apache.pulsar.shaded.com.google.protobuf.v241.Byt
     // @@protoc_insertion_point(class_scope:pulsar.proto.CommandConnect)
   }
   
+  public interface FeatureFlagsOrBuilder
+      extends org.apache.pulsar.shaded.com.google.protobuf.v241.MessageLiteOrBuilder {
+    
+    // optional bool supports_auth_refresh = 1 [default = false];
+    boolean hasSupportsAuthRefresh();
+    boolean getSupportsAuthRefresh();
+  }
+  public static final class FeatureFlags extends
+      org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessageLite
+      implements FeatureFlagsOrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedOutputStream.ByteBufGeneratedMessage  {
+    // Use FeatureFlags.newBuilder() to construct.
+    private io.netty.util.Recycler.Handle handle;
+    private FeatureFlags(io.netty.util.Recycler.Handle handle) {
+      this.handle = handle;
+    }
+    
+     private static final io.netty.util.Recycler<FeatureFlags> RECYCLER = new io.netty.util.Recycler<FeatureFlags>() {
+            protected FeatureFlags newObject(Handle handle) {
+              return new FeatureFlags(handle);
+            }
+          };
+        
+        public void recycle() {
+            this.initFields();
+            this.memoizedIsInitialized = -1;
+            this.bitField0_ = 0;
+            this.memoizedSerializedSize = -1;
+            if (handle != null) { RECYCLER.recycle(this, handle); }
+        }
+         
+    private FeatureFlags(boolean noInit) {}
+    
+    private static final FeatureFlags defaultInstance;
+    public static FeatureFlags getDefaultInstance() {
+      return defaultInstance;
+    }
+    
+    public FeatureFlags getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+    
+    private int bitField0_;
+    // optional bool supports_auth_refresh = 1 [default = false];
+    public static final int SUPPORTS_AUTH_REFRESH_FIELD_NUMBER = 1;
+    private boolean supportsAuthRefresh_;
+    public boolean hasSupportsAuthRefresh() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    public boolean getSupportsAuthRefresh() {
+      return supportsAuthRefresh_;
+    }
+    
+    private void initFields() {
+      supportsAuthRefresh_ = false;
+    }
+    private byte memoizedIsInitialized = -1;
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized != -1) return isInitialized == 1;
+      
+      memoizedIsInitialized = 1;
+      return true;
+    }
+    
+    public void writeTo(org.apache.pulsar.shaded.com.google.protobuf.v241.CodedOutputStream output)
+                        throws java.io.IOException {
+        throw new RuntimeException("Cannot use CodedOutputStream");
+    }
+    
+    public void writeTo(org.apache.pulsar.common.util.protobuf.ByteBufCodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        output.writeBool(1, supportsAuthRefresh_);
+      }
+    }
+    
+    private int memoizedSerializedSize = -1;
+    public int getSerializedSize() {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+    
+      size = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        size += org.apache.pulsar.shaded.com.google.protobuf.v241.CodedOutputStream
+          .computeBoolSize(1, supportsAuthRefresh_);
+      }
+      memoizedSerializedSize = size;
+      return size;
+    }
+    
+    private static final long serialVersionUID = 0L;
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
+        throws java.io.ObjectStreamException {
+      return super.writeReplace();
+    }
+    
+    public static org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags parseFrom(
+        org.apache.pulsar.shaded.com.google.protobuf.v241.ByteString data)
+        throws org.apache.pulsar.shaded.com.google.protobuf.v241.InvalidProtocolBufferException {
+         throw new RuntimeException("Disabled");
+    }
+    public static org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags parseFrom(
+        org.apache.pulsar.shaded.com.google.protobuf.v241.ByteString data,
+        org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pulsar.shaded.com.google.protobuf.v241.InvalidProtocolBufferException {
+         throw new RuntimeException("Disabled");
+    }
+    public static org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags parseFrom(byte[] data)
+        throws org.apache.pulsar.shaded.com.google.protobuf.v241.InvalidProtocolBufferException {
+      return newBuilder().mergeFrom(data).buildParsed();
+    }
+    public static org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags parseFrom(
+        byte[] data,
+        org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistryLite extensionRegistry)
+        throws org.apache.pulsar.shaded.com.google.protobuf.v241.InvalidProtocolBufferException {
+      return newBuilder().mergeFrom(data, extensionRegistry)
+               .buildParsed();
+    }
+    public static org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input).buildParsed();
+    }
+    public static org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags parseFrom(
+        java.io.InputStream input,
+        org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
+    }
+    public static org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
+    }
+    public static org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags parseDelimitedFrom(
+        java.io.InputStream input,
+        org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      Builder builder = newBuilder();
+      if (builder.mergeDelimitedFrom(input, extensionRegistry)) {
+        return builder.buildParsed();
+      } else {
+        return null;
+      }
+    }
+    public static org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags parseFrom(
+        org.apache.pulsar.shaded.com.google.protobuf.v241.CodedInputStream input)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input).buildParsed();
+    }
+    public static org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags parseFrom(
+        org.apache.pulsar.shaded.com.google.protobuf.v241.CodedInputStream input,
+        org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return newBuilder().mergeFrom(input, extensionRegistry)
+               .buildParsed();
+    }
+    
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder(org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags prototype) {
+      return newBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() { return newBuilder(this); }
+    
+    public static final class Builder extends
+        org.apache.pulsar.shaded.com.google.protobuf.v241.GeneratedMessageLite.Builder<
+          org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags, Builder>
+        implements org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlagsOrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedInputStream.ByteBufMessageBuilder  {
+      // Construct using org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags.newBuilder()
+      private final io.netty.util.Recycler.Handle handle;
+      private Builder(io.netty.util.Recycler.Handle handle) {
+        this.handle = handle;
+        maybeForceBuilderInitialization();
+      }
+      private final static io.netty.util.Recycler<Builder> RECYCLER = new io.netty.util.Recycler<Builder>() {
+         protected Builder newObject(io.netty.util.Recycler.Handle handle) {
+               return new Builder(handle);
+             }
+            };
+      
+       public void recycle() {
+                clear();
+                if (handle != null) {RECYCLER.recycle(this, handle);}
+            }
+      
+      private void maybeForceBuilderInitialization() {
+      }
+      private static Builder create() {
+        return RECYCLER.get();
+      }
+      
+      public Builder clear() {
+        super.clear();
+        supportsAuthRefresh_ = false;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        return this;
+      }
+      
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+      
+      public org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags getDefaultInstanceForType() {
+        return org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags.getDefaultInstance();
+      }
+      
+      public org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags build() {
+        org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+      
+      private org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags buildParsed()
+          throws org.apache.pulsar.shaded.com.google.protobuf.v241.InvalidProtocolBufferException {
+        org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(
+            result).asInvalidProtocolBufferException();
+        }
+        return result;
+      }
+      
+      public org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags buildPartial() {
+        org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags result = org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags.RECYCLER.get();
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.supportsAuthRefresh_ = supportsAuthRefresh_;
+        result.bitField0_ = to_bitField0_;
+        return result;
+      }
+      
+      public Builder mergeFrom(org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags other) {
+        if (other == org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags.getDefaultInstance()) return this;
+        if (other.hasSupportsAuthRefresh()) {
+          setSupportsAuthRefresh(other.getSupportsAuthRefresh());
+        }
+        return this;
+      }
+      
+      public final boolean isInitialized() {
+        return true;
+      }
+      
+      public Builder mergeFrom(org.apache.pulsar.shaded.com.google.protobuf.v241.CodedInputStream input,
+                              org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistryLite extensionRegistry)
+                              throws java.io.IOException {
+         throw new java.io.IOException("Merge from CodedInputStream is disabled");
+                              }
+      public Builder mergeFrom(
+          org.apache.pulsar.common.util.protobuf.ByteBufCodedInputStream input,
+          org.apache.pulsar.shaded.com.google.protobuf.v241.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        while (true) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              
+              return this;
+            default: {
+              if (!input.skipField(tag)) {
+                
+                return this;
+              }
+              break;
+            }
+            case 8: {
+              bitField0_ |= 0x00000001;
+              supportsAuthRefresh_ = input.readBool();
+              break;
+            }
+          }
+        }
+      }
+      
+      private int bitField0_;
+      
+      // optional bool supports_auth_refresh = 1 [default = false];
+      private boolean supportsAuthRefresh_ ;
+      public boolean hasSupportsAuthRefresh() {
+        return ((bitField0_ & 0x00000001) == 0x00000001);
+      }
+      public boolean getSupportsAuthRefresh() {
+        return supportsAuthRefresh_;
+      }
+      public Builder setSupportsAuthRefresh(boolean value) {
+        bitField0_ |= 0x00000001;
+        supportsAuthRefresh_ = value;
+        
+        return this;
+      }
+      public Builder clearSupportsAuthRefresh() {
+        bitField0_ = (bitField0_ & ~0x00000001);
+        supportsAuthRefresh_ = false;
+        
+        return this;
+      }
+      
+      // @@protoc_insertion_point(builder_scope:pulsar.proto.FeatureFlags)
+    }
+    
+    static {
+      defaultInstance = new FeatureFlags(true);
+      defaultInstance.initFields();
+    }
+    
+    // @@protoc_insertion_point(class_scope:pulsar.proto.FeatureFlags)
+  }
+  
   public interface CommandConnectedOrBuilder
       extends org.apache.pulsar.shaded.com.google.protobuf.v241.MessageLiteOrBuilder {
     
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessage.java b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessage.java
index ce5d9404ccb28..07a8098a838df 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessage.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessage.java
@@ -101,4 +101,19 @@ public interface RawMessage {
      * @return the key of the message
      */
     Optional<String> getKey();
+
+    /**
+     * Get byteBuf of the key.
+     *
+     * @return the byte array with the key payload
+     */
+    Optional<ByteBuf> getKeyBytes();
+
+    /**
+     * Check whether the key has been base64 encoded.
+     *
+     * @return true if the key is base64 encoded, false otherwise
+     */
+    boolean hasBase64EncodedKey();
+
 }
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageImpl.java b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageImpl.java
index 282945f08ad9d..335bf967bf099 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageImpl.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/api/raw/RawMessageImpl.java
@@ -19,9 +19,10 @@
 package org.apache.pulsar.common.api.raw;
 
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 import io.netty.util.Recycler;
 import io.netty.util.Recycler.Handle;
-
+import java.util.Base64;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
@@ -140,4 +141,25 @@ public Optional<String> getKey() {
             return Optional.empty();
         }
     }
+
+    @Override
+    public Optional<ByteBuf> getKeyBytes() {
+        if (getKey().isPresent()) {
+            if (hasBase64EncodedKey()) {
+                return Optional.of(Unpooled.wrappedBuffer(Base64.getDecoder().decode(getKey().get())));
+            } else {
+                return Optional.of(Unpooled.wrappedBuffer(getKey().get().getBytes()));
+            }
+        }
+        return Optional.empty();
+    }
+
+    @Override
+    public boolean hasBase64EncodedKey() {
+        if (singleMessageMetadata != null) {
+            return singleMessageMetadata.getPartitionKeyB64Encoded();
+        }
+        return msgMetadata.get().getPartitionKeyB64Encoded();
+    }
+
 }
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/functions/FunctionConfig.java b/pulsar-common/src/main/java/org/apache/pulsar/common/functions/FunctionConfig.java
index 68ee62474df9b..4e1bfe1fb2921 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/functions/FunctionConfig.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/functions/FunctionConfig.java
@@ -86,6 +86,7 @@ public enum Runtime {
     private String logTopic;
     private ProcessingGuarantees processingGuarantees;
     private Boolean retainOrdering;
+    private Boolean forwardSourceMessageProperty;
     private Map<String, Object> userConfig;
     // This is a map of secretName(aka how the secret is going to be
     // accessed in the function via context) to an object that
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ConsumerStats.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ConsumerStats.java
index f929e22792a4d..7411f03a29f4c 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ConsumerStats.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ConsumerStats.java
@@ -59,6 +59,9 @@ public class ConsumerStats {
     private int clientVersionOffset = -1;
     private int clientVersionLength;
 
+    public long lastAckedTimestamp;
+    public long lastConsumedTimestamp;
+
     /** Metadata (key/value strings) associated with this consumer. */
     public Map<String, String> metadata;
 
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/DelayedDeliveryPolicies.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/DelayedDeliveryPolicies.java
new file mode 100644
index 0000000000000..797f090d83e7c
--- /dev/null
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/DelayedDeliveryPolicies.java
@@ -0,0 +1,38 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.common.policies.data;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * Definition of the delayed delivery policy.
+ */
+@Data
+@AllArgsConstructor
+@Setter
+@Getter
+@NoArgsConstructor
+public class DelayedDeliveryPolicies {
+    private long tickTime;
+    private boolean active;
+}
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/OffloadPolicies.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/OffloadPolicies.java
new file mode 100644
index 0000000000000..f46b44f031fbe
--- /dev/null
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/OffloadPolicies.java
@@ -0,0 +1,228 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.common.policies.data;
+
+import static org.apache.pulsar.common.util.FieldParser.value;
+
+import com.google.common.base.MoreObjects;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Properties;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Definition of the offload policies.
+ */
+@Data
+public class OffloadPolicies {
+
+    public final static int DEFAULT_MAX_BLOCK_SIZE_IN_BYTES = 64 * 1024 * 1024;   // 64MB
+    public final static int DEFAULT_READ_BUFFER_SIZE_IN_BYTES = 1024 * 1024;      // 1MB
+    public final static int DEFAULT_OFFLOAD_MAX_THREADS = 2;
+    public final static String[] DRIVER_NAMES = {"S3", "aws-s3", "google-cloud-storage", "filesystem"};
+    public final static String DEFAULT_OFFLOADER_DIRECTORY = "./offloaders";
+
+    // common config
+    private String offloadersDirectory = DEFAULT_OFFLOADER_DIRECTORY;
+    private String managedLedgerOffloadDriver = null;
+    private int managedLedgerOffloadMaxThreads = DEFAULT_OFFLOAD_MAX_THREADS;
+
+    // s3 config, set by service configuration or cli
+    private String s3ManagedLedgerOffloadRegion = null;
+    private String s3ManagedLedgerOffloadBucket = null;
+    private String s3ManagedLedgerOffloadServiceEndpoint = null;
+    private int s3ManagedLedgerOffloadMaxBlockSizeInBytes = DEFAULT_MAX_BLOCK_SIZE_IN_BYTES;
+    private int s3ManagedLedgerOffloadReadBufferSizeInBytes = DEFAULT_READ_BUFFER_SIZE_IN_BYTES;
+    // s3 config, set by service configuration
+    private String s3ManagedLedgerOffloadRole = null;
+    private String s3ManagedLedgerOffloadRoleSessionName = "pulsar-s3-offload";
+
+    // gcs config, set by service configuration or cli
+    private String gcsManagedLedgerOffloadRegion = null;
+    private String gcsManagedLedgerOffloadBucket = null;
+    private int gcsManagedLedgerOffloadMaxBlockSizeInBytes = DEFAULT_MAX_BLOCK_SIZE_IN_BYTES;
+    private int gcsManagedLedgerOffloadReadBufferSizeInBytes = DEFAULT_READ_BUFFER_SIZE_IN_BYTES;
+    // gcs config, set by service configuration
+    private String gcsManagedLedgerOffloadServiceAccountKeyFile = null;
+
+    // file system config, set by service configuration
+    private String fileSystemProfilePath = null;
+    private String fileSystemURI = null;
+
+    public static OffloadPolicies create(String driver, String region, String bucket, String endpoint,
+                                         int maxBlockSizeInBytes, int readBufferSizeInBytes) {
+        OffloadPolicies offloadPolicies = new OffloadPolicies();
+        offloadPolicies.setManagedLedgerOffloadDriver(driver);
+        if (driver.equalsIgnoreCase(DRIVER_NAMES[0]) || driver.equalsIgnoreCase(DRIVER_NAMES[1])) {
+            offloadPolicies.setS3ManagedLedgerOffloadRegion(region);
+            offloadPolicies.setS3ManagedLedgerOffloadBucket(bucket);
+            offloadPolicies.setS3ManagedLedgerOffloadServiceEndpoint(endpoint);
+            offloadPolicies.setS3ManagedLedgerOffloadMaxBlockSizeInBytes(maxBlockSizeInBytes);
+            offloadPolicies.setS3ManagedLedgerOffloadReadBufferSizeInBytes(readBufferSizeInBytes);
+        } else if (driver.equalsIgnoreCase(DRIVER_NAMES[2])) {
+            offloadPolicies.setGcsManagedLedgerOffloadRegion(region);
+            offloadPolicies.setGcsManagedLedgerOffloadBucket(bucket);
+            offloadPolicies.setGcsManagedLedgerOffloadMaxBlockSizeInBytes(maxBlockSizeInBytes);
+            offloadPolicies.setGcsManagedLedgerOffloadReadBufferSizeInBytes(readBufferSizeInBytes);
+        }
+        return offloadPolicies;
+    }
+
+    public static OffloadPolicies create(Properties properties) {
+        OffloadPolicies data = new OffloadPolicies();
+        Field[] fields = OffloadPolicies.class.getDeclaredFields();
+        Arrays.stream(fields).forEach(f -> {
+            if (properties.containsKey(f.getName())) {
+                try {
+                    f.setAccessible(true);
+                    f.set(data, value((String) properties.get(f.getName()), f));
+                } catch (Exception e) {
+                    throw new IllegalArgumentException(
+                            String.format("failed to initialize %s field while setting value %s",
+                            f.getName(), properties.get(f.getName())), e);
+                }
+            }
+        });
+        return data;
+    }
+
+    public boolean driverSupported() {
+        return Arrays.stream(DRIVER_NAMES).anyMatch(d -> d.equalsIgnoreCase(this.managedLedgerOffloadDriver));
+    }
+
+    public static String getSupportedDriverNames() {
+        return StringUtils.join(DRIVER_NAMES, ",");
+    }
+
+    public boolean isS3Driver() {
+        if (managedLedgerOffloadDriver == null) {
+            return false;
+        }
+        return managedLedgerOffloadDriver.equalsIgnoreCase(DRIVER_NAMES[0])
+                || managedLedgerOffloadDriver.equalsIgnoreCase(DRIVER_NAMES[1]);
+    }
+
+    public boolean isGcsDriver() {
+        if (managedLedgerOffloadDriver == null) {
+            return false;
+        }
+        return managedLedgerOffloadDriver.equalsIgnoreCase(DRIVER_NAMES[2]);
+    }
+
+    public boolean isFileSystemDriver() {
+        if (managedLedgerOffloadDriver == null) {
+            return false;
+        }
+        return managedLedgerOffloadDriver.equalsIgnoreCase(DRIVER_NAMES[3]);
+    }
+
+    public boolean bucketValid() {
+        if (managedLedgerOffloadDriver == null) {
+            return false;
+        }
+        if (isS3Driver()) {
+            return StringUtils.isNotEmpty(s3ManagedLedgerOffloadBucket);
+        } else if (isGcsDriver()) {
+            return StringUtils.isNotEmpty(gcsManagedLedgerOffloadBucket);
+        } else if (isFileSystemDriver()) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(
+                managedLedgerOffloadDriver,
+                managedLedgerOffloadMaxThreads,
+                s3ManagedLedgerOffloadRegion,
+                s3ManagedLedgerOffloadBucket,
+                s3ManagedLedgerOffloadServiceEndpoint,
+                s3ManagedLedgerOffloadMaxBlockSizeInBytes,
+                s3ManagedLedgerOffloadReadBufferSizeInBytes,
+                s3ManagedLedgerOffloadRole,
+                s3ManagedLedgerOffloadRoleSessionName,
+                gcsManagedLedgerOffloadRegion,
+                gcsManagedLedgerOffloadBucket,
+                gcsManagedLedgerOffloadMaxBlockSizeInBytes,
+                gcsManagedLedgerOffloadReadBufferSizeInBytes,
+                gcsManagedLedgerOffloadServiceAccountKeyFile,
+                fileSystemProfilePath,
+                fileSystemURI);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        OffloadPolicies other = (OffloadPolicies) obj;
+        return Objects.equals(managedLedgerOffloadDriver, other.getManagedLedgerOffloadDriver())
+                && Objects.equals(managedLedgerOffloadMaxThreads, other.getManagedLedgerOffloadMaxThreads())
+                && Objects.equals(s3ManagedLedgerOffloadRegion, other.getS3ManagedLedgerOffloadRegion())
+                && Objects.equals(s3ManagedLedgerOffloadBucket, other.getS3ManagedLedgerOffloadBucket())
+                && Objects.equals(s3ManagedLedgerOffloadServiceEndpoint,
+                    other.getS3ManagedLedgerOffloadServiceEndpoint())
+                && Objects.equals(s3ManagedLedgerOffloadMaxBlockSizeInBytes,
+                    other.getS3ManagedLedgerOffloadMaxBlockSizeInBytes())
+                && Objects.equals(s3ManagedLedgerOffloadReadBufferSizeInBytes,
+                    other.getS3ManagedLedgerOffloadReadBufferSizeInBytes())
+                && Objects.equals(s3ManagedLedgerOffloadRole, other.getS3ManagedLedgerOffloadRole())
+                && Objects.equals(s3ManagedLedgerOffloadRoleSessionName,
+                    other.getS3ManagedLedgerOffloadRoleSessionName())
+                && Objects.equals(gcsManagedLedgerOffloadRegion, other.getGcsManagedLedgerOffloadRegion())
+                && Objects.equals(gcsManagedLedgerOffloadBucket, other.getGcsManagedLedgerOffloadBucket())
+                && Objects.equals(gcsManagedLedgerOffloadMaxBlockSizeInBytes,
+                    other.getGcsManagedLedgerOffloadMaxBlockSizeInBytes())
+                && Objects.equals(gcsManagedLedgerOffloadReadBufferSizeInBytes,
+                    other.getGcsManagedLedgerOffloadReadBufferSizeInBytes())
+                && Objects.equals(gcsManagedLedgerOffloadServiceAccountKeyFile,
+                    other.getGcsManagedLedgerOffloadServiceAccountKeyFile())
+                && Objects.equals(fileSystemProfilePath, other.getFileSystemProfilePath())
+                && Objects.equals(fileSystemURI, other.getFileSystemURI());
+    }
+
+    @Override
+    public String toString() {
+        return MoreObjects.toStringHelper(this)
+                .add("managedLedgerOffloadDriver", managedLedgerOffloadDriver)
+                .add("managedLedgerOffloadMaxThreads", managedLedgerOffloadMaxThreads)
+                .add("s3ManagedLedgerOffloadRegion", s3ManagedLedgerOffloadRegion)
+                .add("s3ManagedLedgerOffloadBucket", s3ManagedLedgerOffloadBucket)
+                .add("s3ManagedLedgerOffloadServiceEndpoint", s3ManagedLedgerOffloadServiceEndpoint)
+                .add("s3ManagedLedgerOffloadMaxBlockSizeInBytes", s3ManagedLedgerOffloadMaxBlockSizeInBytes)
+                .add("s3ManagedLedgerOffloadReadBufferSizeInBytes", s3ManagedLedgerOffloadReadBufferSizeInBytes)
+                .add("s3ManagedLedgerOffloadRole", s3ManagedLedgerOffloadRole)
+                .add("s3ManagedLedgerOffloadRoleSessionName", s3ManagedLedgerOffloadRoleSessionName)
+                .add("gcsManagedLedgerOffloadRegion", gcsManagedLedgerOffloadRegion)
+                .add("gcsManagedLedgerOffloadBucket", gcsManagedLedgerOffloadBucket)
+                .add("gcsManagedLedgerOffloadMaxBlockSizeInBytes", gcsManagedLedgerOffloadMaxBlockSizeInBytes)
+                .add("gcsManagedLedgerOffloadReadBufferSizeInBytes", gcsManagedLedgerOffloadReadBufferSizeInBytes)
+                .add("gcsManagedLedgerOffloadServiceAccountKeyFile", gcsManagedLedgerOffloadServiceAccountKeyFile)
+                .add("fileSystemProfilePath", fileSystemProfilePath)
+                .add("fileSystemURI", fileSystemURI)
+                .toString();
+    }
+
+}
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/Policies.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/Policies.java
index 8e55280fc8de9..4b2029b36f129 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/Policies.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/Policies.java
@@ -39,6 +39,8 @@ public class Policies {
     public BundlesData bundles;
     @SuppressWarnings("checkstyle:MemberName")
     public Map<BacklogQuota.BacklogQuotaType, BacklogQuota> backlog_quota_map = Maps.newHashMap();
+    @Deprecated
+    public Map<String, DispatchRate> clusterDispatchRate = Maps.newHashMap();
     public Map<String, DispatchRate> topicDispatchRate = Maps.newHashMap();
     public Map<String, DispatchRate> subscriptionDispatchRate = Maps.newHashMap();
     public Map<String, DispatchRate> replicatorDispatchRate = Maps.newHashMap();
@@ -64,6 +66,8 @@ public class Policies {
     @SuppressWarnings("checkstyle:MemberName")
     public boolean encryption_required = false;
     @SuppressWarnings("checkstyle:MemberName")
+    public DelayedDeliveryPolicies delayed_delivery_policies = null;
+    @SuppressWarnings("checkstyle:MemberName")
     public SubscriptionAuthMode subscription_auth_mode = SubscriptionAuthMode.None;
 
     @SuppressWarnings("checkstyle:MemberName")
@@ -72,6 +76,10 @@ public class Policies {
     public int max_consumers_per_topic = 0;
     @SuppressWarnings("checkstyle:MemberName")
     public int max_consumers_per_subscription = 0;
+    @SuppressWarnings("checkstyle:MemberName")
+    public int max_unacked_messages_per_consumer = -1;
+    @SuppressWarnings("checkstyle:MemberName")
+    public int max_unacked_messages_per_subscription = -1;
 
     @SuppressWarnings("checkstyle:MemberName")
     public long compaction_threshold = 0;
@@ -94,23 +102,29 @@ public class Policies {
     @SuppressWarnings("checkstyle:MemberName")
     public boolean schema_validation_enforced = false;
 
+    @SuppressWarnings("checkstyle:MemberName")
+    public OffloadPolicies offload_policies = null;
+
     @Override
     public int hashCode() {
         return Objects.hash(auth_policies, replication_clusters,
-                backlog_quota_map, publishMaxMessageRate,
+                backlog_quota_map, publishMaxMessageRate, clusterDispatchRate,
                 topicDispatchRate, subscriptionDispatchRate, replicatorDispatchRate,
                 clusterSubscribeRate, deduplicationEnabled, persistence,
                 bundles, latency_stats_sample_rate,
                 message_ttl_in_seconds, retention_policies,
-                encryption_required, subscription_auth_mode,
+                encryption_required, delayed_delivery_policies,
+                subscription_auth_mode,
                 antiAffinityGroup, max_producers_per_topic,
                 max_consumers_per_topic, max_consumers_per_subscription,
+                max_unacked_messages_per_consumer, max_unacked_messages_per_subscription,
                 compaction_threshold, offload_threshold,
                 offload_deletion_lag_ms,
                 schema_auto_update_compatibility_strategy,
                 schema_validation_enforced,
                 schema_compatibility_strategy,
-                is_allow_auto_update_schema);
+                is_allow_auto_update_schema,
+                offload_policies);
     }
 
     @Override
@@ -120,6 +134,7 @@ public boolean equals(Object obj) {
             return Objects.equals(auth_policies, other.auth_policies)
                     && Objects.equals(replication_clusters, other.replication_clusters)
                     && Objects.equals(backlog_quota_map, other.backlog_quota_map)
+                    && Objects.equals(clusterDispatchRate, other.clusterDispatchRate)
                     && Objects.equals(topicDispatchRate, other.topicDispatchRate)
                     && Objects.equals(subscriptionDispatchRate, other.subscriptionDispatchRate)
                     && Objects.equals(replicatorDispatchRate, other.replicatorDispatchRate)
@@ -132,18 +147,22 @@ public boolean equals(Object obj) {
                             other.message_ttl_in_seconds)
                     && Objects.equals(retention_policies, other.retention_policies)
                     && Objects.equals(encryption_required, other.encryption_required)
+                    && Objects.equals(delayed_delivery_policies, other.delayed_delivery_policies)
                     && Objects.equals(subscription_auth_mode, other.subscription_auth_mode)
                     && Objects.equals(antiAffinityGroup, other.antiAffinityGroup)
                     && max_producers_per_topic == other.max_producers_per_topic
                     && max_consumers_per_topic == other.max_consumers_per_topic
                     && max_consumers_per_subscription == other.max_consumers_per_subscription
+                    && max_unacked_messages_per_consumer == other.max_unacked_messages_per_consumer
+                    && max_unacked_messages_per_subscription == other.max_unacked_messages_per_subscription
                     && compaction_threshold == other.compaction_threshold
                     && offload_threshold == other.offload_threshold
                     && offload_deletion_lag_ms == other.offload_deletion_lag_ms
                     && schema_auto_update_compatibility_strategy == other.schema_auto_update_compatibility_strategy
                     && schema_validation_enforced == other.schema_validation_enforced
                     && schema_compatibility_strategy == other.schema_compatibility_strategy
-                    && is_allow_auto_update_schema == other.is_allow_auto_update_schema;
+                    && is_allow_auto_update_schema == other.is_allow_auto_update_schema
+                    && Objects.equals(offload_policies, other.offload_policies);
         }
 
         return false;
@@ -171,6 +190,7 @@ public String toString() {
                 .add("replication_clusters", replication_clusters).add("bundles", bundles)
                 .add("backlog_quota_map", backlog_quota_map).add("persistence", persistence)
                 .add("deduplicationEnabled", deduplicationEnabled)
+                .add("clusterDispatchRate", clusterDispatchRate)
                 .add("topicDispatchRate", topicDispatchRate)
                 .add("subscriptionDispatchRate", subscriptionDispatchRate)
                 .add("replicatorDispatchRate", replicatorDispatchRate)
@@ -181,16 +201,20 @@ public String toString() {
                 .add("message_ttl_in_seconds", message_ttl_in_seconds).add("retention_policies", retention_policies)
                 .add("deleted", deleted)
                 .add("encryption_required", encryption_required)
+                .add("delayed_delivery_policies", delayed_delivery_policies)
                 .add("subscription_auth_mode", subscription_auth_mode)
                 .add("max_producers_per_topic", max_producers_per_topic)
                 .add("max_consumers_per_topic", max_consumers_per_topic)
                 .add("max_consumers_per_subscription", max_consumers_per_topic)
+                .add("max_unacked_messages_per_consumer", max_unacked_messages_per_consumer)
+                .add("max_unacked_messages_per_subscription", max_unacked_messages_per_subscription)
                 .add("compaction_threshold", compaction_threshold)
                 .add("offload_threshold", offload_threshold)
                 .add("offload_deletion_lag_ms", offload_deletion_lag_ms)
                 .add("schema_auto_update_compatibility_strategy", schema_auto_update_compatibility_strategy)
                 .add("schema_validation_enforced", schema_validation_enforced)
                 .add("schema_compatibility_Strategy", schema_compatibility_strategy)
-                .add("is_allow_auto_update_Schema", is_allow_auto_update_schema).toString();
+                .add("is_allow_auto_update_Schema", is_allow_auto_update_schema)
+                .add("offload_policies", offload_policies).toString();
     }
 }
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionStats.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionStats.java
index 30b04c9c569a4..7064883a04c2a 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionStats.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/SubscriptionStats.java
@@ -40,6 +40,9 @@ public class SubscriptionStats {
     /** Number of messages in the subscription backlog. */
     public long msgBacklog;
 
+    /** Number of messages in the subscription backlog that do not contain the delay messages. */
+    public long msgBacklogNoDelayed;
+
     /** Flag to verify if subscription is blocked due to reaching threshold of unacked messages. */
     public boolean blockedSubscriptionOnUnackedMsgs;
 
@@ -61,6 +64,15 @@ public class SubscriptionStats {
     /** Last message expire execution timestamp. */
     public long lastExpireTimestamp;
 
+    /** Last received consume flow command timestamp. */
+    public long lastConsumedFlowTimestamp;
+
+    /** Last consume message timestamp. */
+    public long lastConsumedTimestamp;
+
+    /** Last acked message timestamp. */
+    public long lastAckedTimestamp;
+
     /** List of connected consumers on this subscription w/ their stats. */
     public List<ConsumerStats> consumers;
 
@@ -76,6 +88,7 @@ public void reset() {
         msgThroughputOut = 0;
         msgRateRedeliver = 0;
         msgBacklog = 0;
+        msgBacklogNoDelayed = 0;
         unackedMessages = 0;
         msgRateExpired = 0;
         lastExpireTimestamp = 0L;
@@ -90,6 +103,7 @@ public SubscriptionStats add(SubscriptionStats stats) {
         this.msgThroughputOut += stats.msgThroughputOut;
         this.msgRateRedeliver += stats.msgRateRedeliver;
         this.msgBacklog += stats.msgBacklog;
+        this.msgBacklogNoDelayed += stats.msgBacklogNoDelayed;
         this.unackedMessages += stats.unackedMessages;
         this.msgRateExpired += stats.msgRateExpired;
         this.isReplicated |= stats.isReplicated;
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicStats.java b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicStats.java
index 6f7fcc16e2d39..9962fa95ae383 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicStats.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/TopicStats.java
@@ -121,7 +121,12 @@ public TopicStats add(TopicStats stats) {
             }
         } else {
             for (String subscription : stats.subscriptions.keySet()) {
-                this.subscriptions.get(subscription).add(stats.subscriptions.get(subscription));
+                if (this.subscriptions.get(subscription) != null) {
+                    this.subscriptions.get(subscription).add(stats.subscriptions.get(subscription));
+                } else {
+                    SubscriptionStats subscriptionStats = new SubscriptionStats();
+                    this.subscriptions.put(subscription, subscriptionStats.add(stats.subscriptions.get(subscription)));
+                }
             }
         }
         if (this.replication.size() != stats.replication.size()) {
@@ -131,7 +136,12 @@ public TopicStats add(TopicStats stats) {
             }
         } else {
             for (String repl : stats.replication.keySet()) {
-                this.replication.get(repl).add(stats.replication.get(repl));
+                if (this.replication.get(repl) != null) {
+                    this.replication.get(repl).add(stats.replication.get(repl));
+                } else {
+                    ReplicatorStats replStats = new ReplicatorStats();
+                    this.replication.put(repl, replStats.add(stats.replication.get(repl)));
+                }
             }
         }
         return this;
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/Commands.java b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/Commands.java
index 5b8c91321279c..4acd7dc8e54cb 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/Commands.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/common/protocol/Commands.java
@@ -25,16 +25,20 @@
 import static org.apache.pulsar.shaded.com.google.protobuf.v241.ByteString.copyFromUtf8;
 
 import com.google.common.annotations.VisibleForTesting;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
+
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.pulsar.client.api.KeySharedPolicy;
 import org.apache.pulsar.client.api.Range;
@@ -99,6 +103,7 @@
 import org.apache.pulsar.common.api.proto.PulsarApi.CommandSubscribe.SubType;
 import org.apache.pulsar.common.api.proto.PulsarApi.CommandSuccess;
 import org.apache.pulsar.common.api.proto.PulsarApi.CommandUnsubscribe;
+import org.apache.pulsar.common.api.proto.PulsarApi.FeatureFlags;
 import org.apache.pulsar.common.api.proto.PulsarApi.KeyLongValue;
 import org.apache.pulsar.common.api.proto.PulsarApi.KeyValue;
 import org.apache.pulsar.common.api.proto.PulsarApi.MessageIdData;
@@ -146,6 +151,12 @@ public static ByteBuf newConnect(String authMethodName, String authData, String
                 originalPrincipal, clientAuthData, clientAuthMethod);
     }
 
+    public static FeatureFlags getFeatureFlags() {
+        FeatureFlags.Builder flags = FeatureFlags.newBuilder();
+        flags.setSupportsAuthRefresh(true);
+        return flags.build();
+    }
+
     public static ByteBuf newConnect(String authMethodName, String authData, int protocolVersion, String libVersion,
             String targetBroker, String originalPrincipal, String originalAuthData,
             String originalAuthMethod) {
@@ -181,6 +192,8 @@ public static ByteBuf newConnect(String authMethodName, String authData, int pro
             connectBuilder.setOriginalAuthMethod(originalAuthMethod);
         }
         connectBuilder.setProtocolVersion(protocolVersion);
+
+        connectBuilder.setFeatureFlags(getFeatureFlags());
         CommandConnect connect = connectBuilder.build();
         ByteBuf res = serializeWithSize(BaseCommand.newBuilder().setType(Type.CONNECT).setConnect(connect));
         connect.recycle();
@@ -216,6 +229,7 @@ public static ByteBuf newConnect(String authMethodName, AuthData authData, int p
             connectBuilder.setOriginalAuthMethod(originalAuthMethod);
         }
         connectBuilder.setProtocolVersion(protocolVersion);
+        connectBuilder.setFeatureFlags(getFeatureFlags());
         CommandConnect connect = connectBuilder.build();
         ByteBuf res = serializeWithSize(BaseCommand.newBuilder().setType(Type.CONNECT).setConnect(connect));
         connect.recycle();
@@ -258,9 +272,11 @@ public static ByteBuf newAuthChallenge(String authMethod, AuthData brokerData, i
 
         challengeBuilder.setProtocolVersion(versionToAdvertise);
 
+        byte[] authData = brokerData != null ? brokerData.getBytes() : new byte[0];
+
         CommandAuthChallenge challenge = challengeBuilder
             .setChallenge(PulsarApi.AuthData.newBuilder()
-                .setAuthData(copyFrom(brokerData.getBytes()))
+                .setAuthData(copyFrom(authData))
                 .setAuthMethodName(authMethod)
                 .build())
             .build();
diff --git a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LocalBrokerData.java b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LocalBrokerData.java
index 865b6918c9384..a2d9814f90336 100644
--- a/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LocalBrokerData.java
+++ b/pulsar-common/src/main/java/org/apache/pulsar/policies/data/loadbalancer/LocalBrokerData.java
@@ -205,6 +205,13 @@ public double getMaxResourceUsage() {
                 bandwidthOut.percentUsage()) / 100;
     }
 
+    public String printResourceUsage() {
+        return String.format(
+                "cpu: %.2f%%, memory: %.2f%%, directMemory: %.2f%%, bandwidthIn: %.2f%%, bandwidthOut: %.2f%%",
+                cpu.percentUsage(), memory.percentUsage(), directMemory.percentUsage(), bandwidthIn.percentUsage(),
+                bandwidthOut.percentUsage());
+    }
+
     private static float max(float...args) {
         float max = Float.NEGATIVE_INFINITY;
 
diff --git a/pulsar-common/src/main/proto/PulsarApi.proto b/pulsar-common/src/main/proto/PulsarApi.proto
index 8a44fca60875a..43a813c3b1710 100644
--- a/pulsar-common/src/main/proto/PulsarApi.proto
+++ b/pulsar-common/src/main/proto/PulsarApi.proto
@@ -120,7 +120,7 @@ message MessageMetadata {
     optional bool partition_key_b64_encoded = 17 [ default = false ];
     // Specific a key to overwrite the message key which used for ordering dispatch in Key_Shared mode.
     optional bytes ordering_key = 18;
-    
+
     // Mark the message to be delivered at or after the specified timestamp
     optional int64 deliver_at_time = 19;
 
@@ -235,6 +235,12 @@ message CommandConnect {
     optional string original_auth_data = 8;
     optional string original_auth_method = 9;
 
+    // Feature flags
+    optional FeatureFlags feature_flags = 10;
+}
+
+message FeatureFlags {
+  optional bool supports_auth_refresh = 1 [default = false];
 }
 
 message CommandConnected {
@@ -290,7 +296,7 @@ message CommandSubscribe {
     // Signal wether the subscription should be backed by a
     // durable cursor or not
     optional bool durable = 8 [default = true];
-    
+
     // If specified, the subscription will position the cursor
     // markd-delete position  on the particular message id and
     // will send messages from that point
@@ -314,15 +320,15 @@ message CommandSubscribe {
     // to periodically sync the state of replicated subscriptions
     // across different clusters (when using geo-replication).
     optional bool replicate_subscription_state = 14;
-    
-    // If true, the subscribe operation will cause a topic to be 
+
+    // If true, the subscribe operation will cause a topic to be
     // created if it does not exist already (and if topic auto-creation
     // is allowed by broker.
-    // If false, the subscribe operation will fail if the topic 
+    // If false, the subscribe operation will fail if the topic
     // does not exist.
     optional bool force_topic_creation = 15 [default = true];
 
-    // If specified, the subscription will reset cursor's position back 
+    // If specified, the subscription will reset cursor's position back
     // to specified seconds and  will send messages from that point
     optional uint64 start_message_rollback_duration_sec = 16 [default = 0];
 
diff --git a/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/CachedPulsarClient.java b/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/CachedPulsarClient.java
index 613d4cc897964..5d5715e846d9e 100644
--- a/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/CachedPulsarClient.java
+++ b/pulsar-flink/src/main/java/org/apache/flink/streaming/connectors/pulsar/CachedPulsarClient.java
@@ -55,7 +55,7 @@ public PulsarClientImpl load(ClientConfigurationData key) throws Exception {
     private static RemovalListener<ClientConfigurationData, PulsarClientImpl> removalListener = notification -> {
         ClientConfigurationData config = notification.getKey();
         PulsarClientImpl client = notification.getValue();
-        LOG.debug("Evicting pulsar client %s with config %s, due to %s",
+        LOG.debug("Evicting pulsar client {} with config {}, due to {}",
             client.toString(), config.toString(), notification.getCause().toString());
         close(config, client);
     };
@@ -68,11 +68,9 @@ private static PulsarClientImpl createPulsarClient(
         PulsarClientImpl client;
         try {
             client = new PulsarClientImpl(clientConfig);
-            LOG.debug(String.format("Created a new instance of PulsarClientImpl for clientConf = %s",
-                clientConfig.toString()));
+            LOG.debug("Created a new instance of PulsarClientImpl for clientConf = {}", clientConfig.toString());
         } catch (PulsarClientException e) {
-            LOG.error(String.format("Failed to create PulsarClientImpl for clientConf = %s",
-                clientConfig.toString()));
+            LOG.error("Failed to create PulsarClientImpl for clientConf = {}", clientConfig.toString());
             throw e;
         }
         return client;
@@ -84,10 +82,10 @@ public static PulsarClientImpl getOrCreate(ClientConfigurationData config) throw
 
     private static void close(ClientConfigurationData clientConfig, PulsarClientImpl client) {
         try {
-            LOG.info(String.format("Closing the Pulsar client with conifg %s", clientConfig.toString()));
+            LOG.info("Closing the Pulsar client with config {}", clientConfig.toString());
             client.close();
         } catch (PulsarClientException e) {
-            LOG.warn(String.format("Error while closing the Pulsar client ", clientConfig.toString()), e);
+            LOG.warn("Error while closing the Pulsar client with config {}", clientConfig.toString(), e);
         }
     }
 
diff --git a/pulsar-function-go/conf/conf.go b/pulsar-function-go/conf/conf.go
index 18035741873c0..0efa8925d77cd 100644
--- a/pulsar-function-go/conf/conf.go
+++ b/pulsar-function-go/conf/conf.go
@@ -69,8 +69,9 @@ type Conf struct {
 	Ram  int64   `json:"ram" yaml:"ram"`
 	Disk int64   `json:"disk" yaml:"disk"`
 	//retryDetails config
-	MaxMessageRetries int32  `json:"maxMessageRetries" yaml:"maxMessageRetries"`
-	DeadLetterTopic   string `json:"deadLetterTopic" yaml:"deadLetterTopic"`
+	MaxMessageRetries           int32  `json:"maxMessageRetries" yaml:"maxMessageRetries"`
+	DeadLetterTopic             string `json:"deadLetterTopic" yaml:"deadLetterTopic"`
+	ExpectedHealthCheckInterval int32  `json:"expectedHealthCheckInterval" yaml:"expectedHealthCheckInterval"`
 }
 
 var (
@@ -121,7 +122,7 @@ func (c *Conf) GetConf() *Conf {
 
 func init() {
 	var defaultPath string
-	if err := os.Chdir("../"); err == nil{
+	if err := os.Chdir("../"); err == nil {
 		defaultPath = ConfigPath
 	}
 	log.Infof("The default config file path is: %s", defaultPath)
diff --git a/pulsar-function-go/conf/conf.yaml b/pulsar-function-go/conf/conf.yaml
index 86cf8f22fb177..6652014ddd127 100644
--- a/pulsar-function-go/conf/conf.yaml
+++ b/pulsar-function-go/conf/conf.yaml
@@ -55,3 +55,4 @@ disk: 0
 # retryDetails config
 maxMessageRetries: 0
 deadLetterTopic: ""
+expectedHealthCheckInterval: 3
\ No newline at end of file
diff --git a/pulsar-function-go/examples/test/consumer.go b/pulsar-function-go/examples/consumer/consumer.go
similarity index 99%
rename from pulsar-function-go/examples/test/consumer.go
rename to pulsar-function-go/examples/consumer/consumer.go
index 3df57d63be77d..e3aa15d4f717c 100644
--- a/pulsar-function-go/examples/test/consumer.go
+++ b/pulsar-function-go/examples/consumer/consumer.go
@@ -58,4 +58,3 @@ func main() {
 		consumer.Ack(msg)
 	}
 }
-
diff --git a/pulsar-function-go/examples/contextFunc.go b/pulsar-function-go/examples/contextFunc/contextFunc.go
similarity index 100%
rename from pulsar-function-go/examples/contextFunc.go
rename to pulsar-function-go/examples/contextFunc/contextFunc.go
diff --git a/pulsar-function-go/examples/exclamationFunc/exclamationFunc.go b/pulsar-function-go/examples/exclamationFunc/exclamationFunc.go
new file mode 100644
index 0000000000000..d938f7dbb8c18
--- /dev/null
+++ b/pulsar-function-go/examples/exclamationFunc/exclamationFunc.go
@@ -0,0 +1,34 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package main
+
+import (
+	"context"
+
+	"github.com/apache/pulsar/pulsar-function-go/pf"
+)
+
+func HandleExclamation(ctx context.Context, in []byte) ([]byte, error) {
+	return []byte(string(in) + "!"), nil
+}
+
+func main() {
+	pf.Start(HandleExclamation)
+}
diff --git a/pulsar-function-go/examples/go.mod b/pulsar-function-go/examples/go.mod
new file mode 100644
index 0000000000000..2b47e06f775f0
--- /dev/null
+++ b/pulsar-function-go/examples/go.mod
@@ -0,0 +1,18 @@
+module github.com/apache/pulsar/pulsar-function-go/tests
+
+go 1.13
+
+require (
+	github.com/apache/pulsar-client-go v0.0.0-20200116214305-4d788d9935ed
+	github.com/apache/pulsar/pulsar-function-go v0.0.0
+)
+
+replace github.com/apache/pulsar/pulsar-function-go => ../
+
+replace github.com/apache/pulsar/pulsar-function-go/pf => ../pf
+
+replace github.com/apache/pulsar/pulsar-function-go/logutil => ../logutil
+
+replace github.com/apache/pulsar/pulsar-function-go/pb => ../pb
+
+replace github.com/apache/pulsar/pulsar-function-go/conf => ../conf
diff --git a/pulsar-function-go/examples/go.sum b/pulsar-function-go/examples/go.sum
new file mode 100644
index 0000000000000..7fac303d8bbab
--- /dev/null
+++ b/pulsar-function-go/examples/go.sum
@@ -0,0 +1,134 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/apache/pulsar-client-go v0.0.0-20200113085434-9b739cf9d098/go.mod h1:G+CQVHnh2EPfNEQXOuisIDAyPMiKnzz4Vim/kjtj4U4=
+github.com/apache/pulsar-client-go v0.0.0-20200116214305-4d788d9935ed h1:Lp7eU5ym84jPmIXoonoaJWVN6psyB90Olookp61LCeA=
+github.com/apache/pulsar-client-go v0.0.0-20200116214305-4d788d9935ed/go.mod h1:G+CQVHnh2EPfNEQXOuisIDAyPMiKnzz4Vim/kjtj4U4=
+github.com/apache/pulsar/pulsar-function-go v0.0.0-20200124033432-ec122ed9562c/go.mod h1:2a3PacwSg4KPcGxO3bjH29xsoKSuSkq2mG0sjKtxsP4=
+github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/klauspost/compress v1.9.2 h1:LfVyl+ZlLlLDeQ/d2AqfGIIH4qEDu0Ed2S5GyhCWIWY=
+github.com/klauspost/compress v1.9.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I=
+github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
+github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/pulsar-function-go/examples/hello.go b/pulsar-function-go/examples/hello/hello.go
similarity index 100%
rename from pulsar-function-go/examples/hello.go
rename to pulsar-function-go/examples/hello/hello.go
diff --git a/pulsar-function-go/examples/inputFunc.go b/pulsar-function-go/examples/inputFunc/inputFunc.go
similarity index 94%
rename from pulsar-function-go/examples/inputFunc.go
rename to pulsar-function-go/examples/inputFunc/inputFunc.go
index 0d270de2cd34a..535c0decd0c8a 100644
--- a/pulsar-function-go/examples/inputFunc.go
+++ b/pulsar-function-go/examples/inputFunc/inputFunc.go
@@ -26,7 +26,7 @@ import (
 	"github.com/apache/pulsar/pulsar-function-go/pf"
 )
 
-func HandleRequest(ctx context.Context, in []byte) error{
+func HandleRequest(ctx context.Context, in []byte) error {
 	fmt.Println(string(in) + "!")
 	return nil
 }
diff --git a/pulsar-function-go/examples/outputFunc.go b/pulsar-function-go/examples/outputFunc/outputFunc.go
similarity index 100%
rename from pulsar-function-go/examples/outputFunc.go
rename to pulsar-function-go/examples/outputFunc/outputFunc.go
diff --git a/pulsar-function-go/examples/test/producer.go b/pulsar-function-go/examples/producer/producer.go
similarity index 100%
rename from pulsar-function-go/examples/test/producer.go
rename to pulsar-function-go/examples/producer/producer.go
diff --git a/pulsar-function-go/go.mod b/pulsar-function-go/go.mod
index 75c9af1d83b3c..52edeb997dcaa 100644
--- a/pulsar-function-go/go.mod
+++ b/pulsar-function-go/go.mod
@@ -3,9 +3,21 @@ module github.com/apache/pulsar/pulsar-function-go
 go 1.13
 
 require (
-	github.com/apache/pulsar-client-go v0.0.0-20200113085434-9b739cf9d098
+	github.com/apache/pulsar-client-go v0.0.0-20200116214305-4d788d9935ed
 	github.com/golang/protobuf v1.3.2
+	github.com/prometheus/client_golang v1.3.0
+	github.com/prometheus/client_model v0.1.0
 	github.com/sirupsen/logrus v1.4.2
 	github.com/stretchr/testify v1.4.0
-	gopkg.in/yaml.v2 v2.2.7
+	golang.org/x/net v0.0.0-20190620200207-3b0461eec859 // indirect
+	google.golang.org/grpc v1.26.0
+	gopkg.in/yaml.v2 v2.2.8
 )
+
+replace github.com/apache/pulsar/pulsar-function-go/pf => ./pf
+
+replace github.com/apache/pulsar/pulsar-function-go/logutil => ./logutil
+
+replace github.com/apache/pulsar/pulsar-function-go/pb => ./pb
+
+replace github.com/apache/pulsar/pulsar-function-go/conf => ./conf
diff --git a/pulsar-function-go/go.sum b/pulsar-function-go/go.sum
index 86a10c4c0c40f..9aeb1fce48132 100644
--- a/pulsar-function-go/go.sum
+++ b/pulsar-function-go/go.sum
@@ -1,26 +1,97 @@
-github.com/apache/pulsar-client-go v0.0.0-20200113085434-9b739cf9d098 h1:L8k/8FYXV1+IWYAzovGg4RW0qElvyyrDn/2vP7+i+Uk=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/apache/pulsar v2.5.0+incompatible h1:g7BI4EcfHFq+OwyXXPeEnTo2hL2Koq8Y/ckBkccDgmA=
 github.com/apache/pulsar-client-go v0.0.0-20200113085434-9b739cf9d098/go.mod h1:G+CQVHnh2EPfNEQXOuisIDAyPMiKnzz4Vim/kjtj4U4=
+github.com/apache/pulsar-client-go v0.0.0-20200116214305-4d788d9935ed h1:Lp7eU5ym84jPmIXoonoaJWVN6psyB90Olookp61LCeA=
+github.com/apache/pulsar-client-go v0.0.0-20200116214305-4d788d9935ed/go.mod h1:G+CQVHnh2EPfNEQXOuisIDAyPMiKnzz4Vim/kjtj4U4=
+github.com/apache/pulsar/pulsar-function-go v0.0.0-20200124033432-ec122ed9562c h1:uqA9RBsmQz3gN045GQ6we1RfRsk+5dco60yJ695Yb0E=
+github.com/apache/pulsar/pulsar-function-go v0.0.0-20200124033432-ec122ed9562c/go.mod h1:2a3PacwSg4KPcGxO3bjH29xsoKSuSkq2mG0sjKtxsP4=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/apache/pulsar-client-go v0.0.0-20200116214305-4d788d9935ed h1:Lp7eU5ym84jPmIXoonoaJWVN6psyB90Olookp61LCeA=
+github.com/apache/pulsar-client-go v0.0.0-20200116214305-4d788d9935ed/go.mod h1:G+CQVHnh2EPfNEQXOuisIDAyPMiKnzz4Vim/kjtj4U4=
 github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/klauspost/compress v1.9.2 h1:LfVyl+ZlLlLDeQ/d2AqfGIIH4qEDu0Ed2S5GyhCWIWY=
 github.com/klauspost/compress v1.9.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.3.0 h1:miYCvYqFXtl/J9FIy8eNpBfYthAEFg+Ys0XyUVEcDsc=
+github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.1.0 h1:ElTg5tNp4DqfV7UQjDqv2+RJlNzsDtvNAWccbItceIE=
+github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.7.0 h1:L+1lyG48J1zAQXA3RBX/nG/B3gjlHq0zTt2tlbJLyCY=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
@@ -31,14 +102,67 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
+golang.org/x/sys v0.0.0-20191220142924-d4481acd189f h1:68K/z8GLUxV76xGSqwTWw2gyk/jwn79LUL43rES2g8o=
+golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 h1:5Beo0mZN8dRzgrMMkDp0jc8YXQKx9DiJ2k1dkvGsn5A=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
\ No newline at end of file
diff --git a/pulsar-function-go/pb/Function.pb.go b/pulsar-function-go/pb/Function.pb.go
index 9766ea6726005..b298725075d23 100644
--- a/pulsar-function-go/pb/Function.pb.go
+++ b/pulsar-function-go/pb/Function.pb.go
@@ -17,14 +17,14 @@
 // under the License.
 //
 
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: Function.proto
+package api
 
-package pb
+import (
+	fmt "fmt"
+	math "math"
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -35,7 +35,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type ProcessingGuarantees int32
 
@@ -50,6 +50,7 @@ var ProcessingGuarantees_name = map[int32]string{
 	1: "ATMOST_ONCE",
 	2: "EFFECTIVELY_ONCE",
 }
+
 var ProcessingGuarantees_value = map[string]int32{
 	"ATLEAST_ONCE":     0,
 	"ATMOST_ONCE":      1,
@@ -59,8 +60,9 @@ var ProcessingGuarantees_value = map[string]int32{
 func (x ProcessingGuarantees) String() string {
 	return proto.EnumName(ProcessingGuarantees_name, int32(x))
 }
+
 func (ProcessingGuarantees) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_Function_33c6e1841d2624f0, []int{0}
+	return fileDescriptor_225cf355fcfb169c, []int{0}
 }
 
 type SubscriptionType int32
@@ -74,6 +76,7 @@ var SubscriptionType_name = map[int32]string{
 	0: "SHARED",
 	1: "FAILOVER",
 }
+
 var SubscriptionType_value = map[string]int32{
 	"SHARED":   0,
 	"FAILOVER": 1,
@@ -82,8 +85,34 @@ var SubscriptionType_value = map[string]int32{
 func (x SubscriptionType) String() string {
 	return proto.EnumName(SubscriptionType_name, int32(x))
 }
+
 func (SubscriptionType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_Function_33c6e1841d2624f0, []int{1}
+	return fileDescriptor_225cf355fcfb169c, []int{1}
+}
+
+type SubscriptionPosition int32
+
+const (
+	SubscriptionPosition_LATEST   SubscriptionPosition = 0
+	SubscriptionPosition_EARLIEST SubscriptionPosition = 1
+)
+
+var SubscriptionPosition_name = map[int32]string{
+	0: "LATEST",
+	1: "EARLIEST",
+}
+
+var SubscriptionPosition_value = map[string]int32{
+	"LATEST":   0,
+	"EARLIEST": 1,
+}
+
+func (x SubscriptionPosition) String() string {
+	return proto.EnumName(SubscriptionPosition_name, int32(x))
+}
+
+func (SubscriptionPosition) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_225cf355fcfb169c, []int{2}
 }
 
 type FunctionState int32
@@ -97,6 +126,7 @@ var FunctionState_name = map[int32]string{
 	0: "RUNNING",
 	1: "STOPPED",
 }
+
 var FunctionState_value = map[string]int32{
 	"RUNNING": 0,
 	"STOPPED": 1,
@@ -105,8 +135,9 @@ var FunctionState_value = map[string]int32{
 func (x FunctionState) String() string {
 	return proto.EnumName(FunctionState_name, int32(x))
 }
+
 func (FunctionState) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_Function_33c6e1841d2624f0, []int{2}
+	return fileDescriptor_225cf355fcfb169c, []int{3}
 }
 
 type FunctionDetails_Runtime int32
@@ -122,6 +153,7 @@ var FunctionDetails_Runtime_name = map[int32]string{
 	1: "PYTHON",
 	3: "GO",
 }
+
 var FunctionDetails_Runtime_value = map[string]int32{
 	"JAVA":   0,
 	"PYTHON": 1,
@@ -131,8 +163,40 @@ var FunctionDetails_Runtime_value = map[string]int32{
 func (x FunctionDetails_Runtime) String() string {
 	return proto.EnumName(FunctionDetails_Runtime_name, int32(x))
 }
+
 func (FunctionDetails_Runtime) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_Function_33c6e1841d2624f0, []int{2, 0}
+	return fileDescriptor_225cf355fcfb169c, []int{2, 0}
+}
+
+type FunctionDetails_ComponentType int32
+
+const (
+	FunctionDetails_UNKNOWN  FunctionDetails_ComponentType = 0
+	FunctionDetails_FUNCTION FunctionDetails_ComponentType = 1
+	FunctionDetails_SOURCE   FunctionDetails_ComponentType = 2
+	FunctionDetails_SINK     FunctionDetails_ComponentType = 3
+)
+
+var FunctionDetails_ComponentType_name = map[int32]string{
+	0: "UNKNOWN",
+	1: "FUNCTION",
+	2: "SOURCE",
+	3: "SINK",
+}
+
+var FunctionDetails_ComponentType_value = map[string]int32{
+	"UNKNOWN":  0,
+	"FUNCTION": 1,
+	"SOURCE":   2,
+	"SINK":     3,
+}
+
+func (x FunctionDetails_ComponentType) String() string {
+	return proto.EnumName(FunctionDetails_ComponentType_name, int32(x))
+}
+
+func (FunctionDetails_ComponentType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_225cf355fcfb169c, []int{2, 1}
 }
 
 type Resources struct {
@@ -148,16 +212,17 @@ func (m *Resources) Reset()         { *m = Resources{} }
 func (m *Resources) String() string { return proto.CompactTextString(m) }
 func (*Resources) ProtoMessage()    {}
 func (*Resources) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Function_33c6e1841d2624f0, []int{0}
+	return fileDescriptor_225cf355fcfb169c, []int{0}
 }
+
 func (m *Resources) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Resources.Unmarshal(m, b)
 }
 func (m *Resources) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Resources.Marshal(b, m, deterministic)
 }
-func (dst *Resources) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Resources.Merge(dst, src)
+func (m *Resources) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Resources.Merge(m, src)
 }
 func (m *Resources) XXX_Size() int {
 	return xxx_messageInfo_Resources.Size(m)
@@ -201,16 +266,17 @@ func (m *RetryDetails) Reset()         { *m = RetryDetails{} }
 func (m *RetryDetails) String() string { return proto.CompactTextString(m) }
 func (*RetryDetails) ProtoMessage()    {}
 func (*RetryDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Function_33c6e1841d2624f0, []int{1}
+	return fileDescriptor_225cf355fcfb169c, []int{1}
 }
+
 func (m *RetryDetails) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_RetryDetails.Unmarshal(m, b)
 }
 func (m *RetryDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_RetryDetails.Marshal(b, m, deterministic)
 }
-func (dst *RetryDetails) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RetryDetails.Merge(dst, src)
+func (m *RetryDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_RetryDetails.Merge(m, src)
 }
 func (m *RetryDetails) XXX_Size() int {
 	return xxx_messageInfo_RetryDetails.Size(m)
@@ -236,41 +302,45 @@ func (m *RetryDetails) GetDeadLetterTopic() string {
 }
 
 type FunctionDetails struct {
-	Tenant               string                  `protobuf:"bytes,1,opt,name=tenant,proto3" json:"tenant,omitempty"`
-	Namespace            string                  `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
-	Name                 string                  `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
-	ClassName            string                  `protobuf:"bytes,4,opt,name=className,proto3" json:"className,omitempty"`
-	LogTopic             string                  `protobuf:"bytes,5,opt,name=logTopic,proto3" json:"logTopic,omitempty"`
-	ProcessingGuarantees ProcessingGuarantees    `protobuf:"varint,6,opt,name=processingGuarantees,proto3,enum=proto.ProcessingGuarantees" json:"processingGuarantees,omitempty"`
-	UserConfig           string                  `protobuf:"bytes,7,opt,name=userConfig,proto3" json:"userConfig,omitempty"`
-	SecretsMap           string                  `protobuf:"bytes,16,opt,name=secretsMap,proto3" json:"secretsMap,omitempty"`
-	Runtime              FunctionDetails_Runtime `protobuf:"varint,8,opt,name=runtime,proto3,enum=proto.FunctionDetails_Runtime" json:"runtime,omitempty"`
-	AutoAck              bool                    `protobuf:"varint,9,opt,name=autoAck,proto3" json:"autoAck,omitempty"`
-	Parallelism          int32                   `protobuf:"varint,10,opt,name=parallelism,proto3" json:"parallelism,omitempty"`
-	Source               *SourceSpec             `protobuf:"bytes,11,opt,name=source,proto3" json:"source,omitempty"`
-	Sink                 *SinkSpec               `protobuf:"bytes,12,opt,name=sink,proto3" json:"sink,omitempty"`
-	Resources            *Resources              `protobuf:"bytes,13,opt,name=resources,proto3" json:"resources,omitempty"`
-	PackageUrl           string                  `protobuf:"bytes,14,opt,name=packageUrl,proto3" json:"packageUrl,omitempty"`
-	RetryDetails         *RetryDetails           `protobuf:"bytes,15,opt,name=retryDetails,proto3" json:"retryDetails,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                `json:"-"`
-	XXX_unrecognized     []byte                  `json:"-"`
-	XXX_sizecache        int32                   `json:"-"`
+	Tenant               string                        `protobuf:"bytes,1,opt,name=tenant,proto3" json:"tenant,omitempty"`
+	Namespace            string                        `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"`
+	Name                 string                        `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
+	ClassName            string                        `protobuf:"bytes,4,opt,name=className,proto3" json:"className,omitempty"`
+	LogTopic             string                        `protobuf:"bytes,5,opt,name=logTopic,proto3" json:"logTopic,omitempty"`
+	ProcessingGuarantees ProcessingGuarantees          `protobuf:"varint,6,opt,name=processingGuarantees,proto3,enum=proto.ProcessingGuarantees" json:"processingGuarantees,omitempty"`
+	UserConfig           string                        `protobuf:"bytes,7,opt,name=userConfig,proto3" json:"userConfig,omitempty"`
+	SecretsMap           string                        `protobuf:"bytes,16,opt,name=secretsMap,proto3" json:"secretsMap,omitempty"`
+	Runtime              FunctionDetails_Runtime       `protobuf:"varint,8,opt,name=runtime,proto3,enum=proto.FunctionDetails_Runtime" json:"runtime,omitempty"`
+	AutoAck              bool                          `protobuf:"varint,9,opt,name=autoAck,proto3" json:"autoAck,omitempty"`
+	Parallelism          int32                         `protobuf:"varint,10,opt,name=parallelism,proto3" json:"parallelism,omitempty"`
+	Source               *SourceSpec                   `protobuf:"bytes,11,opt,name=source,proto3" json:"source,omitempty"`
+	Sink                 *SinkSpec                     `protobuf:"bytes,12,opt,name=sink,proto3" json:"sink,omitempty"`
+	Resources            *Resources                    `protobuf:"bytes,13,opt,name=resources,proto3" json:"resources,omitempty"`
+	PackageUrl           string                        `protobuf:"bytes,14,opt,name=packageUrl,proto3" json:"packageUrl,omitempty"`
+	RetryDetails         *RetryDetails                 `protobuf:"bytes,15,opt,name=retryDetails,proto3" json:"retryDetails,omitempty"`
+	RuntimeFlags         string                        `protobuf:"bytes,17,opt,name=runtimeFlags,proto3" json:"runtimeFlags,omitempty"`
+	ComponentType        FunctionDetails_ComponentType `protobuf:"varint,18,opt,name=componentType,proto3,enum=proto.FunctionDetails_ComponentType" json:"componentType,omitempty"`
+	CustomRuntimeOptions string                        `protobuf:"bytes,19,opt,name=customRuntimeOptions,proto3" json:"customRuntimeOptions,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                      `json:"-"`
+	XXX_unrecognized     []byte                        `json:"-"`
+	XXX_sizecache        int32                         `json:"-"`
 }
 
 func (m *FunctionDetails) Reset()         { *m = FunctionDetails{} }
 func (m *FunctionDetails) String() string { return proto.CompactTextString(m) }
 func (*FunctionDetails) ProtoMessage()    {}
 func (*FunctionDetails) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Function_33c6e1841d2624f0, []int{2}
+	return fileDescriptor_225cf355fcfb169c, []int{2}
 }
+
 func (m *FunctionDetails) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FunctionDetails.Unmarshal(m, b)
 }
 func (m *FunctionDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FunctionDetails.Marshal(b, m, deterministic)
 }
-func (dst *FunctionDetails) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FunctionDetails.Merge(dst, src)
+func (m *FunctionDetails) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FunctionDetails.Merge(m, src)
 }
 func (m *FunctionDetails) XXX_Size() int {
 	return xxx_messageInfo_FunctionDetails.Size(m)
@@ -393,6 +463,27 @@ func (m *FunctionDetails) GetRetryDetails() *RetryDetails {
 	return nil
 }
 
+func (m *FunctionDetails) GetRuntimeFlags() string {
+	if m != nil {
+		return m.RuntimeFlags
+	}
+	return ""
+}
+
+func (m *FunctionDetails) GetComponentType() FunctionDetails_ComponentType {
+	if m != nil {
+		return m.ComponentType
+	}
+	return FunctionDetails_UNKNOWN
+}
+
+func (m *FunctionDetails) GetCustomRuntimeOptions() string {
+	if m != nil {
+		return m.CustomRuntimeOptions
+	}
+	return ""
+}
+
 type ConsumerSpec struct {
 	SchemaType           string                          `protobuf:"bytes,1,opt,name=schemaType,proto3" json:"schemaType,omitempty"`
 	SerdeClassName       string                          `protobuf:"bytes,2,opt,name=serdeClassName,proto3" json:"serdeClassName,omitempty"`
@@ -407,16 +498,17 @@ func (m *ConsumerSpec) Reset()         { *m = ConsumerSpec{} }
 func (m *ConsumerSpec) String() string { return proto.CompactTextString(m) }
 func (*ConsumerSpec) ProtoMessage()    {}
 func (*ConsumerSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Function_33c6e1841d2624f0, []int{3}
+	return fileDescriptor_225cf355fcfb169c, []int{3}
 }
+
 func (m *ConsumerSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConsumerSpec.Unmarshal(m, b)
 }
 func (m *ConsumerSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConsumerSpec.Marshal(b, m, deterministic)
 }
-func (dst *ConsumerSpec) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConsumerSpec.Merge(dst, src)
+func (m *ConsumerSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConsumerSpec.Merge(m, src)
 }
 func (m *ConsumerSpec) XXX_Size() int {
 	return xxx_messageInfo_ConsumerSpec.Size(m)
@@ -466,16 +558,17 @@ func (m *ConsumerSpec_ReceiverQueueSize) Reset()         { *m = ConsumerSpec_Rec
 func (m *ConsumerSpec_ReceiverQueueSize) String() string { return proto.CompactTextString(m) }
 func (*ConsumerSpec_ReceiverQueueSize) ProtoMessage()    {}
 func (*ConsumerSpec_ReceiverQueueSize) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Function_33c6e1841d2624f0, []int{3, 0}
+	return fileDescriptor_225cf355fcfb169c, []int{3, 0}
 }
+
 func (m *ConsumerSpec_ReceiverQueueSize) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ConsumerSpec_ReceiverQueueSize.Unmarshal(m, b)
 }
 func (m *ConsumerSpec_ReceiverQueueSize) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ConsumerSpec_ReceiverQueueSize.Marshal(b, m, deterministic)
 }
-func (dst *ConsumerSpec_ReceiverQueueSize) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConsumerSpec_ReceiverQueueSize.Merge(dst, src)
+func (m *ConsumerSpec_ReceiverQueueSize) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ConsumerSpec_ReceiverQueueSize.Merge(m, src)
 }
 func (m *ConsumerSpec_ReceiverQueueSize) XXX_Size() int {
 	return xxx_messageInfo_ConsumerSpec_ReceiverQueueSize.Size(m)
@@ -502,35 +595,37 @@ type SourceSpec struct {
 	SubscriptionType SubscriptionType `protobuf:"varint,3,opt,name=subscriptionType,proto3,enum=proto.SubscriptionType" json:"subscriptionType,omitempty"`
 	// @deprecated -- use topicsToSchema
 	TopicsToSerDeClassName map[string]string `protobuf:"bytes,4,rep,name=topicsToSerDeClassName,proto3" json:"topicsToSerDeClassName,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Deprecated: Do not use.
-	// *
+	//*
 	//
 	InputSpecs    map[string]*ConsumerSpec `protobuf:"bytes,10,rep,name=inputSpecs,proto3" json:"inputSpecs,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	TimeoutMs     uint64                   `protobuf:"varint,6,opt,name=timeoutMs,proto3" json:"timeoutMs,omitempty"`
 	TopicsPattern string                   `protobuf:"bytes,7,opt,name=topicsPattern,proto3" json:"topicsPattern,omitempty"` // Deprecated: Do not use.
 	// If specified, this will refer to an archive that is
 	// already present in the server
-	Builtin              string   `protobuf:"bytes,8,opt,name=builtin,proto3" json:"builtin,omitempty"`
-	SubscriptionName     string   `protobuf:"bytes,9,opt,name=subscriptionName,proto3" json:"subscriptionName,omitempty"`
-	CleanupSubscription  bool     `protobuf:"varint,11,opt,name=cleanupSubscription,proto3" json:"cleanupSubscription,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Builtin              string               `protobuf:"bytes,8,opt,name=builtin,proto3" json:"builtin,omitempty"`
+	SubscriptionName     string               `protobuf:"bytes,9,opt,name=subscriptionName,proto3" json:"subscriptionName,omitempty"`
+	CleanupSubscription  bool                 `protobuf:"varint,11,opt,name=cleanupSubscription,proto3" json:"cleanupSubscription,omitempty"`
+	SubscriptionPosition SubscriptionPosition `protobuf:"varint,12,opt,name=subscriptionPosition,proto3,enum=proto.SubscriptionPosition" json:"subscriptionPosition,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
 }
 
 func (m *SourceSpec) Reset()         { *m = SourceSpec{} }
 func (m *SourceSpec) String() string { return proto.CompactTextString(m) }
 func (*SourceSpec) ProtoMessage()    {}
 func (*SourceSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Function_33c6e1841d2624f0, []int{4}
+	return fileDescriptor_225cf355fcfb169c, []int{4}
 }
+
 func (m *SourceSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SourceSpec.Unmarshal(m, b)
 }
 func (m *SourceSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SourceSpec.Marshal(b, m, deterministic)
 }
-func (dst *SourceSpec) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SourceSpec.Merge(dst, src)
+func (m *SourceSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SourceSpec.Merge(m, src)
 }
 func (m *SourceSpec) XXX_Size() int {
 	return xxx_messageInfo_SourceSpec.Size(m)
@@ -620,6 +715,13 @@ func (m *SourceSpec) GetCleanupSubscription() bool {
 	return false
 }
 
+func (m *SourceSpec) GetSubscriptionPosition() SubscriptionPosition {
+	if m != nil {
+		return m.SubscriptionPosition
+	}
+	return SubscriptionPosition_LATEST
+}
+
 type SinkSpec struct {
 	ClassName string `protobuf:"bytes,1,opt,name=className,proto3" json:"className,omitempty"`
 	// map in json format
@@ -631,7 +733,7 @@ type SinkSpec struct {
 	// If specified, this will refer to an archive that is
 	// already present in the server
 	Builtin string `protobuf:"bytes,6,opt,name=builtin,proto3" json:"builtin,omitempty"`
-	// *
+	//*
 	// Builtin schema type or custom schema class name
 	SchemaType           string   `protobuf:"bytes,7,opt,name=schemaType,proto3" json:"schemaType,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
@@ -643,16 +745,17 @@ func (m *SinkSpec) Reset()         { *m = SinkSpec{} }
 func (m *SinkSpec) String() string { return proto.CompactTextString(m) }
 func (*SinkSpec) ProtoMessage()    {}
 func (*SinkSpec) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Function_33c6e1841d2624f0, []int{5}
+	return fileDescriptor_225cf355fcfb169c, []int{5}
 }
+
 func (m *SinkSpec) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SinkSpec.Unmarshal(m, b)
 }
 func (m *SinkSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_SinkSpec.Marshal(b, m, deterministic)
 }
-func (dst *SinkSpec) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SinkSpec.Merge(dst, src)
+func (m *SinkSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SinkSpec.Merge(m, src)
 }
 func (m *SinkSpec) XXX_Size() int {
 	return xxx_messageInfo_SinkSpec.Size(m)
@@ -724,16 +827,17 @@ func (m *PackageLocationMetaData) Reset()         { *m = PackageLocationMetaData
 func (m *PackageLocationMetaData) String() string { return proto.CompactTextString(m) }
 func (*PackageLocationMetaData) ProtoMessage()    {}
 func (*PackageLocationMetaData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Function_33c6e1841d2624f0, []int{6}
+	return fileDescriptor_225cf355fcfb169c, []int{6}
 }
+
 func (m *PackageLocationMetaData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PackageLocationMetaData.Unmarshal(m, b)
 }
 func (m *PackageLocationMetaData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_PackageLocationMetaData.Marshal(b, m, deterministic)
 }
-func (dst *PackageLocationMetaData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PackageLocationMetaData.Merge(dst, src)
+func (m *PackageLocationMetaData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_PackageLocationMetaData.Merge(m, src)
 }
 func (m *PackageLocationMetaData) XXX_Size() int {
 	return xxx_messageInfo_PackageLocationMetaData.Size(m)
@@ -759,30 +863,32 @@ func (m *PackageLocationMetaData) GetOriginalFileName() string {
 }
 
 type FunctionMetaData struct {
-	FunctionDetails      *FunctionDetails         `protobuf:"bytes,1,opt,name=functionDetails,proto3" json:"functionDetails,omitempty"`
-	PackageLocation      *PackageLocationMetaData `protobuf:"bytes,2,opt,name=packageLocation,proto3" json:"packageLocation,omitempty"`
-	Version              uint64                   `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"`
-	CreateTime           uint64                   `protobuf:"varint,4,opt,name=createTime,proto3" json:"createTime,omitempty"`
-	InstanceStates       map[int32]FunctionState  `protobuf:"bytes,5,rep,name=instanceStates,proto3" json:"instanceStates,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=proto.FunctionState"`
-	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
-	XXX_unrecognized     []byte                   `json:"-"`
-	XXX_sizecache        int32                    `json:"-"`
+	FunctionDetails      *FunctionDetails            `protobuf:"bytes,1,opt,name=functionDetails,proto3" json:"functionDetails,omitempty"`
+	PackageLocation      *PackageLocationMetaData    `protobuf:"bytes,2,opt,name=packageLocation,proto3" json:"packageLocation,omitempty"`
+	Version              uint64                      `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"`
+	CreateTime           uint64                      `protobuf:"varint,4,opt,name=createTime,proto3" json:"createTime,omitempty"`
+	InstanceStates       map[int32]FunctionState     `protobuf:"bytes,5,rep,name=instanceStates,proto3" json:"instanceStates,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=proto.FunctionState"`
+	FunctionAuthSpec     *FunctionAuthenticationSpec `protobuf:"bytes,6,opt,name=functionAuthSpec,proto3" json:"functionAuthSpec,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
+	XXX_unrecognized     []byte                      `json:"-"`
+	XXX_sizecache        int32                       `json:"-"`
 }
 
 func (m *FunctionMetaData) Reset()         { *m = FunctionMetaData{} }
 func (m *FunctionMetaData) String() string { return proto.CompactTextString(m) }
 func (*FunctionMetaData) ProtoMessage()    {}
 func (*FunctionMetaData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Function_33c6e1841d2624f0, []int{7}
+	return fileDescriptor_225cf355fcfb169c, []int{7}
 }
+
 func (m *FunctionMetaData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FunctionMetaData.Unmarshal(m, b)
 }
 func (m *FunctionMetaData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FunctionMetaData.Marshal(b, m, deterministic)
 }
-func (dst *FunctionMetaData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FunctionMetaData.Merge(dst, src)
+func (m *FunctionMetaData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FunctionMetaData.Merge(m, src)
 }
 func (m *FunctionMetaData) XXX_Size() int {
 	return xxx_messageInfo_FunctionMetaData.Size(m)
@@ -828,6 +934,67 @@ func (m *FunctionMetaData) GetInstanceStates() map[int32]FunctionState {
 	return nil
 }
 
+func (m *FunctionMetaData) GetFunctionAuthSpec() *FunctionAuthenticationSpec {
+	if m != nil {
+		return m.FunctionAuthSpec
+	}
+	return nil
+}
+
+type FunctionAuthenticationSpec struct {
+	//*
+	// function authentication related data that the function authentication provider
+	// needs to cache/distribute to all workers support function authentication.
+	// Depending on the function authentication provider implementation, this can be the actual auth credentials
+	// or a pointer to the auth credentials that this function should use
+	Data []byte `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"`
+	//*
+	// classname of the function auth provicer this data is relevant to
+	Provider             string   `protobuf:"bytes,2,opt,name=provider,proto3" json:"provider,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *FunctionAuthenticationSpec) Reset()         { *m = FunctionAuthenticationSpec{} }
+func (m *FunctionAuthenticationSpec) String() string { return proto.CompactTextString(m) }
+func (*FunctionAuthenticationSpec) ProtoMessage()    {}
+func (*FunctionAuthenticationSpec) Descriptor() ([]byte, []int) {
+	return fileDescriptor_225cf355fcfb169c, []int{8}
+}
+
+func (m *FunctionAuthenticationSpec) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_FunctionAuthenticationSpec.Unmarshal(m, b)
+}
+func (m *FunctionAuthenticationSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_FunctionAuthenticationSpec.Marshal(b, m, deterministic)
+}
+func (m *FunctionAuthenticationSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FunctionAuthenticationSpec.Merge(m, src)
+}
+func (m *FunctionAuthenticationSpec) XXX_Size() int {
+	return xxx_messageInfo_FunctionAuthenticationSpec.Size(m)
+}
+func (m *FunctionAuthenticationSpec) XXX_DiscardUnknown() {
+	xxx_messageInfo_FunctionAuthenticationSpec.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_FunctionAuthenticationSpec proto.InternalMessageInfo
+
+func (m *FunctionAuthenticationSpec) GetData() []byte {
+	if m != nil {
+		return m.Data
+	}
+	return nil
+}
+
+func (m *FunctionAuthenticationSpec) GetProvider() string {
+	if m != nil {
+		return m.Provider
+	}
+	return ""
+}
+
 type Instance struct {
 	FunctionMetaData     *FunctionMetaData `protobuf:"bytes,1,opt,name=functionMetaData,proto3" json:"functionMetaData,omitempty"`
 	InstanceId           int32             `protobuf:"varint,2,opt,name=instanceId,proto3" json:"instanceId,omitempty"`
@@ -840,16 +1007,17 @@ func (m *Instance) Reset()         { *m = Instance{} }
 func (m *Instance) String() string { return proto.CompactTextString(m) }
 func (*Instance) ProtoMessage()    {}
 func (*Instance) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Function_33c6e1841d2624f0, []int{8}
+	return fileDescriptor_225cf355fcfb169c, []int{9}
 }
+
 func (m *Instance) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Instance.Unmarshal(m, b)
 }
 func (m *Instance) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Instance.Marshal(b, m, deterministic)
 }
-func (dst *Instance) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Instance.Merge(dst, src)
+func (m *Instance) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Instance.Merge(m, src)
 }
 func (m *Instance) XXX_Size() int {
 	return xxx_messageInfo_Instance.Size(m)
@@ -886,16 +1054,17 @@ func (m *Assignment) Reset()         { *m = Assignment{} }
 func (m *Assignment) String() string { return proto.CompactTextString(m) }
 func (*Assignment) ProtoMessage()    {}
 func (*Assignment) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Function_33c6e1841d2624f0, []int{9}
+	return fileDescriptor_225cf355fcfb169c, []int{10}
 }
+
 func (m *Assignment) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Assignment.Unmarshal(m, b)
 }
 func (m *Assignment) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Assignment.Marshal(b, m, deterministic)
 }
-func (dst *Assignment) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Assignment.Merge(dst, src)
+func (m *Assignment) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Assignment.Merge(m, src)
 }
 func (m *Assignment) XXX_Size() int {
 	return xxx_messageInfo_Assignment.Size(m)
@@ -921,6 +1090,12 @@ func (m *Assignment) GetWorkerId() string {
 }
 
 func init() {
+	proto.RegisterEnum("proto.ProcessingGuarantees", ProcessingGuarantees_name, ProcessingGuarantees_value)
+	proto.RegisterEnum("proto.SubscriptionType", SubscriptionType_name, SubscriptionType_value)
+	proto.RegisterEnum("proto.SubscriptionPosition", SubscriptionPosition_name, SubscriptionPosition_value)
+	proto.RegisterEnum("proto.FunctionState", FunctionState_name, FunctionState_value)
+	proto.RegisterEnum("proto.FunctionDetails_Runtime", FunctionDetails_Runtime_name, FunctionDetails_Runtime_value)
+	proto.RegisterEnum("proto.FunctionDetails_ComponentType", FunctionDetails_ComponentType_name, FunctionDetails_ComponentType_value)
 	proto.RegisterType((*Resources)(nil), "proto.Resources")
 	proto.RegisterType((*RetryDetails)(nil), "proto.RetryDetails")
 	proto.RegisterType((*FunctionDetails)(nil), "proto.FunctionDetails")
@@ -933,93 +1108,102 @@ func init() {
 	proto.RegisterType((*PackageLocationMetaData)(nil), "proto.PackageLocationMetaData")
 	proto.RegisterType((*FunctionMetaData)(nil), "proto.FunctionMetaData")
 	proto.RegisterMapType((map[int32]FunctionState)(nil), "proto.FunctionMetaData.InstanceStatesEntry")
+	proto.RegisterType((*FunctionAuthenticationSpec)(nil), "proto.FunctionAuthenticationSpec")
 	proto.RegisterType((*Instance)(nil), "proto.Instance")
 	proto.RegisterType((*Assignment)(nil), "proto.Assignment")
-	proto.RegisterEnum("proto.ProcessingGuarantees", ProcessingGuarantees_name, ProcessingGuarantees_value)
-	proto.RegisterEnum("proto.SubscriptionType", SubscriptionType_name, SubscriptionType_value)
-	proto.RegisterEnum("proto.FunctionState", FunctionState_name, FunctionState_value)
-	proto.RegisterEnum("proto.FunctionDetails_Runtime", FunctionDetails_Runtime_name, FunctionDetails_Runtime_value)
 }
 
-func init() { proto.RegisterFile("Function.proto", fileDescriptor_Function_33c6e1841d2624f0) }
-
-var fileDescriptor_Function_33c6e1841d2624f0 = []byte{
-	// 1220 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdb, 0x6e, 0xdb, 0x46,
-	0x13, 0x36, 0xad, 0xf3, 0xc8, 0xb6, 0xe8, 0x8d, 0x91, 0x10, 0xce, 0x8f, 0x40, 0xd1, 0xdf, 0x83,
-	0xec, 0x24, 0x42, 0xe1, 0x5e, 0x34, 0xe8, 0x55, 0x15, 0x59, 0x4e, 0x54, 0xd8, 0x96, 0xba, 0x52,
-	0x52, 0xe4, 0xaa, 0xd8, 0xd0, 0x63, 0x65, 0x21, 0x8a, 0x24, 0x76, 0x97, 0x69, 0xdc, 0x07, 0xe8,
-	0x63, 0xf4, 0x49, 0xfa, 0x30, 0x7d, 0x92, 0xa2, 0xd8, 0x25, 0x29, 0x91, 0x94, 0xdc, 0xbb, 0x5e,
-	0x89, 0xf3, 0xcd, 0x71, 0x67, 0xbf, 0x99, 0x15, 0x1c, 0x5c, 0x44, 0xbe, 0xab, 0x78, 0xe0, 0xf7,
-	0x42, 0x11, 0xa8, 0x80, 0x54, 0xcc, 0x4f, 0x67, 0x00, 0x0d, 0x8a, 0x32, 0x88, 0x84, 0x8b, 0x92,
-	0xd8, 0x50, 0x72, 0xc3, 0xc8, 0xb1, 0xda, 0x56, 0xd7, 0xa2, 0xfa, 0x53, 0x23, 0x82, 0x2d, 0x9d,
-	0xdd, 0xb6, 0xd5, 0x2d, 0x51, 0xfd, 0x49, 0x08, 0x94, 0x6f, 0xb8, 0x5c, 0x38, 0x25, 0x03, 0x99,
-	0xef, 0xce, 0x2d, 0xec, 0x51, 0x54, 0xe2, 0xee, 0x1c, 0x15, 0xe3, 0x9e, 0x24, 0xcf, 0xe1, 0x70,
-	0xc9, 0x3e, 0x5f, 0xa1, 0x94, 0x6c, 0x8e, 0x5a, 0xc3, 0x51, 0x9a, 0xa8, 0x15, 0xba, 0xa9, 0x20,
-	0x5d, 0x68, 0xdd, 0x20, 0xbb, 0xb9, 0x44, 0xa5, 0x50, 0xcc, 0x82, 0x90, 0xbb, 0x26, 0x5f, 0x83,
-	0x16, 0xe1, 0xce, 0x1f, 0x15, 0x68, 0xa5, 0xc7, 0x48, 0x73, 0x3d, 0x84, 0xaa, 0x42, 0x9f, 0xf9,
-	0xca, 0x24, 0x68, 0xd0, 0x44, 0x22, 0xff, 0x83, 0x86, 0xcf, 0x96, 0x28, 0x43, 0xe6, 0x62, 0x12,
-	0x6f, 0x0d, 0xe8, 0x53, 0x68, 0xc1, 0x9c, 0xa2, 0x41, 0xcd, 0xb7, 0xf6, 0x70, 0x3d, 0x26, 0xe5,
-	0xb5, 0x56, 0x94, 0x63, 0x8f, 0x15, 0x40, 0x8e, 0xa1, 0xee, 0x05, 0xf3, 0xb8, 0xbc, 0x8a, 0x51,
-	0xae, 0x64, 0x32, 0x86, 0xa3, 0x50, 0x04, 0x2e, 0x4a, 0xc9, 0xfd, 0xf9, 0xeb, 0x88, 0x09, 0xe6,
-	0x2b, 0x44, 0xe9, 0x54, 0xdb, 0x56, 0xf7, 0xe0, 0xec, 0x71, 0xdc, 0xf1, 0xde, 0x64, 0x8b, 0x09,
-	0xdd, 0xea, 0x48, 0x9e, 0x00, 0x44, 0x12, 0xc5, 0x20, 0xf0, 0x6f, 0xf9, 0xdc, 0xa9, 0x99, 0x74,
-	0x19, 0x44, 0xeb, 0x25, 0xba, 0x02, 0x95, 0xbc, 0x62, 0xa1, 0x63, 0xc7, 0xfa, 0x35, 0x42, 0x5e,
-	0x42, 0x4d, 0x44, 0xbe, 0xe2, 0x4b, 0x74, 0xea, 0xa6, 0x86, 0x27, 0x49, 0x0d, 0x85, 0xee, 0xf5,
-	0x68, 0x6c, 0x45, 0x53, 0x73, 0xe2, 0x40, 0x8d, 0x45, 0x2a, 0xe8, 0xbb, 0x0b, 0xa7, 0xd1, 0xb6,
-	0xba, 0x75, 0x9a, 0x8a, 0xa4, 0x0d, 0xcd, 0x90, 0x09, 0xe6, 0x79, 0xe8, 0x71, 0xb9, 0x74, 0xc0,
-	0x5c, 0x67, 0x16, 0x22, 0x27, 0x50, 0x8d, 0x99, 0xe4, 0x34, 0xdb, 0x56, 0xb7, 0x79, 0x76, 0x98,
-	0x24, 0x9d, 0x1a, 0x70, 0x1a, 0xa2, 0x4b, 0x13, 0x03, 0xf2, 0x7f, 0x28, 0x4b, 0xee, 0x2f, 0x9c,
-	0x3d, 0x63, 0xd8, 0x4a, 0x0d, 0xb9, 0xbf, 0x30, 0x66, 0x46, 0x49, 0x7a, 0xd0, 0x10, 0x29, 0x37,
-	0x9d, 0x7d, 0x63, 0x69, 0x27, 0x96, 0x2b, 0xce, 0xd2, 0xb5, 0x89, 0xee, 0x4a, 0xc8, 0xdc, 0x05,
-	0x9b, 0xe3, 0x5b, 0xe1, 0x39, 0x07, 0x71, 0x57, 0xd6, 0x08, 0xf9, 0x0e, 0xf6, 0x44, 0x86, 0xa6,
-	0x4e, 0xcb, 0x84, 0x7c, 0xb0, 0x0a, 0xb9, 0x56, 0xd1, 0x9c, 0x61, 0xe7, 0x6b, 0xa8, 0x25, 0x8d,
-	0x22, 0x75, 0x28, 0xff, 0xd8, 0x7f, 0xd7, 0xb7, 0x77, 0x08, 0x40, 0x75, 0xf2, 0x7e, 0xf6, 0x66,
-	0x7c, 0x6d, 0x5b, 0xa4, 0x0a, 0xbb, 0xaf, 0xc7, 0x76, 0xa9, 0xf3, 0xb7, 0x05, 0x7b, 0x83, 0xc0,
-	0x97, 0xd1, 0x12, 0x85, 0x3e, 0x88, 0xb9, 0x28, 0xf7, 0x23, 0x2e, 0xd9, 0xec, 0x2e, 0xc4, 0x84,
-	0xa1, 0x19, 0x84, 0x7c, 0x05, 0x07, 0x12, 0xc5, 0x0d, 0x0e, 0x56, 0xc4, 0x8b, 0xa9, 0x5a, 0x40,
-	0xb5, 0x1d, 0x97, 0x14, 0xe7, 0xf8, 0x79, 0xc2, 0xf4, 0x3c, 0xf8, 0x86, 0xb9, 0x75, 0x5a, 0x40,
-	0xc9, 0x14, 0x0e, 0x05, 0xba, 0xc8, 0x3f, 0xa1, 0xf8, 0x29, 0xc2, 0x08, 0xa7, 0xfc, 0xb7, 0x98,
-	0xcb, 0xcd, 0xb3, 0x2f, 0x93, 0x73, 0x66, 0xeb, 0xeb, 0xd1, 0xa2, 0x31, 0xdd, 0xf4, 0x3f, 0x3e,
-	0x81, 0xc3, 0x0d, 0x3b, 0x72, 0x04, 0x95, 0x4f, 0xcc, 0x8b, 0x30, 0x99, 0xeb, 0x58, 0xe8, 0xfc,
-	0x59, 0x01, 0x58, 0x5f, 0x77, 0x7e, 0xa4, 0xac, 0xe2, 0x48, 0x39, 0x50, 0x73, 0x0d, 0x9f, 0x65,
-	0x72, 0xea, 0x54, 0x24, 0x5f, 0xc0, 0xbe, 0xba, 0x0b, 0x33, 0x5d, 0x89, 0x27, 0x2e, 0x0f, 0x92,
-	0x01, 0xd8, 0x32, 0xfa, 0x20, 0x5d, 0xc1, 0x43, 0xcd, 0x69, 0xd3, 0xe2, 0x92, 0xa1, 0xfb, 0xa3,
-	0x94, 0x50, 0x05, 0x35, 0xdd, 0x70, 0x20, 0x1c, 0x1e, 0x2a, 0x3d, 0xc4, 0x72, 0x16, 0x4c, 0x51,
-	0x9c, 0x67, 0x72, 0x96, 0xdb, 0xa5, 0x6e, 0xf3, 0xec, 0xc5, 0x06, 0x89, 0x7b, 0xb3, 0xad, 0xf6,
-	0x43, 0x5f, 0x89, 0xbb, 0x57, 0xbb, 0x8e, 0x45, 0xef, 0x09, 0x48, 0xfa, 0x00, 0xdc, 0x0f, 0x23,
-	0xa5, 0x83, 0x48, 0x07, 0x4c, 0xf8, 0xa7, 0x9b, 0xe1, 0x47, 0x2b, 0x1b, 0x13, 0x92, 0x66, 0x9c,
-	0x74, 0x43, 0x35, 0x0d, 0x83, 0x48, 0x5d, 0xc5, 0xeb, 0xa5, 0x4c, 0xd7, 0x00, 0xe9, 0xc2, 0x7e,
-	0x9c, 0x3a, 0x25, 0x89, 0xd9, 0x1c, 0xa6, 0xa6, 0xbc, 0x42, 0xb7, 0xfe, 0x43, 0xc4, 0x3d, 0xc5,
-	0x7d, 0xb3, 0x20, 0x1a, 0x34, 0x15, 0xc9, 0x69, 0xbe, 0xa9, 0xa6, 0x13, 0x0d, 0x63, 0xb2, 0x81,
-	0x93, 0x6f, 0xe0, 0x81, 0xeb, 0x21, 0xf3, 0xa3, 0x30, 0xdb, 0x68, 0x33, 0xfd, 0x75, 0xba, 0x4d,
-	0x75, 0x3c, 0x82, 0xc7, 0xff, 0xd2, 0x3d, 0xfd, 0xdc, 0x2c, 0xf0, 0x2e, 0x61, 0x8a, 0xfe, 0x5c,
-	0xd3, 0x2c, 0x66, 0x48, 0x2c, 0x7c, 0xbf, 0xfb, 0xd2, 0x3a, 0xa6, 0xd0, 0x2a, 0x74, 0x6a, 0x8b,
-	0xfb, 0x49, 0xd6, 0x7d, 0x3d, 0xeb, 0xd9, 0x19, 0xc8, 0xc4, 0xec, 0xfc, 0x65, 0x41, 0x3d, 0x5d,
-	0x42, 0xff, 0x31, 0x79, 0x8f, 0xa0, 0x62, 0xae, 0x24, 0x79, 0x82, 0x62, 0x21, 0xd9, 0x07, 0x79,
-	0x16, 0xa6, 0xfb, 0x20, 0x4b, 0xa5, 0xcc, 0xfd, 0x55, 0xf3, 0xf7, 0x97, 0xdf, 0x38, 0xb5, 0xe2,
-	0xc6, 0xe9, 0xcc, 0xe1, 0xd1, 0x24, 0x5e, 0x89, 0x97, 0x81, 0xcb, 0xf4, 0xa5, 0x5c, 0xa1, 0x62,
-	0xe7, 0x4c, 0xb1, 0x78, 0xc3, 0x1b, 0xd5, 0x84, 0xa9, 0x8f, 0xc9, 0x91, 0xb3, 0x90, 0x26, 0x47,
-	0x20, 0xf8, 0x9c, 0xfb, 0xcc, 0xbb, 0xe0, 0x1e, 0x66, 0x16, 0xd6, 0x06, 0xde, 0xf9, 0xbd, 0x04,
-	0x76, 0xfa, 0xdc, 0xac, 0x52, 0xfc, 0x00, 0xad, 0xdb, 0xfc, 0x13, 0x64, 0xd2, 0x34, 0xcf, 0x1e,
-	0x6e, 0x7f, 0xa0, 0x68, 0xd1, 0x9c, 0xbc, 0x81, 0x56, 0x98, 0xaf, 0x3f, 0xb9, 0xdb, 0xf4, 0x89,
-	0xbb, 0xe7, 0x74, 0xb4, 0xe8, 0xa6, 0x7b, 0xf8, 0x09, 0x85, 0xd4, 0x11, 0x4a, 0x66, 0x92, 0x52,
-	0x51, 0xf7, 0xd0, 0x15, 0xc8, 0x14, 0xce, 0x78, 0x72, 0x03, 0x65, 0x9a, 0x41, 0xc8, 0x14, 0x0e,
-	0xb8, 0x2f, 0x15, 0xf3, 0x5d, 0x9c, 0x2a, 0xa6, 0x50, 0x3a, 0x15, 0x33, 0xcc, 0xcf, 0x0a, 0x87,
-	0x48, 0x73, 0xf7, 0x46, 0x39, 0xeb, 0x78, 0xac, 0x0b, 0x21, 0x8e, 0x7f, 0x86, 0x07, 0x5b, 0xcc,
-	0xb2, 0x9c, 0xae, 0xc4, 0x9c, 0x3e, 0xcd, 0x72, 0xfa, 0xe0, 0xec, 0xa8, 0x90, 0xd4, 0x38, 0x67,
-	0x49, 0x1d, 0x40, 0x3d, 0x0d, 0xac, 0x57, 0xe6, 0x6d, 0xa1, 0xb8, 0xe4, 0x02, 0x1e, 0xdd, 0x53,
-	0x3b, 0xdd, 0x70, 0xd0, 0xed, 0x49, 0x6b, 0x1f, 0xdd, 0x98, 0x2a, 0x2a, 0x34, 0x83, 0x74, 0xde,
-	0x02, 0xf4, 0xa5, 0xe4, 0x73, 0x7f, 0x89, 0xbe, 0x22, 0xcf, 0xa0, 0x9e, 0xea, 0x92, 0x54, 0xe9,
-	0x73, 0x9f, 0x56, 0x45, 0x57, 0x06, 0xfa, 0x5f, 0xd6, 0xaf, 0x81, 0x58, 0xa0, 0x48, 0x02, 0x37,
-	0xe8, 0x4a, 0x3e, 0x1d, 0xc3, 0xd1, 0xb6, 0xbf, 0x50, 0xc4, 0x86, 0xbd, 0xfe, 0xec, 0x72, 0xd8,
-	0x9f, 0xce, 0x7e, 0x19, 0x5f, 0x0f, 0x86, 0xf6, 0x0e, 0x69, 0x41, 0xb3, 0x3f, 0xbb, 0x1a, 0xa7,
-	0x80, 0x45, 0x8e, 0xc0, 0x1e, 0x5e, 0x5c, 0x0c, 0x07, 0xb3, 0xd1, 0xbb, 0xe1, 0xe5, 0xfb, 0x18,
-	0xdd, 0x3d, 0x7d, 0x0e, 0x76, 0xf1, 0x81, 0xd0, 0xaf, 0xfa, 0xf4, 0x4d, 0x9f, 0x0e, 0xcf, 0xed,
-	0x1d, 0xb2, 0x07, 0xf5, 0x8b, 0xfe, 0xe8, 0x72, 0xfc, 0x6e, 0x48, 0x6d, 0xeb, 0xf4, 0x04, 0xf6,
-	0x73, 0x2d, 0x26, 0x4d, 0xa8, 0xd1, 0xb7, 0xd7, 0xd7, 0xa3, 0xeb, 0xd7, 0xf6, 0x8e, 0x16, 0xa6,
-	0xb3, 0xf1, 0x64, 0x32, 0x3c, 0xb7, 0xad, 0x57, 0x2f, 0xe0, 0x69, 0x20, 0xe6, 0x3d, 0x16, 0x32,
-	0xf7, 0x23, 0xf6, 0xc2, 0xc8, 0x93, 0x4c, 0xf4, 0xd2, 0x36, 0xca, 0xf8, 0xf4, 0xaf, 0xea, 0x69,
-	0xb4, 0x0f, 0x55, 0x03, 0x7c, 0xfb, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfe, 0xa8, 0xa5, 0x5f,
-	0xa3, 0x0b, 0x00, 0x00,
+func init() { proto.RegisterFile("Function.proto", fileDescriptor_225cf355fcfb169c) }
+
+var fileDescriptor_225cf355fcfb169c = []byte{
+	// 1410 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4f, 0x6f, 0xdb, 0x36,
+	0x14, 0x8f, 0xe2, 0xf8, 0xdf, 0xb3, 0x13, 0x2b, 0x8c, 0xd1, 0x0a, 0xe9, 0x50, 0xa4, 0x5e, 0xb7,
+	0x39, 0x69, 0x6b, 0x14, 0xd9, 0x61, 0xc5, 0x4e, 0x75, 0x1d, 0xa7, 0x75, 0xeb, 0xd8, 0x1e, 0xad,
+	0xb4, 0xe8, 0x69, 0x60, 0x15, 0xc6, 0x21, 0x2c, 0x4b, 0x02, 0x49, 0x65, 0xcd, 0xce, 0xbb, 0xee,
+	0xe3, 0xed, 0xbe, 0x4f, 0x32, 0x0c, 0xa4, 0x24, 0x5b, 0x92, 0x9d, 0xdd, 0x76, 0x92, 0xde, 0xef,
+	0xfd, 0x23, 0x7f, 0x7c, 0xef, 0x91, 0xb0, 0x77, 0x1e, 0x7a, 0x8e, 0x64, 0xbe, 0xd7, 0x09, 0xb8,
+	0x2f, 0x7d, 0x54, 0xd4, 0x9f, 0x56, 0x0f, 0xaa, 0x98, 0x0a, 0x3f, 0xe4, 0x0e, 0x15, 0xc8, 0x84,
+	0x82, 0x13, 0x84, 0x96, 0x71, 0x64, 0xb4, 0x0d, 0xac, 0x7e, 0x15, 0xc2, 0xc9, 0xc2, 0xda, 0x3e,
+	0x32, 0xda, 0x05, 0xac, 0x7e, 0x11, 0x82, 0x9d, 0x2b, 0x26, 0xe6, 0x56, 0x41, 0x43, 0xfa, 0xbf,
+	0x75, 0x0d, 0x75, 0x4c, 0x25, 0xbf, 0x3b, 0xa3, 0x92, 0x30, 0x57, 0xa0, 0xe7, 0xb0, 0xbf, 0x20,
+	0x5f, 0x2f, 0xa8, 0x10, 0x64, 0x46, 0x95, 0x86, 0x51, 0xa1, 0xa3, 0x16, 0xf1, 0xba, 0x02, 0xb5,
+	0xa1, 0x71, 0x45, 0xc9, 0xd5, 0x90, 0x4a, 0x49, 0xb9, 0xed, 0x07, 0xcc, 0xd1, 0xf9, 0xaa, 0x38,
+	0x0f, 0xb7, 0xfe, 0x28, 0x43, 0x23, 0xd9, 0x46, 0x92, 0xeb, 0x01, 0x94, 0x24, 0xf5, 0x88, 0x27,
+	0x75, 0x82, 0x2a, 0x8e, 0x25, 0xf4, 0x0d, 0x54, 0x3d, 0xb2, 0xa0, 0x22, 0x20, 0x0e, 0x8d, 0xe3,
+	0xad, 0x00, 0xb5, 0x0b, 0x25, 0xe8, 0x5d, 0x54, 0xb1, 0xfe, 0x57, 0x1e, 0x8e, 0x4b, 0x84, 0x18,
+	0x29, 0xc5, 0x4e, 0xe4, 0xb1, 0x04, 0xd0, 0x21, 0x54, 0x5c, 0x7f, 0x16, 0x2d, 0xaf, 0xa8, 0x95,
+	0x4b, 0x19, 0x8d, 0xa1, 0x19, 0x70, 0xdf, 0xa1, 0x42, 0x30, 0x6f, 0xf6, 0x36, 0x24, 0x9c, 0x78,
+	0x92, 0x52, 0x61, 0x95, 0x8e, 0x8c, 0xf6, 0xde, 0xe9, 0xa3, 0x88, 0xf1, 0xce, 0x64, 0x83, 0x09,
+	0xde, 0xe8, 0x88, 0x1e, 0x03, 0x84, 0x82, 0xf2, 0x9e, 0xef, 0x5d, 0xb3, 0x99, 0x55, 0xd6, 0xe9,
+	0x52, 0x88, 0xd2, 0x0b, 0xea, 0x70, 0x2a, 0xc5, 0x05, 0x09, 0x2c, 0x33, 0xd2, 0xaf, 0x10, 0xf4,
+	0x0a, 0xca, 0x3c, 0xf4, 0x24, 0x5b, 0x50, 0xab, 0xa2, 0xd7, 0xf0, 0x38, 0x5e, 0x43, 0x8e, 0xbd,
+	0x0e, 0x8e, 0xac, 0x70, 0x62, 0x8e, 0x2c, 0x28, 0x93, 0x50, 0xfa, 0x5d, 0x67, 0x6e, 0x55, 0x8f,
+	0x8c, 0x76, 0x05, 0x27, 0x22, 0x3a, 0x82, 0x5a, 0x40, 0x38, 0x71, 0x5d, 0xea, 0x32, 0xb1, 0xb0,
+	0x40, 0x1f, 0x67, 0x1a, 0x42, 0xc7, 0x50, 0x8a, 0x2a, 0xc9, 0xaa, 0x1d, 0x19, 0xed, 0xda, 0xe9,
+	0x7e, 0x9c, 0x74, 0xaa, 0xc1, 0x69, 0x40, 0x1d, 0x1c, 0x1b, 0xa0, 0x6f, 0x61, 0x47, 0x30, 0x6f,
+	0x6e, 0xd5, 0xb5, 0x61, 0x23, 0x31, 0x64, 0xde, 0x5c, 0x9b, 0x69, 0x25, 0xea, 0x40, 0x95, 0x27,
+	0xb5, 0x69, 0xed, 0x6a, 0x4b, 0x33, 0xb6, 0x5c, 0xd6, 0x2c, 0x5e, 0x99, 0x28, 0x56, 0x02, 0xe2,
+	0xcc, 0xc9, 0x8c, 0x5e, 0x72, 0xd7, 0xda, 0x8b, 0x58, 0x59, 0x21, 0xe8, 0x27, 0xa8, 0xf3, 0x54,
+	0x99, 0x5a, 0x0d, 0x1d, 0xf2, 0x60, 0x19, 0x72, 0xa5, 0xc2, 0x19, 0x43, 0xd4, 0x82, 0x7a, 0xcc,
+	0xcf, 0xb9, 0x4b, 0x66, 0xc2, 0xda, 0xd7, 0xa1, 0x33, 0x18, 0x7a, 0x0f, 0xbb, 0x8e, 0xbf, 0x08,
+	0x7c, 0x8f, 0x7a, 0xd2, 0xbe, 0x0b, 0xa8, 0x85, 0x34, 0xf1, 0x4f, 0xef, 0x21, 0xbe, 0x97, 0xb6,
+	0xc5, 0x59, 0x57, 0x74, 0x0a, 0x4d, 0x27, 0x14, 0xd2, 0x5f, 0xc4, 0xc7, 0x33, 0x0e, 0x94, 0xab,
+	0xb0, 0x0e, 0x74, 0xde, 0x8d, 0xba, 0xd6, 0x0f, 0x50, 0x8e, 0x11, 0x54, 0x81, 0x9d, 0xf7, 0xdd,
+	0x8f, 0x5d, 0x73, 0x0b, 0x01, 0x94, 0x26, 0x9f, 0xed, 0x77, 0xe3, 0x91, 0x69, 0xa0, 0x12, 0x6c,
+	0xbf, 0x1d, 0x9b, 0x85, 0xd6, 0x6b, 0xd8, 0xcd, 0x24, 0x47, 0x35, 0x28, 0x5f, 0x8e, 0x3e, 0x8c,
+	0xc6, 0x9f, 0x46, 0xe6, 0x16, 0xaa, 0x43, 0xe5, 0xfc, 0x72, 0xd4, 0xb3, 0x07, 0xda, 0x07, 0xa0,
+	0x34, 0x1d, 0x5f, 0xe2, 0x5e, 0xdf, 0xdc, 0x56, 0x51, 0xa7, 0x83, 0xd1, 0x07, 0xb3, 0xd0, 0xfa,
+	0xc7, 0x80, 0x7a, 0xcf, 0xf7, 0x44, 0xb8, 0xa0, 0x5c, 0x1d, 0x97, 0x2e, 0x47, 0xe7, 0x86, 0x2e,
+	0x88, 0xde, 0xb8, 0x11, 0x97, 0xe3, 0x12, 0x41, 0xdf, 0xc3, 0x9e, 0xa0, 0xfc, 0x8a, 0xf6, 0x96,
+	0xed, 0x15, 0x35, 0x64, 0x0e, 0x55, 0x76, 0x4c, 0x60, 0x3a, 0xa3, 0x5f, 0x27, 0x44, 0x75, 0xbd,
+	0xa7, 0xfb, 0xb3, 0x82, 0x73, 0x28, 0x9a, 0xc2, 0x3e, 0xa7, 0x0e, 0x65, 0xb7, 0x94, 0xff, 0x12,
+	0xd2, 0x90, 0x4e, 0xd9, 0xef, 0x51, 0xc7, 0xd6, 0x4e, 0xbf, 0x8b, 0xf9, 0x4e, 0xaf, 0xaf, 0x83,
+	0xf3, 0xc6, 0x78, 0xdd, 0xff, 0xf0, 0x18, 0xf6, 0xd7, 0xec, 0x50, 0x13, 0x8a, 0xb7, 0xc4, 0x0d,
+	0x69, 0x3c, 0xbd, 0x22, 0xa1, 0xf5, 0x67, 0x09, 0x60, 0x55, 0xd4, 0xd9, 0xc1, 0x61, 0xe4, 0x07,
+	0x87, 0x05, 0x65, 0x47, 0x77, 0xad, 0x88, 0x77, 0x9d, 0x88, 0xe8, 0x29, 0xec, 0xca, 0xbb, 0x20,
+	0xc5, 0x4a, 0x34, 0x57, 0xb2, 0x20, 0xea, 0x81, 0x29, 0xc2, 0x2f, 0xc2, 0xe1, 0x4c, 0x9f, 0xb4,
+	0xa6, 0xb8, 0xa0, 0x6b, 0xeb, 0x61, 0xd2, 0x36, 0x39, 0x35, 0x5e, 0x73, 0x40, 0x0c, 0x1e, 0x48,
+	0x35, 0xaa, 0x84, 0xed, 0x4f, 0x29, 0x3f, 0x4b, 0xe5, 0xdc, 0x39, 0x2a, 0xb4, 0x6b, 0xa7, 0x2f,
+	0xd6, 0x5a, 0xb5, 0x63, 0x6f, 0xb4, 0xef, 0x7b, 0x92, 0xdf, 0xbd, 0xd9, 0xb6, 0x0c, 0x7c, 0x4f,
+	0x40, 0xd4, 0x05, 0x60, 0x5e, 0x10, 0x4a, 0x15, 0x44, 0x58, 0xa0, 0xc3, 0x3f, 0x59, 0x0f, 0x3f,
+	0x58, 0xda, 0xe8, 0x90, 0x38, 0xe5, 0xa4, 0x08, 0x55, 0x85, 0xec, 0x87, 0xf2, 0x22, 0x1a, 0xa2,
+	0x3b, 0x78, 0x05, 0xa0, 0x36, 0xec, 0x46, 0xa9, 0x93, 0x22, 0xd1, 0xf3, 0x51, 0xaf, 0x29, 0xab,
+	0x50, 0xd4, 0x7f, 0x09, 0x99, 0x2b, 0x99, 0xa7, 0xc7, 0x60, 0x15, 0x27, 0x22, 0x3a, 0xc9, 0x92,
+	0xaa, 0x99, 0xa8, 0x6a, 0x93, 0x35, 0x1c, 0xbd, 0x84, 0x03, 0xc7, 0xa5, 0xc4, 0x0b, 0x83, 0x34,
+	0xd1, 0x7a, 0xc6, 0x55, 0xf0, 0x26, 0x95, 0xba, 0x0f, 0xd2, 0x51, 0x26, 0xbe, 0x60, 0xda, 0xa5,
+	0x9e, 0xb9, 0x0f, 0xa6, 0x1b, 0x4c, 0xf0, 0x46, 0xc7, 0xc3, 0x01, 0x3c, 0xfa, 0x8f, 0xe3, 0x50,
+	0xb7, 0xf4, 0x9c, 0xde, 0xc5, 0xa5, 0xa7, 0x7e, 0x57, 0x75, 0x1b, 0x95, 0x5c, 0x24, 0xfc, 0xbc,
+	0xfd, 0xca, 0x38, 0xc4, 0xd0, 0xc8, 0x51, 0xbf, 0xc1, 0xfd, 0x38, 0xed, 0xbe, 0x1a, 0x91, 0xe9,
+	0xa6, 0x4a, 0xc5, 0x6c, 0xfd, 0x6d, 0x40, 0x25, 0x99, 0xdd, 0xff, 0x73, 0x37, 0x34, 0xa1, 0xa8,
+	0xcf, 0x38, 0xbe, 0xb9, 0x23, 0x21, 0x1e, 0x30, 0xd9, 0xb2, 0x4e, 0x06, 0x4c, 0xba, 0x36, 0x53,
+	0x05, 0x51, 0xca, 0x16, 0x44, 0x76, 0x84, 0x95, 0xf3, 0x23, 0xac, 0x35, 0x83, 0x87, 0x93, 0xe8,
+	0x26, 0x19, 0xfa, 0x0e, 0x51, 0x87, 0x72, 0x41, 0x25, 0x39, 0x23, 0x92, 0x44, 0x17, 0xa3, 0x56,
+	0x4d, 0x88, 0xbc, 0x89, 0xb7, 0x9c, 0x86, 0x54, 0xb5, 0xf9, 0x9c, 0xcd, 0x98, 0x47, 0xdc, 0x73,
+	0xe6, 0xd2, 0xd4, 0x04, 0x5c, 0xc3, 0x5b, 0x7f, 0x15, 0xc0, 0x4c, 0x2e, 0x8b, 0x65, 0x8a, 0xd7,
+	0xd0, 0xb8, 0xce, 0x5e, 0x20, 0x3a, 0x4d, 0xed, 0xf4, 0xc1, 0xe6, 0xeb, 0x05, 0xe7, 0xcd, 0xd1,
+	0x3b, 0x68, 0x04, 0xd9, 0xf5, 0xc7, 0x67, 0x9b, 0xbc, 0x0c, 0xee, 0xd9, 0x1d, 0xce, 0xbb, 0x29,
+	0x0e, 0x6f, 0x29, 0x17, 0x2a, 0x42, 0x41, 0xb7, 0x66, 0x22, 0x2a, 0x0e, 0x1d, 0x4e, 0x89, 0xa4,
+	0x36, 0x8b, 0x4f, 0x60, 0x07, 0xa7, 0x10, 0x34, 0x85, 0x3d, 0xe6, 0x09, 0x49, 0x3c, 0x87, 0x4e,
+	0x25, 0x91, 0x54, 0x58, 0x45, 0x3d, 0x1d, 0x9e, 0xe5, 0x36, 0x91, 0xe4, 0xee, 0x0c, 0x32, 0xd6,
+	0xd1, 0x9c, 0xc8, 0x85, 0x40, 0x17, 0x60, 0x26, 0x7b, 0xed, 0x86, 0xf2, 0x46, 0x95, 0xa0, 0x3e,
+	0xdb, 0xd5, 0xd0, 0x39, 0x4f, 0xa9, 0xa9, 0x27, 0x59, 0xb4, 0x0f, 0x5d, 0xc3, 0x6b, 0xae, 0x87,
+	0x9f, 0xe0, 0x60, 0x43, 0xd6, 0x74, 0x8b, 0x14, 0xa3, 0x16, 0x39, 0x49, 0xb7, 0xc8, 0xde, 0x69,
+	0x33, 0x97, 0x4c, 0x3b, 0xa7, 0x7b, 0x64, 0x08, 0x87, 0xf7, 0x2f, 0x44, 0xbf, 0xaa, 0x89, 0x24,
+	0x3a, 0x41, 0x1d, 0xeb, 0x7f, 0xf5, 0xe2, 0x0c, 0xb8, 0x7f, 0xcb, 0xae, 0x28, 0x8f, 0xab, 0x65,
+	0x29, 0xb7, 0x7c, 0xa8, 0x24, 0xcb, 0x54, 0x17, 0xc4, 0x75, 0x8e, 0xb9, 0xb8, 0x3a, 0x1e, 0xde,
+	0x43, 0x2c, 0x5e, 0x73, 0x50, 0x67, 0x97, 0x10, 0x3b, 0xb8, 0xd2, 0xe9, 0x8a, 0x38, 0x85, 0xb4,
+	0x2e, 0x01, 0xba, 0x42, 0xb0, 0x99, 0xb7, 0xa0, 0x9e, 0x44, 0xcf, 0xa0, 0x92, 0xe8, 0xe2, 0x54,
+	0xc9, 0x13, 0x2e, 0x59, 0x15, 0x5e, 0x1a, 0xa8, 0x7d, 0xfc, 0xe6, 0xf3, 0x39, 0xe5, 0x71, 0xe0,
+	0x2a, 0x5e, 0xca, 0x27, 0x63, 0x68, 0x6e, 0x7a, 0x16, 0x23, 0x13, 0xea, 0x5d, 0x7b, 0xd8, 0xef,
+	0x4e, 0xed, 0x5f, 0xc7, 0xa3, 0x5e, 0xdf, 0xdc, 0x42, 0x0d, 0xa8, 0x75, 0xed, 0x8b, 0x71, 0x02,
+	0x18, 0xa8, 0x09, 0x66, 0xff, 0xfc, 0xbc, 0xdf, 0xb3, 0x07, 0x1f, 0xfb, 0xc3, 0xcf, 0x11, 0xba,
+	0x7d, 0xf2, 0x1c, 0xcc, 0xfc, 0x75, 0xa8, 0x5f, 0x31, 0xef, 0xba, 0xb8, 0x7f, 0x16, 0xbf, 0x6f,
+	0xba, 0x83, 0xe1, 0xf8, 0x63, 0x1f, 0x9b, 0xc6, 0xc9, 0x4b, 0x68, 0x6e, 0x9a, 0xc2, 0xca, 0x63,
+	0xd8, 0xb5, 0xfb, 0x53, 0x3b, 0xf2, 0xe8, 0x77, 0xf1, 0x70, 0xa0, 0x24, 0xe3, 0xe4, 0x18, 0x76,
+	0x33, 0x47, 0xac, 0x5e, 0x4f, 0xf8, 0x72, 0x34, 0x1a, 0x8c, 0xde, 0x9a, 0x5b, 0x4a, 0x98, 0xda,
+	0xe3, 0xc9, 0xa4, 0x7f, 0x66, 0x1a, 0x6f, 0x5e, 0xc0, 0x13, 0x9f, 0xcf, 0x3a, 0x24, 0x20, 0xce,
+	0x0d, 0xed, 0x04, 0xa1, 0x2b, 0x08, 0xef, 0x24, 0xc4, 0x8b, 0x88, 0xaf, 0x37, 0x95, 0x24, 0xda,
+	0x97, 0x92, 0x06, 0x7e, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0xb1, 0xfd, 0x7e, 0x68, 0xa9, 0x0d,
+	0x00, 0x00,
 }
diff --git a/pulsar-function-go/pb/InstanceCommunication.pb.go b/pulsar-function-go/pb/InstanceCommunication.pb.go
index a0c36e07050f7..e8a8aba08a38c 100644
--- a/pulsar-function-go/pb/InstanceCommunication.pb.go
+++ b/pulsar-function-go/pb/InstanceCommunication.pb.go
@@ -17,15 +17,19 @@
 // under the License.
 //
 
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: InstanceCommunication.proto
+package api
 
-package pb
+import (
+	context "context"
+	fmt "fmt"
+	math "math"
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/ptypes/empty"
+	proto "github.com/golang/protobuf/proto"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -36,7 +40,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type FunctionStatus struct {
 	Running          bool   `protobuf:"varint,1,opt,name=running,proto3" json:"running,omitempty"`
@@ -75,16 +79,17 @@ func (m *FunctionStatus) Reset()         { *m = FunctionStatus{} }
 func (m *FunctionStatus) String() string { return proto.CompactTextString(m) }
 func (*FunctionStatus) ProtoMessage()    {}
 func (*FunctionStatus) Descriptor() ([]byte, []int) {
-	return fileDescriptor_InstanceCommunication_5d8f1fc97439e9d3, []int{0}
+	return fileDescriptor_93ee26d3627c79da, []int{0}
 }
+
 func (m *FunctionStatus) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FunctionStatus.Unmarshal(m, b)
 }
 func (m *FunctionStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FunctionStatus.Marshal(b, m, deterministic)
 }
-func (dst *FunctionStatus) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FunctionStatus.Merge(dst, src)
+func (m *FunctionStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FunctionStatus.Merge(m, src)
 }
 func (m *FunctionStatus) XXX_Size() int {
 	return xxx_messageInfo_FunctionStatus.Size(m)
@@ -226,16 +231,17 @@ func (m *FunctionStatus_ExceptionInformation) Reset()         { *m = FunctionSta
 func (m *FunctionStatus_ExceptionInformation) String() string { return proto.CompactTextString(m) }
 func (*FunctionStatus_ExceptionInformation) ProtoMessage()    {}
 func (*FunctionStatus_ExceptionInformation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_InstanceCommunication_5d8f1fc97439e9d3, []int{0, 0}
+	return fileDescriptor_93ee26d3627c79da, []int{0, 0}
 }
+
 func (m *FunctionStatus_ExceptionInformation) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FunctionStatus_ExceptionInformation.Unmarshal(m, b)
 }
 func (m *FunctionStatus_ExceptionInformation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FunctionStatus_ExceptionInformation.Marshal(b, m, deterministic)
 }
-func (dst *FunctionStatus_ExceptionInformation) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FunctionStatus_ExceptionInformation.Merge(dst, src)
+func (m *FunctionStatus_ExceptionInformation) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FunctionStatus_ExceptionInformation.Merge(m, src)
 }
 func (m *FunctionStatus_ExceptionInformation) XXX_Size() int {
 	return xxx_messageInfo_FunctionStatus_ExceptionInformation.Size(m)
@@ -273,16 +279,17 @@ func (m *FunctionStatusList) Reset()         { *m = FunctionStatusList{} }
 func (m *FunctionStatusList) String() string { return proto.CompactTextString(m) }
 func (*FunctionStatusList) ProtoMessage()    {}
 func (*FunctionStatusList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_InstanceCommunication_5d8f1fc97439e9d3, []int{1}
+	return fileDescriptor_93ee26d3627c79da, []int{1}
 }
+
 func (m *FunctionStatusList) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_FunctionStatusList.Unmarshal(m, b)
 }
 func (m *FunctionStatusList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_FunctionStatusList.Marshal(b, m, deterministic)
 }
-func (dst *FunctionStatusList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_FunctionStatusList.Merge(dst, src)
+func (m *FunctionStatusList) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_FunctionStatusList.Merge(m, src)
 }
 func (m *FunctionStatusList) XXX_Size() int {
 	return xxx_messageInfo_FunctionStatusList.Size(m)
@@ -336,16 +343,17 @@ func (m *MetricsData) Reset()         { *m = MetricsData{} }
 func (m *MetricsData) String() string { return proto.CompactTextString(m) }
 func (*MetricsData) ProtoMessage()    {}
 func (*MetricsData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_InstanceCommunication_5d8f1fc97439e9d3, []int{2}
+	return fileDescriptor_93ee26d3627c79da, []int{2}
 }
+
 func (m *MetricsData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MetricsData.Unmarshal(m, b)
 }
 func (m *MetricsData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_MetricsData.Marshal(b, m, deterministic)
 }
-func (dst *MetricsData) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MetricsData.Merge(dst, src)
+func (m *MetricsData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_MetricsData.Merge(m, src)
 }
 func (m *MetricsData) XXX_Size() int {
 	return xxx_messageInfo_MetricsData.Size(m)
@@ -451,16 +459,17 @@ func (m *HealthCheckResult) Reset()         { *m = HealthCheckResult{} }
 func (m *HealthCheckResult) String() string { return proto.CompactTextString(m) }
 func (*HealthCheckResult) ProtoMessage()    {}
 func (*HealthCheckResult) Descriptor() ([]byte, []int) {
-	return fileDescriptor_InstanceCommunication_5d8f1fc97439e9d3, []int{3}
+	return fileDescriptor_93ee26d3627c79da, []int{3}
 }
+
 func (m *HealthCheckResult) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_HealthCheckResult.Unmarshal(m, b)
 }
 func (m *HealthCheckResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_HealthCheckResult.Marshal(b, m, deterministic)
 }
-func (dst *HealthCheckResult) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HealthCheckResult.Merge(dst, src)
+func (m *HealthCheckResult) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_HealthCheckResult.Merge(m, src)
 }
 func (m *HealthCheckResult) XXX_Size() int {
 	return xxx_messageInfo_HealthCheckResult.Size(m)
@@ -489,16 +498,17 @@ func (m *Metrics) Reset()         { *m = Metrics{} }
 func (m *Metrics) String() string { return proto.CompactTextString(m) }
 func (*Metrics) ProtoMessage()    {}
 func (*Metrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_InstanceCommunication_5d8f1fc97439e9d3, []int{4}
+	return fileDescriptor_93ee26d3627c79da, []int{4}
 }
+
 func (m *Metrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Metrics.Unmarshal(m, b)
 }
 func (m *Metrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Metrics.Marshal(b, m, deterministic)
 }
-func (dst *Metrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Metrics.Merge(dst, src)
+func (m *Metrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Metrics.Merge(m, src)
 }
 func (m *Metrics) XXX_Size() int {
 	return xxx_messageInfo_Metrics.Size(m)
@@ -529,16 +539,17 @@ func (m *Metrics_InstanceMetrics) Reset()         { *m = Metrics_InstanceMetrics
 func (m *Metrics_InstanceMetrics) String() string { return proto.CompactTextString(m) }
 func (*Metrics_InstanceMetrics) ProtoMessage()    {}
 func (*Metrics_InstanceMetrics) Descriptor() ([]byte, []int) {
-	return fileDescriptor_InstanceCommunication_5d8f1fc97439e9d3, []int{4, 0}
+	return fileDescriptor_93ee26d3627c79da, []int{4, 0}
 }
+
 func (m *Metrics_InstanceMetrics) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_Metrics_InstanceMetrics.Unmarshal(m, b)
 }
 func (m *Metrics_InstanceMetrics) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_Metrics_InstanceMetrics.Marshal(b, m, deterministic)
 }
-func (dst *Metrics_InstanceMetrics) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Metrics_InstanceMetrics.Merge(dst, src)
+func (m *Metrics_InstanceMetrics) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Metrics_InstanceMetrics.Merge(m, src)
 }
 func (m *Metrics_InstanceMetrics) XXX_Size() int {
 	return xxx_messageInfo_Metrics_InstanceMetrics.Size(m)
@@ -581,11 +592,9 @@ func init() {
 	proto.RegisterType((*Metrics_InstanceMetrics)(nil), "proto.Metrics.InstanceMetrics")
 }
 
-func init() {
-	proto.RegisterFile("InstanceCommunication.proto", fileDescriptor_InstanceCommunication_5d8f1fc97439e9d3)
-}
+func init() { proto.RegisterFile("InstanceCommunication.proto", fileDescriptor_93ee26d3627c79da) }
 
-var fileDescriptor_InstanceCommunication_5d8f1fc97439e9d3 = []byte{
+var fileDescriptor_93ee26d3627c79da = []byte{
 	// 917 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xef, 0x6e, 0x1b, 0x45,
 	0x10, 0xcf, 0xd5, 0x75, 0x9d, 0x8c, 0x53, 0x27, 0x9e, 0xc4, 0xe1, 0x70, 0xa5, 0x60, 0x0e, 0x54,
@@ -646,3 +655,227 @@ var fileDescriptor_InstanceCommunication_5d8f1fc97439e9d3 = []byte{
 	0x0f, 0xc5, 0xeb, 0x07, 0x1a, 0xfd, 0xf2, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x52, 0xef, 0x2d,
 	0x97, 0x48, 0x0a, 0x00, 0x00,
 }
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConn
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion4
+
+// InstanceControlClient is the client API for InstanceControl service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type InstanceControlClient interface {
+	GetFunctionStatus(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*FunctionStatus, error)
+	GetAndResetMetrics(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*MetricsData, error)
+	ResetMetrics(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*empty.Empty, error)
+	GetMetrics(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*MetricsData, error)
+	HealthCheck(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*HealthCheckResult, error)
+}
+
+type instanceControlClient struct {
+	cc *grpc.ClientConn
+}
+
+func NewInstanceControlClient(cc *grpc.ClientConn) InstanceControlClient {
+	return &instanceControlClient{cc}
+}
+
+func (c *instanceControlClient) GetFunctionStatus(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*FunctionStatus, error) {
+	out := new(FunctionStatus)
+	err := c.cc.Invoke(ctx, "/proto.InstanceControl/GetFunctionStatus", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *instanceControlClient) GetAndResetMetrics(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*MetricsData, error) {
+	out := new(MetricsData)
+	err := c.cc.Invoke(ctx, "/proto.InstanceControl/GetAndResetMetrics", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *instanceControlClient) ResetMetrics(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*empty.Empty, error) {
+	out := new(empty.Empty)
+	err := c.cc.Invoke(ctx, "/proto.InstanceControl/ResetMetrics", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *instanceControlClient) GetMetrics(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*MetricsData, error) {
+	out := new(MetricsData)
+	err := c.cc.Invoke(ctx, "/proto.InstanceControl/GetMetrics", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *instanceControlClient) HealthCheck(ctx context.Context, in *empty.Empty, opts ...grpc.CallOption) (*HealthCheckResult, error) {
+	out := new(HealthCheckResult)
+	err := c.cc.Invoke(ctx, "/proto.InstanceControl/HealthCheck", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// InstanceControlServer is the server API for InstanceControl service.
+type InstanceControlServer interface {
+	GetFunctionStatus(context.Context, *empty.Empty) (*FunctionStatus, error)
+	GetAndResetMetrics(context.Context, *empty.Empty) (*MetricsData, error)
+	ResetMetrics(context.Context, *empty.Empty) (*empty.Empty, error)
+	GetMetrics(context.Context, *empty.Empty) (*MetricsData, error)
+	HealthCheck(context.Context, *empty.Empty) (*HealthCheckResult, error)
+}
+
+// UnimplementedInstanceControlServer can be embedded to have forward compatible implementations.
+type UnimplementedInstanceControlServer struct {
+}
+
+func (*UnimplementedInstanceControlServer) GetFunctionStatus(ctx context.Context, req *empty.Empty) (*FunctionStatus, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetFunctionStatus not implemented")
+}
+func (*UnimplementedInstanceControlServer) GetAndResetMetrics(ctx context.Context, req *empty.Empty) (*MetricsData, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetAndResetMetrics not implemented")
+}
+func (*UnimplementedInstanceControlServer) ResetMetrics(ctx context.Context, req *empty.Empty) (*empty.Empty, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ResetMetrics not implemented")
+}
+func (*UnimplementedInstanceControlServer) GetMetrics(ctx context.Context, req *empty.Empty) (*MetricsData, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetMetrics not implemented")
+}
+func (*UnimplementedInstanceControlServer) HealthCheck(ctx context.Context, req *empty.Empty) (*HealthCheckResult, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method HealthCheck not implemented")
+}
+
+func RegisterInstanceControlServer(s *grpc.Server, srv InstanceControlServer) {
+	s.RegisterService(&_InstanceControl_serviceDesc, srv)
+}
+
+func _InstanceControl_GetFunctionStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(empty.Empty)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(InstanceControlServer).GetFunctionStatus(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/proto.InstanceControl/GetFunctionStatus",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(InstanceControlServer).GetFunctionStatus(ctx, req.(*empty.Empty))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _InstanceControl_GetAndResetMetrics_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(empty.Empty)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(InstanceControlServer).GetAndResetMetrics(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/proto.InstanceControl/GetAndResetMetrics",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(InstanceControlServer).GetAndResetMetrics(ctx, req.(*empty.Empty))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _InstanceControl_ResetMetrics_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(empty.Empty)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(InstanceControlServer).ResetMetrics(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/proto.InstanceControl/ResetMetrics",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(InstanceControlServer).ResetMetrics(ctx, req.(*empty.Empty))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _InstanceControl_GetMetrics_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(empty.Empty)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(InstanceControlServer).GetMetrics(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/proto.InstanceControl/GetMetrics",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(InstanceControlServer).GetMetrics(ctx, req.(*empty.Empty))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _InstanceControl_HealthCheck_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(empty.Empty)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(InstanceControlServer).HealthCheck(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/proto.InstanceControl/HealthCheck",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(InstanceControlServer).HealthCheck(ctx, req.(*empty.Empty))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _InstanceControl_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "proto.InstanceControl",
+	HandlerType: (*InstanceControlServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "GetFunctionStatus",
+			Handler:    _InstanceControl_GetFunctionStatus_Handler,
+		},
+		{
+			MethodName: "GetAndResetMetrics",
+			Handler:    _InstanceControl_GetAndResetMetrics_Handler,
+		},
+		{
+			MethodName: "ResetMetrics",
+			Handler:    _InstanceControl_ResetMetrics_Handler,
+		},
+		{
+			MethodName: "GetMetrics",
+			Handler:    _InstanceControl_GetMetrics_Handler,
+		},
+		{
+			MethodName: "HealthCheck",
+			Handler:    _InstanceControl_HealthCheck_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "InstanceCommunication.proto",
+}
diff --git a/pulsar-function-go/pb/Request.pb.go b/pulsar-function-go/pb/Request.pb.go
index 733d0b06b6b8c..bd7fa15452ceb 100644
--- a/pulsar-function-go/pb/Request.pb.go
+++ b/pulsar-function-go/pb/Request.pb.go
@@ -17,14 +17,14 @@
 // under the License.
 //
 
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: Request.proto
+package api
 
-package pb
+import (
+	fmt "fmt"
+	math "math"
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+	proto "github.com/golang/protobuf/proto"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -35,7 +35,7 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type ServiceRequest_ServiceRequestType int32
 
@@ -50,6 +50,7 @@ var ServiceRequest_ServiceRequestType_name = map[int32]string{
 	1: "DELETE",
 	2: "INITIALIZE",
 }
+
 var ServiceRequest_ServiceRequestType_value = map[string]int32{
 	"UPDATE":     0,
 	"DELETE":     1,
@@ -59,8 +60,9 @@ var ServiceRequest_ServiceRequestType_value = map[string]int32{
 func (x ServiceRequest_ServiceRequestType) String() string {
 	return proto.EnumName(ServiceRequest_ServiceRequestType_name, int32(x))
 }
+
 func (ServiceRequest_ServiceRequestType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_Request_db06a8eacb0614b9, []int{0, 0}
+	return fileDescriptor_ac56d74daff02b5a, []int{0, 0}
 }
 
 type ServiceRequest struct {
@@ -77,16 +79,17 @@ func (m *ServiceRequest) Reset()         { *m = ServiceRequest{} }
 func (m *ServiceRequest) String() string { return proto.CompactTextString(m) }
 func (*ServiceRequest) ProtoMessage()    {}
 func (*ServiceRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_Request_db06a8eacb0614b9, []int{0}
+	return fileDescriptor_ac56d74daff02b5a, []int{0}
 }
+
 func (m *ServiceRequest) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ServiceRequest.Unmarshal(m, b)
 }
 func (m *ServiceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 	return xxx_messageInfo_ServiceRequest.Marshal(b, m, deterministic)
 }
-func (dst *ServiceRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServiceRequest.Merge(dst, src)
+func (m *ServiceRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ServiceRequest.Merge(m, src)
 }
 func (m *ServiceRequest) XXX_Size() int {
 	return xxx_messageInfo_ServiceRequest.Size(m)
@@ -126,13 +129,13 @@ func (m *ServiceRequest) GetWorkerId() string {
 }
 
 func init() {
-	proto.RegisterType((*ServiceRequest)(nil), "proto.ServiceRequest")
 	proto.RegisterEnum("proto.ServiceRequest_ServiceRequestType", ServiceRequest_ServiceRequestType_name, ServiceRequest_ServiceRequestType_value)
+	proto.RegisterType((*ServiceRequest)(nil), "proto.ServiceRequest")
 }
 
-func init() { proto.RegisterFile("Request.proto", fileDescriptor_Request_db06a8eacb0614b9) }
+func init() { proto.RegisterFile("Request.proto", fileDescriptor_ac56d74daff02b5a) }
 
-var fileDescriptor_Request_db06a8eacb0614b9 = []byte{
+var fileDescriptor_ac56d74daff02b5a = []byte{
 	// 247 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x0d, 0x4a, 0x2d, 0x2c,
 	0x4d, 0x2d, 0x2e, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x05, 0x53, 0x52, 0x7c, 0x6e,
diff --git a/pulsar-function-go/pb/doc.go b/pulsar-function-go/pb/doc.go
index aafd43ad51a60..e888179578e11 100644
--- a/pulsar-function-go/pb/doc.go
+++ b/pulsar-function-go/pb/doc.go
@@ -31,4 +31,4 @@
 //    revision: 548c726b8e7f0e163b1132c9ada6ba83d6bec572
 //
 // Files generated by the protoc-gen-go program should not be modified.
-package pb
+package api
diff --git a/pulsar-function-go/pb/generate.sh b/pulsar-function-go/pb/generate.sh
index ab20949616c69..5e302e8f7ac73 100755
--- a/pulsar-function-go/pb/generate.sh
+++ b/pulsar-function-go/pb/generate.sh
@@ -54,7 +54,7 @@ fi
 protoFiles="${protoDefinitions}/*.proto"
 
 protoc \
-	--go_out=import_path=${pkg}:. \
+	--go_out=import_path=${pkg},plugins=grpc:. \
 	--proto_path="${protoDefinitions}" ${protoFiles}
 
 pulsarGitRev=$(git -C ${pulsarSrc} rev-parse HEAD)
diff --git a/pulsar-function-go/pf/context.go b/pulsar-function-go/pf/context.go
index 9681ae7f36a2f..89cae42fdbe9b 100644
--- a/pulsar-function-go/pf/context.go
+++ b/pulsar-function-go/pf/context.go
@@ -21,12 +21,12 @@ package pf
 
 import (
 	"context"
+	"time"
 )
 
 type FunctionContext struct {
 	instanceConf *instanceConf
 	userConfigs  map[string]interface{}
-	inputTopics  []string
 	logAppender  *LogAppender
 }
 
@@ -43,13 +43,28 @@ func (c *FunctionContext) GetInstanceID() int {
 }
 
 func (c *FunctionContext) GetInputTopics() []string {
-	return c.inputTopics
+	inputMap := c.instanceConf.funcDetails.GetSource().InputSpecs
+	inputTopics := make([]string, len(inputMap))
+	i := 0
+	for k := range inputMap {
+		inputTopics[i] = k
+		i++
+	}
+	return inputTopics
 }
 
 func (c *FunctionContext) GetOutputTopic() string {
 	return c.instanceConf.funcDetails.GetSink().Topic
 }
 
+func (c *FunctionContext) GetTenantAndNamespace() string {
+	return c.GetFuncTenant() + "/" + c.GetFuncNamespace()
+}
+
+func (c *FunctionContext) GetTenantAndNamespaceAndName() string {
+	return c.GetFuncTenant() + "/" + c.GetFuncNamespace() + "/" + c.GetFuncName()
+}
+
 func (c *FunctionContext) GetFuncTenant() string {
 	return c.instanceConf.funcDetails.Tenant
 }
@@ -66,6 +81,25 @@ func (c *FunctionContext) GetFuncID() string {
 	return c.instanceConf.funcID
 }
 
+func (c *FunctionContext) GetPort() int {
+	return c.instanceConf.port
+}
+
+func (c *FunctionContext) GetClusterName() string {
+	return c.instanceConf.clusterName
+}
+
+func (c *FunctionContext) GetExpectedHealthCheckInterval() int32 {
+	return c.instanceConf.expectedHealthCheckInterval
+}
+func (c *FunctionContext) GetExpectedHealthCheckIntervalAsDuration() time.Duration {
+	return time.Duration(c.instanceConf.expectedHealthCheckInterval)
+}
+
+func (c *FunctionContext) GetMaxIdleTime() int64 {
+	return int64(c.GetExpectedHealthCheckIntervalAsDuration() * 3 * time.Second)
+}
+
 func (c *FunctionContext) GetFuncVersion() string {
 	return c.instanceConf.funcVersion
 }
diff --git a/pulsar-function-go/pf/context_test.go b/pulsar-function-go/pf/context_test.go
index ce95738b9a783..379c66daa5026 100644
--- a/pulsar-function-go/pf/context_test.go
+++ b/pulsar-function-go/pf/context_test.go
@@ -32,8 +32,10 @@ func TestContext(t *testing.T) {
 	fc := NewFuncContext()
 	ctx = NewContext(ctx, fc)
 	if resfc, ok := FromContext(ctx); ok {
+		assert.Equal(t, []string{"persistent://public/default/topic-01"}, resfc.GetInputTopics())
 		assert.Equal(t, "1.0.0", resfc.GetFuncVersion())
 		assert.Equal(t, "pulsar-function", resfc.GetFuncID())
 		assert.Equal(t, "go-function", resfc.GetFuncName())
+		assert.Equal(t, "persistent://public/default/topic-02", resfc.GetOutputTopic())
 	}
 }
diff --git a/pulsar-function-go/pf/instance.go b/pulsar-function-go/pf/instance.go
index abd60fd104848..f1c600c5042a2 100644
--- a/pulsar-function-go/pf/instance.go
+++ b/pulsar-function-go/pf/instance.go
@@ -22,19 +22,40 @@ package pf
 import (
 	"context"
 	"math"
+	"strconv"
 	"time"
 
+	"github.com/golang/protobuf/ptypes/empty"
+
 	"github.com/apache/pulsar-client-go/pulsar"
 	log "github.com/apache/pulsar/pulsar-function-go/logutil"
-	"github.com/apache/pulsar/pulsar-function-go/pb"
+	pb "github.com/apache/pulsar/pulsar-function-go/pb"
+	io_prometheus_client "github.com/prometheus/client_model/go"
 )
 
 type goInstance struct {
-	function  function
-	context   *FunctionContext
-	producer  pulsar.Producer
-	consumers map[string]pulsar.Consumer
-	client    pulsar.Client
+	function          function
+	context           *FunctionContext
+	producer          pulsar.Producer
+	consumers         map[string]pulsar.Consumer
+	client            pulsar.Client
+	lastHealthCheckTs int64
+	properties        map[string]string
+	stats             StatWithLabelValues
+}
+
+func (gi *goInstance) getMetricsLabels() []string {
+	// e.g. metrics_labels = []string{"test-tenant","test-tenant/test-namespace", "test-name", "1234", "test-cluster",
+	//	"test-tenant/test-namespace/test-name"}
+	metricsLabels := []string{
+		gi.context.GetFuncTenant(),
+		gi.context.GetTenantAndNamespace(),
+		gi.context.GetFuncName(),
+		gi.context.GetFuncID(),
+		gi.context.GetClusterName(),
+		gi.context.GetTenantAndNamespaceAndName(),
+	}
+	return metricsLabels
 }
 
 // newGoInstance init goInstance and init function context
@@ -43,11 +64,48 @@ func newGoInstance() *goInstance {
 		context:   NewFuncContext(),
 		consumers: make(map[string]pulsar.Consumer),
 	}
+	now := time.Now()
+	goInstance.lastHealthCheckTs = now.UnixNano()
+	goInstance.properties = make(map[string]string)
+	goInstance.stats = NewStatWithLabelValues(goInstance.getMetricsLabels()...)
 	return goInstance
 }
 
+func (gi *goInstance) processSpawnerHealthCheckTimer(tkr *time.Ticker) {
+	log.Info("Starting processSpawnerHealthCheckTimer")
+	now := time.Now()
+	maxIdleTime := gi.context.GetMaxIdleTime()
+	timeSinceLastCheck := now.UnixNano() - gi.lastHealthCheckTs
+	if (timeSinceLastCheck) > (maxIdleTime) {
+		log.Error("Haven't received health check from spawner in a while. Stopping instance...")
+		gi.close()
+		tkr.Stop()
+	}
+}
+
+func (gi *goInstance) startScheduler() {
+	if gi.context.instanceConf.expectedHealthCheckInterval > 0 {
+		log.Info("Starting Scheduler")
+		go func() {
+			log.Info("Started Scheduler")
+			tkr := time.NewTicker(time.Millisecond * 1000 * gi.context.GetExpectedHealthCheckIntervalAsDuration())
+			for range tkr.C {
+				log.Info("Starting Timer")
+				go gi.processSpawnerHealthCheckTimer(tkr)
+			}
+		}()
+	}
+}
+
 func (gi *goInstance) startFunction(function function) error {
 	gi.function = function
+
+	// start process spawner health check timer
+	now := time.Now()
+	gi.lastHealthCheckTs = now.UnixNano()
+
+	gi.startScheduler()
+
 	err := gi.setupClient()
 	if err != nil {
 		log.Errorf("setup client failed, error is:%v", err)
@@ -73,6 +131,9 @@ func (gi *goInstance) startFunction(function function) error {
 	idleTimer := time.NewTimer(idleDuration)
 	defer idleTimer.Stop()
 
+	servicer := InstanceControlServicer{goInstance: gi}
+	servicer.serve(gi)
+
 CLOSE:
 	for {
 		idleTimer.Reset(idleDuration)
@@ -85,20 +146,27 @@ CLOSE:
 			if autoAck && atMostOnce {
 				gi.ackInputMessage(msgInput)
 			}
-
+			gi.stats.incrTotalReceived()
 			gi.addLogTopicHandler()
 
+			gi.stats.setLastInvocation()
+			gi.stats.processTimeStart()
+
 			output, err := gi.handlerMsg(msgInput)
 			if err != nil {
 				log.Errorf("handler message error:%v", err)
 				if autoAck && atLeastOnce {
 					gi.nackInputMessage(msgInput)
 				}
+				gi.stats.incrTotalUserExceptions(err)
 				return err
 			}
 
 			gi.processResult(msgInput, output)
 
+			gi.stats.processTimeEnd() // Should this be called here or before processResult(..)?
+			gi.stats.incrTotalProcessedSuccessfully()
+
 		case <-idleTimer.C:
 			close(channel)
 			break CLOSE
@@ -117,6 +185,7 @@ func (gi *goInstance) setupClient() error {
 	})
 	if err != nil {
 		log.Errorf("create client error:%v", err)
+		gi.stats.incrTotalSysExceptions(err)
 		return err
 	}
 	gi.client = client
@@ -135,10 +204,11 @@ func (gi *goInstance) setupProducer() (err error) {
 			Properties:              properties,
 			CompressionType:         pulsar.LZ4,
 			BatchingMaxPublishDelay: time.Millisecond * 10,
-			// set send timeout to be infinity to prevent potential deadlock with consumer
+			// Set send timeout to be infinity to prevent potential deadlock with consumer
 			// that might happen when consumer is blocked due to unacked messages
 		})
 		if err != nil {
+			gi.stats.incrTotalSysExceptions(err)
 			log.Errorf("create producer error:%s", err.Error())
 			return err
 		}
@@ -212,10 +282,10 @@ func (gi *goInstance) setupConsumer() (chan pulsar.ConsumerMessage, error) {
 
 		if err != nil {
 			log.Errorf("create consumer error:%s", err.Error())
+			gi.stats.incrTotalSysExceptions(err)
 			return nil, err
 		}
 		gi.consumers[topic] = consumer
-		gi.context.inputTopics = append(gi.context.inputTopics, topic)
 	}
 	return channel, nil
 }
@@ -244,17 +314,24 @@ func (gi *goInstance) processResult(msgInput pulsar.Message, output []byte) {
 				if autoAck && atLeastOnce {
 					gi.nackInputMessage(msgInput)
 				}
+				gi.stats.incrTotalSysExceptions(err)
 				log.Fatal(err)
-			} else if autoAck && !atMostOnce {
-				gi.ackInputMessage(msgInput)
+			} else {
+				if autoAck && !atMostOnce {
+					gi.ackInputMessage(msgInput)
+				}
+				gi.stats.incrTotalProcessedSuccessfully()
 			}
 		})
 	} else if autoAck && atLeastOnce {
 		gi.ackInputMessage(msgInput)
+		// Report that we processed successfully even though it's not going to an output topic?
+		// We probably shouldn't...
+		// gi.stats.incrTotalProcessedSuccessfully()
 	}
 }
 
-// ackInputMessage doesn't produce any result or the user doesn't want the result.
+// ackInputMessage doesn't produce any result, or the user doesn't want the result.
 func (gi *goInstance) ackInputMessage(inputMessage pulsar.Message) {
 	gi.consumers[inputMessage.Topic()].Ack(inputMessage)
 }
@@ -323,3 +400,210 @@ func (gi *goInstance) close() {
 		gi.client.Close()
 	}
 }
+
+func (gi *goInstance) healthCheck() *pb.HealthCheckResult {
+	now := time.Now()
+	gi.lastHealthCheckTs = now.UnixNano()
+	healthCheckResult := pb.HealthCheckResult{Success: true}
+	return &healthCheckResult
+}
+
+func (gi *goInstance) getFunctionStatus() *pb.FunctionStatus {
+	status := pb.FunctionStatus{}
+	status.Running = true
+	totalReceived := gi.getTotalReceived()
+	totalProcessedSuccessfully := gi.getTotalProcessedSuccessfully()
+	totalUserExceptions := gi.getTotalUserExceptions()
+	totalSysExceptions := gi.getTotalSysExceptions()
+	avgProcessLatencyMs := gi.getAvgProcessLatency()
+	lastInvocation := gi.getLastInvocation()
+
+	status.NumReceived = int64(totalReceived)
+	status.NumSuccessfullyProcessed = int64(totalProcessedSuccessfully)
+	status.NumUserExceptions = int64(totalUserExceptions)
+	status.InstanceId = strconv.Itoa(gi.context.instanceConf.instanceID)
+
+	status.NumUserExceptions = int64(totalUserExceptions)
+	for _, exPair := range gi.stats.latestUserException {
+		toAdd := pb.FunctionStatus_ExceptionInformation{}
+		toAdd.ExceptionString = exPair.exception.Error()
+		toAdd.MsSinceEpoch = exPair.timestamp
+		status.LatestUserExceptions = append(status.LatestUserExceptions, &toAdd)
+	}
+
+	status.NumSystemExceptions = int64(totalSysExceptions)
+	for _, exPair := range gi.stats.latestSysException {
+		toAdd := pb.FunctionStatus_ExceptionInformation{}
+		toAdd.ExceptionString = exPair.exception.Error()
+		toAdd.MsSinceEpoch = exPair.timestamp
+		status.LatestSystemExceptions = append(status.LatestSystemExceptions, &toAdd)
+	}
+	status.AverageLatency = float64(avgProcessLatencyMs)
+	status.LastInvocationTime = int64(lastInvocation)
+	return &status
+}
+
+func (gi *goInstance) getMetrics() *pb.MetricsData {
+	totalReceived := gi.getTotalReceived()
+	totalProcessedSuccessfully := gi.getTotalProcessedSuccessfully()
+	totalUserExceptions := gi.getTotalUserExceptions()
+	totalSysExceptions := gi.getTotalSysExceptions()
+	avgProcessLatencyMs := gi.getAvgProcessLatency()
+	lastInvocation := gi.getLastInvocation()
+
+	totalReceived1min := gi.getTotalReceived1min()
+	totalProcessedSuccessfully1min := gi.getTotalProcessedSuccessfully1min()
+	totalUserExceptions1min := gi.getTotalUserExceptions1min()
+	totalSysExceptions1min := gi.getTotalSysExceptions1min()
+	//avg_process_latency_ms_1min := gi.get_avg_process_latency_1min()
+
+	metricsData := pb.MetricsData{}
+	// total metrics
+	metricsData.ReceivedTotal = int64(totalReceived)
+	metricsData.ProcessedSuccessfullyTotal = int64(totalProcessedSuccessfully)
+	metricsData.SystemExceptionsTotal = int64(totalSysExceptions)
+	metricsData.UserExceptionsTotal = int64(totalUserExceptions)
+	metricsData.AvgProcessLatency = float64(avgProcessLatencyMs)
+	metricsData.LastInvocation = int64(lastInvocation)
+	// 1min metrics
+	metricsData.ReceivedTotal_1Min = int64(totalReceived1min)
+	metricsData.ProcessedSuccessfullyTotal_1Min = int64(totalProcessedSuccessfully1min)
+	metricsData.SystemExceptionsTotal_1Min = int64(totalSysExceptions1min)
+	metricsData.UserExceptionsTotal_1Min = int64(totalUserExceptions1min)
+	//metrics_data.AvgProcessLatency_1Min = avg_process_latency_ms_1min
+
+	// get any user metrics
+	// Not sure yet where these are stored.
+	/*
+	   user_metrics := self.contextimpl.get_metrics()
+	   for metric_name, value in user_metrics.items():
+	     metrics_data.userMetrics[metric_name] = value
+	*/
+
+	return &metricsData
+}
+
+func (gi *goInstance) getAndResetMetrics() *pb.MetricsData {
+	metricsData := gi.getMetrics()
+	gi.resetMetrics()
+	return metricsData
+}
+
+func (gi *goInstance) resetMetrics() *empty.Empty {
+	gi.stats.reset()
+	return &empty.Empty{}
+}
+
+// This method is used to get the required metrics for Prometheus.
+// Note that this doesn't distinguish between parallel function instances!
+func (gi *goInstance) getMatchingMetricFunc() func(lbl *io_prometheus_client.LabelPair) bool {
+	matchMetricFunc := func(lbl *io_prometheus_client.LabelPair) bool {
+		return *lbl.Name == "fqfn" && *lbl.Value == gi.context.GetTenantAndNamespaceAndName()
+	}
+	return matchMetricFunc
+}
+
+// e.g. metricName = "pulsar_function_process_latency_ms"
+func (gi *goInstance) getMatchingMetricFromRegistry(metricName string) io_prometheus_client.Metric {
+	metricFamilies, err := reg.Gather()
+	if err != nil {
+		log.Error("Something went wrong when calling reg.Gather() in getMatchingMetricFromRegistry(..) for " + metricName)
+	}
+	matchFamilyFunc := func(vect *io_prometheus_client.MetricFamily) bool {
+		return *vect.Name == metricName
+	}
+	fiteredMetricFamilies := filter(metricFamilies, matchFamilyFunc)
+	if len(fiteredMetricFamilies) > 1 {
+		// handle this.
+		log.Error("Too many metric families for metricName = " + metricName)
+		// Should we panic here instead of report an error since it reflects a code problem, not a user problem?
+	}
+	metricFunc := gi.getMatchingMetricFunc()
+	matchingMetric := getFirstMatch(fiteredMetricFamilies[0].Metric, metricFunc)
+	return *matchingMetric
+}
+
+func (gi *goInstance) getTotalReceived() float32 {
+	// "pulsar_function_" + "received_total", NewGaugeVec.
+	metric := gi.getMatchingMetricFromRegistry(PulsarFunctionMetricsPrefix + TotalReceived)
+	val := metric.GetGauge().Value
+	return float32(*val)
+}
+func (gi *goInstance) getTotalProcessedSuccessfully() float32 {
+	metric := gi.getMatchingMetricFromRegistry(PulsarFunctionMetricsPrefix + TotalSuccessfullyProcessed)
+	// "pulsar_function_" + "processed_successfully_total", NewGaugeVec.
+	val := metric.GetGauge().Value
+	return float32(*val)
+}
+func (gi *goInstance) getTotalSysExceptions() float32 {
+	metric := gi.getMatchingMetricFromRegistry(PulsarFunctionMetricsPrefix + TotalSystemExceptions)
+	// "pulsar_function_"+ "system_exceptions_total", NewGaugeVec.
+	val := metric.GetGauge().Value
+	return float32(*val)
+}
+
+func (gi *goInstance) getTotalUserExceptions() float32 {
+	metric := gi.getMatchingMetricFromRegistry(PulsarFunctionMetricsPrefix + TotalUserExceptions)
+	// "pulsar_function_" + "user_exceptions_total", NewGaugeVec
+	val := metric.GetGauge().Value
+	return float32(*val)
+}
+
+func (gi *goInstance) getAvgProcessLatency() float32 {
+	metric := gi.getMatchingMetricFromRegistry(PulsarFunctionMetricsPrefix + ProcessLatencyMs)
+	// "pulsar_function_" + "process_latency_ms", SummaryVec.
+	count := metric.GetSummary().SampleCount
+	sum := metric.GetSummary().SampleSum
+	if *count <= 0.0 {
+		return 0.0
+	}
+	return float32(*sum) / float32(*count)
+}
+
+func (gi *goInstance) getLastInvocation() float32 {
+	metric := gi.getMatchingMetricFromRegistry(PulsarFunctionMetricsPrefix + LastInvocation)
+	// "pulsar_function_" + "last_invocation", GaugeVec.
+	val := metric.GetGauge().Value
+	return float32(*val)
+}
+
+func (gi *goInstance) getTotalProcessedSuccessfully1min() float32 {
+	metric := gi.getMatchingMetricFromRegistry(PulsarFunctionMetricsPrefix + TotalSuccessfullyProcessed1min)
+	// "pulsar_function_" + "processed_successfully_total_1min", GaugeVec.
+	val := metric.GetGauge().Value
+	return float32(*val)
+}
+
+func (gi *goInstance) getTotalSysExceptions1min() float32 {
+	metric := gi.getMatchingMetricFromRegistry(PulsarFunctionMetricsPrefix + TotalSystemExceptions1min)
+	// "pulsar_function_" + "system_exceptions_total_1min", GaugeVec
+	val := metric.GetGauge().Value
+	return float32(*val)
+}
+
+func (gi *goInstance) getTotalUserExceptions1min() float32 {
+	metric := gi.getMatchingMetricFromRegistry(PulsarFunctionMetricsPrefix + TotalUserExceptions1min)
+	// "pulsar_function_" + "user_exceptions_total_1min", GaugeVec
+	val := metric.GetGauge().Value
+	return float32(*val)
+}
+
+/*
+func (gi *goInstance) get_avg_process_latency_1min() float32 {
+	metric := gi.getMatchingMetricFromRegistry(PULSAR_FUNCTION_METRICS_PREFIX + PROCESS_LATENCY_MS_1min)
+	// "pulsar_function_" + "process_latency_ms_1min", SummaryVec
+	count := metric.GetSummary().SampleCount
+	sum := metric.GetSummary().SampleSum
+	if *count <= 0.0 {
+		return 0.0
+	} else {
+		return float32(*sum) / float32(*count)
+	}
+}*/
+
+func (gi *goInstance) getTotalReceived1min() float32 {
+	metric := gi.getMatchingMetricFromRegistry(PulsarFunctionMetricsPrefix + TotalReceived1min)
+	// "pulsar_function_" +  "received_total_1min", GaugeVec
+	val := metric.GetGauge().Value
+	return float32(*val)
+}
diff --git a/pulsar-function-go/pf/instanceConf.go b/pulsar-function-go/pf/instanceConf.go
index 449b22e65bbeb..c4e31deb2c620 100644
--- a/pulsar-function-go/pf/instanceConf.go
+++ b/pulsar-function-go/pf/instanceConf.go
@@ -24,21 +24,22 @@ import (
 	"time"
 
 	"github.com/apache/pulsar/pulsar-function-go/conf"
-	"github.com/apache/pulsar/pulsar-function-go/pb"
+	pb "github.com/apache/pulsar/pulsar-function-go/pb"
 )
 
 // This is the config passed to the Golang Instance. Contains all the information
 // passed to run functions
 type instanceConf struct {
-	instanceID       int
-	funcID           string
-	funcVersion      string
-	funcDetails      pb.FunctionDetails
-	maxBufTuples     int
-	port             int
-	clusterName      string
-	pulsarServiceURL string
-	killAfterIdle    time.Duration
+	instanceID                  int
+	funcID                      string
+	funcVersion                 string
+	funcDetails                 pb.FunctionDetails
+	maxBufTuples                int
+	port                        int
+	clusterName                 string
+	pulsarServiceURL            string
+	killAfterIdle               time.Duration
+	expectedHealthCheckInterval int32
 }
 
 func newInstanceConf() *instanceConf {
@@ -48,14 +49,15 @@ func newInstanceConf() *instanceConf {
 		panic("config file is nil.")
 	}
 	instanceConf := &instanceConf{
-		instanceID:       cfg.InstanceID,
-		funcID:           cfg.FuncID,
-		funcVersion:      cfg.FuncVersion,
-		maxBufTuples:     cfg.MaxBufTuples,
-		port:             cfg.Port,
-		clusterName:      cfg.ClusterName,
-		pulsarServiceURL: cfg.PulsarServiceURL,
-		killAfterIdle:    cfg.KillAfterIdleMs,
+		instanceID:                  cfg.InstanceID,
+		funcID:                      cfg.FuncID,
+		funcVersion:                 cfg.FuncVersion,
+		maxBufTuples:                cfg.MaxBufTuples,
+		port:                        cfg.Port,
+		clusterName:                 cfg.ClusterName,
+		pulsarServiceURL:            cfg.PulsarServiceURL,
+		killAfterIdle:               cfg.KillAfterIdleMs,
+		expectedHealthCheckInterval: cfg.ExpectedHealthCheckInterval,
 		funcDetails: pb.FunctionDetails{
 			Tenant:               cfg.Tenant,
 			Namespace:            cfg.NameSpace,
diff --git a/pulsar-function-go/pf/instanceControlServicer.go b/pulsar-function-go/pf/instanceControlServicer.go
new file mode 100644
index 0000000000000..8477a78b8db41
--- /dev/null
+++ b/pulsar-function-go/pf/instanceControlServicer.go
@@ -0,0 +1,77 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package pf
+
+import (
+	"context"
+	"fmt"
+	"net"
+
+	log "github.com/apache/pulsar/pulsar-function-go/logutil"
+	pb "github.com/apache/pulsar/pulsar-function-go/pb"
+	"github.com/golang/protobuf/ptypes/empty"
+	"google.golang.org/grpc"
+)
+
+type InstanceControlServicer struct {
+	goInstance *goInstance
+}
+
+func (icServicer *InstanceControlServicer) GetFunctionStatus(
+	ctx context.Context, req *empty.Empty) (*pb.FunctionStatus, error) {
+	return icServicer.goInstance.getFunctionStatus(), nil
+	//return nil, status.Errorf(codes.Unimplemented, "method GetFunctionStatus not implemented")
+}
+func (icServicer *InstanceControlServicer) GetAndResetMetrics(
+	ctx context.Context, req *empty.Empty) (*pb.MetricsData, error) {
+	return icServicer.goInstance.getAndResetMetrics(), nil
+}
+func (icServicer *InstanceControlServicer) ResetMetrics(
+	ctx context.Context, req *empty.Empty) (*empty.Empty, error) {
+	return icServicer.goInstance.resetMetrics(), nil
+}
+func (icServicer *InstanceControlServicer) GetMetrics(
+	ctx context.Context, req *empty.Empty) (*pb.MetricsData, error) {
+	return icServicer.goInstance.getMetrics(), nil
+}
+func (icServicer *InstanceControlServicer) HealthCheck(
+	ctx context.Context, req *empty.Empty) (*pb.HealthCheckResult, error) {
+	return icServicer.goInstance.healthCheck(), nil
+}
+
+func (icServicer *InstanceControlServicer) serve(goInstance *goInstance) *grpc.Server {
+	// create a listener on TCP port
+	lis, err := net.Listen("tcp", fmt.Sprintf(":%d", goInstance.context.GetPort()))
+	if err != nil {
+		log.Fatalf("failed to listen: %v", err)
+	}
+	// create a gRPC server object
+	grpcServer := grpc.NewServer()
+	// must register before we start the service.
+	pb.RegisterInstanceControlServer(grpcServer, icServicer)
+	// start the server
+	log.Infof("Serving InstanceCommunication on port %d", goInstance.context.GetPort())
+	go func() {
+		if err := grpcServer.Serve(lis); err != nil {
+			log.Fatalf("Server exited with error: %v", err)
+		}
+	}()
+	return grpcServer
+}
diff --git a/pulsar-function-go/pf/instanceControlServicer_test.go b/pulsar-function-go/pf/instanceControlServicer_test.go
new file mode 100644
index 0000000000000..836ec6e5c7940
--- /dev/null
+++ b/pulsar-function-go/pf/instanceControlServicer_test.go
@@ -0,0 +1,78 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package pf
+
+import (
+	"context"
+	"log"
+	"net"
+	"testing"
+
+	pb "github.com/apache/pulsar/pulsar-function-go/pb"
+	"github.com/golang/protobuf/ptypes/empty"
+	"github.com/stretchr/testify/assert"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/test/bufconn"
+)
+
+const bufSize = 1024 * 1024
+
+var lis *bufconn.Listener
+
+func getBufDialer(listener *bufconn.Listener) func(context.Context, string) (net.Conn, error) {
+	return func(ctx context.Context, url string) (net.Conn, error) {
+		return listener.Dial()
+	}
+}
+func TestInstanceControlServicer_serve_creates_valid_instance(t *testing.T) {
+	lis = bufconn.Listen(bufSize)
+	// create a gRPC server object
+	grpcServer := grpc.NewServer()
+	instance := newGoInstance()
+	servicer := InstanceControlServicer{instance}
+	// must register before we start the service.
+	pb.RegisterInstanceControlServer(grpcServer, &servicer)
+	// start the server
+	log.Printf("Serving InstanceCommunication on port %d", instance.context.GetPort())
+
+	go func() {
+		if err := grpcServer.Serve(lis); err != nil {
+			log.Fatalf("Server exited with error: %v", err)
+		}
+	}()
+
+	// Now we can setup the client:
+
+	ctx := context.Background()
+	conn, err := grpc.DialContext(ctx, "bufnet", grpc.WithContextDialer(getBufDialer(lis)), grpc.WithInsecure())
+	if err != nil {
+		t.Fatalf("Failed to dial bufnet: %v", err)
+	}
+	defer conn.Close()
+	client := pb.NewInstanceControlClient(conn)
+	resp, err := client.HealthCheck(ctx, &empty.Empty{})
+	if err != nil {
+		t.Fatalf("SayHello failed: %v", err)
+	}
+
+	// Test for output.
+	log.Printf("Response: %+v", resp.Success)
+	assert.Equal(t, resp.Success, true)
+}
diff --git a/pulsar-function-go/pf/instance_test.go b/pulsar-function-go/pf/instance_test.go
new file mode 100644
index 0000000000000..5452015f9a7c2
--- /dev/null
+++ b/pulsar-function-go/pf/instance_test.go
@@ -0,0 +1,94 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package pf
+
+import (
+	"fmt"
+	"strconv"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func testProcessSpawnerHealthCheckTimer(
+	tkr *time.Ticker, lastHealthCheckTs int64, expectedHealthCheckInterval int32, counter *int) {
+	fmt.Println("Starting processSpawnerHealthCheckTimer")
+	now := time.Now()
+	maxIdleTime := int64(time.Duration(expectedHealthCheckInterval) * 3 * time.Second)
+	fmt.Println("maxIdleTime is: " + strconv.FormatInt(maxIdleTime, 10))
+	timeSinceLastCheck := now.UnixNano() - lastHealthCheckTs
+	fmt.Println("timeSinceLastCheck is: " + strconv.FormatInt(timeSinceLastCheck, 10))
+	if (timeSinceLastCheck) > (maxIdleTime) {
+		fmt.Println("Haven't received health check from spawner in a while. Stopping instance...")
+		// os.Exit(1)
+		tkr.Stop()
+	} else {
+		fmt.Println("Continuing to check")
+		*counter++
+	}
+}
+
+func testStartScheduler(counter *int) {
+	now := time.Now()
+	lastHealthCheckTs := now.UnixNano()
+
+	var expectedHealthCheckInterval int32 = 1
+	if expectedHealthCheckInterval > 0 {
+		fmt.Println("Starting Scheduler")
+		go func() {
+			fmt.Println("Started Scheduler")
+			period := time.Second * time.Duration(expectedHealthCheckInterval)
+			fmt.Println("period is: " + period.String())
+			tkr := time.NewTicker(period)
+			for range tkr.C {
+				fmt.Println("Starting Timer")
+				testProcessSpawnerHealthCheckTimer(tkr, lastHealthCheckTs, expectedHealthCheckInterval, counter)
+			}
+		}()
+	}
+}
+
+func TestInstance_HeartbeatTimer(t *testing.T) {
+	counter := 0
+	testStartScheduler(&counter)
+	time.Sleep(time.Second * 10)
+	assert.Equal(t, 2, counter)
+}
+
+func TestTime_EqualsThreeSecondsFixed(t *testing.T) {
+	var expectedHealthCheckInterval int32 = 3
+	timeAmount := time.Millisecond * 1000 * time.Duration(expectedHealthCheckInterval)
+	assert.Equal(t, time.Second*3, timeAmount)
+}
+func TestTime_EqualsThreeSecondsTimed(t *testing.T) {
+	start := time.Now()
+	startTime := start.UnixNano()
+
+	time.Sleep(time.Second * 3)
+
+	end := time.Now()
+	endTime := end.UnixNano()
+
+	diff := endTime - startTime
+
+	assert.True(t, time.Duration(diff) > time.Second*3)
+	assert.True(t, time.Duration(diff) < time.Millisecond*3100)
+}
diff --git a/pulsar-function-go/pf/stats.go b/pulsar-function-go/pf/stats.go
new file mode 100644
index 0000000000000..fde52f8c40ac5
--- /dev/null
+++ b/pulsar-function-go/pf/stats.go
@@ -0,0 +1,316 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package pf
+
+import (
+	"strconv"
+	"time"
+
+	"github.com/prometheus/client_golang/prometheus"
+	io_prometheus_client "github.com/prometheus/client_model/go"
+	//"strings"
+	//"github.com/prometheus/common/expfmt"
+	//"time"
+)
+
+var metricsLabelNames = []string{"tenant", "namespace", "name", "instance_id", "cluster", "fqfn"}
+var exceptionLabelNames = []string{"error", "ts"}
+var exceptionMetricsLabelNames = append(metricsLabelNames, exceptionLabelNames...)
+
+const (
+	PulsarFunctionMetricsPrefix = "pulsar_function_"
+
+	TotalSuccessfullyProcessed = "processed_successfully_total"
+	TotalSystemExceptions      = "system_exceptions_total"
+	TotalUserExceptions        = "user_exceptions_total"
+	ProcessLatencyMs           = "process_latency_ms"
+	LastInvocation             = "last_invocation"
+	TotalReceived              = "received_total"
+
+	TotalSuccessfullyProcessed1min = "processed_successfully_total_1min"
+	TotalSystemExceptions1min      = "system_exceptions_total_1min"
+	TotalUserExceptions1min        = "user_exceptions_total_1min"
+	ProcessLatencyMs1min           = "process_latency_ms_1min"
+	TotalReceived1min              = "received_total_1min"
+)
+
+// Declare Prometheus
+var statTotalProcessedSuccessfully = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Name: PulsarFunctionMetricsPrefix + TotalSuccessfullyProcessed,
+		Help: "Total number of messages processed successfully."},
+	metricsLabelNames)
+var statTotalSysExceptions = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Name: PulsarFunctionMetricsPrefix + TotalSystemExceptions,
+		Help: "Total number of system exceptions."},
+	metricsLabelNames)
+var statTotalUserExceptions = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Name: PulsarFunctionMetricsPrefix + TotalUserExceptions,
+		Help: "Total number of user exceptions."},
+	metricsLabelNames)
+
+var statProcessLatencyMs = prometheus.NewSummaryVec(
+	prometheus.SummaryOpts{
+		Name: PulsarFunctionMetricsPrefix + ProcessLatencyMs,
+		Help: "Process latency in milliseconds."}, metricsLabelNames)
+
+var statLastInvocation = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Name: PulsarFunctionMetricsPrefix + LastInvocation,
+		Help: "The timestamp of the last invocation of the function."}, metricsLabelNames)
+
+var statTotalReceived = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Name: PulsarFunctionMetricsPrefix + TotalReceived,
+		Help: "Total number of messages received from source."}, metricsLabelNames)
+
+// 1min windowed metrics
+var statTotalProcessedSuccessfully1min = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Name: PulsarFunctionMetricsPrefix + TotalSuccessfullyProcessed1min,
+		Help: "Total number of messages processed successfully in the last 1 minute."}, metricsLabelNames)
+var statTotalSysExceptions1min = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Name: PulsarFunctionMetricsPrefix + TotalSystemExceptions1min,
+		Help: "Total number of system exceptions in the last 1 minute."},
+	metricsLabelNames)
+var statTotalUserExceptions1min = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Name: PulsarFunctionMetricsPrefix + TotalUserExceptions1min,
+		Help: "Total number of user exceptions in the last 1 minute."},
+	metricsLabelNames)
+
+var statProcessLatencyMs1min = prometheus.NewSummaryVec(
+	prometheus.SummaryOpts{
+		Name: PulsarFunctionMetricsPrefix + ProcessLatencyMs1min,
+		Help: "Process latency in milliseconds in the last 1 minute."}, metricsLabelNames)
+
+var statTotalReceived1min = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Name: PulsarFunctionMetricsPrefix + TotalReceived1min,
+		Help: "Total number of messages received from source in the last 1 minute."}, metricsLabelNames)
+
+// exceptions
+var userExceptions = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Name: PulsarFunctionMetricsPrefix + "user_exception",
+		Help: "Exception from user code."}, exceptionMetricsLabelNames)
+
+var systemExceptions = prometheus.NewGaugeVec(
+	prometheus.GaugeOpts{
+		Name: PulsarFunctionMetricsPrefix + "system_exception",
+		Help: "Exception from system code."}, exceptionMetricsLabelNames)
+
+var reg *prometheus.Registry
+
+func init() {
+	reg = prometheus.NewRegistry()
+	reg.MustRegister(statTotalProcessedSuccessfully)
+	reg.MustRegister(statTotalSysExceptions)
+	reg.MustRegister(statTotalUserExceptions)
+	reg.MustRegister(statProcessLatencyMs)
+	reg.MustRegister(statLastInvocation)
+	reg.MustRegister(statTotalReceived)
+	reg.MustRegister(statTotalProcessedSuccessfully1min)
+	reg.MustRegister(statTotalSysExceptions1min)
+	reg.MustRegister(statTotalUserExceptions1min)
+	reg.MustRegister(statProcessLatencyMs1min)
+	reg.MustRegister(statTotalReceived1min)
+	reg.MustRegister(userExceptions)
+	reg.MustRegister(systemExceptions)
+
+}
+
+type LatestException struct {
+	exception error
+	timestamp int64
+}
+
+// Be sure to use the constructor method: NewStatWithLabelValues
+type StatWithLabelValues struct {
+	statTotalProcessedSuccessfully     prometheus.Gauge
+	statTotalSysExceptions             prometheus.Gauge
+	statTotalUserExceptions            prometheus.Gauge
+	statProcessLatencyMs               prometheus.Observer
+	statLastInvocation                 prometheus.Gauge
+	statTotalReceived                  prometheus.Gauge
+	statTotalProcessedSuccessfully1min prometheus.Gauge
+	statTotalSysExceptions1min         prometheus.Gauge
+	statTotalUserExceptions1min        prometheus.Gauge
+	//_stat_process_latency_ms_1min prometheus.Observer
+	statTotalReceived1min prometheus.Gauge
+	latestUserException   []LatestException
+	latestSysException    []LatestException
+	processStartTime      int64
+	metricsLabels         []string
+}
+
+func NewStatWithLabelValues(metricsLabels ...string) StatWithLabelValues {
+	// as optimization
+	var statTotalProcessedSuccessfully = statTotalProcessedSuccessfully.WithLabelValues(metricsLabels...)
+	var statTotalSysExceptions = statTotalSysExceptions.WithLabelValues(metricsLabels...)
+	var statTotalUserExceptions = statTotalUserExceptions.WithLabelValues(metricsLabels...)
+	var statProcessLatencyMs = statProcessLatencyMs.WithLabelValues(metricsLabels...)
+	var statLastInvocation = statLastInvocation.WithLabelValues(metricsLabels...)
+	var statTotalReceived = statTotalReceived.WithLabelValues(metricsLabels...)
+	var statTotalProcessedSuccessfully1min = statTotalProcessedSuccessfully1min.WithLabelValues(metricsLabels...)
+	var statTotalSysExceptions1min = statTotalSysExceptions1min.WithLabelValues(metricsLabels...)
+	var statTotalUserExceptions1min = statTotalUserExceptions1min.WithLabelValues(metricsLabels...)
+	//var _stat_process_latency_ms_1min = stat_process_latency_ms_1min.WithLabelValues(metrics_labels...)
+	var statTotalReceived1min = statTotalReceived1min.WithLabelValues(metricsLabels...)
+
+	statObj := StatWithLabelValues{
+		statTotalProcessedSuccessfully,
+		statTotalSysExceptions,
+		statTotalUserExceptions,
+		statProcessLatencyMs,
+		statLastInvocation,
+		statTotalReceived,
+		statTotalProcessedSuccessfully1min,
+		statTotalSysExceptions1min,
+		statTotalUserExceptions1min,
+		//_stat_process_latency_ms_1min,
+		statTotalReceived1min,
+		[]LatestException{},
+		[]LatestException{},
+		0,
+		metricsLabels,
+	}
+	return statObj
+}
+
+func filter(
+	ss []*io_prometheus_client.MetricFamily,
+	test func(*io_prometheus_client.MetricFamily) bool) (ret []*io_prometheus_client.MetricFamily) {
+	for _, s := range ss {
+		if test(s) {
+			ret = append(ret, s)
+		}
+	}
+	return
+}
+
+func getFirstMatch(
+	metrics []*io_prometheus_client.Metric,
+	test func(*io_prometheus_client.LabelPair) bool) *io_prometheus_client.Metric {
+	for _, met := range metrics {
+		for _, lbl := range met.Label {
+			if test(lbl) {
+				return met
+			}
+		}
+	}
+	return nil
+}
+
+func (stat *StatWithLabelValues) setLastInvocation() {
+	now := time.Now()
+	stat.statLastInvocation.Set(float64(now.UnixNano()))
+}
+
+func (stat *StatWithLabelValues) processTimeStart() {
+	now := time.Now()
+	stat.processStartTime = now.UnixNano()
+}
+
+func (stat *StatWithLabelValues) processTimeEnd() {
+	if stat.processStartTime != 0 {
+		now := time.Now()
+		duration := now.UnixNano() - stat.processStartTime
+		stat.statProcessLatencyMs.Observe(float64(duration))
+		//stat._stat_process_latency_ms_1min.Observe(float64(duration))
+	}
+}
+
+func (stat *StatWithLabelValues) incrTotalUserExceptions(err error) {
+	stat.statTotalUserExceptions.Inc()
+	stat.statTotalUserExceptions1min.Inc()
+	stat.addUserException(err)
+}
+
+func (stat *StatWithLabelValues) addUserException(err error) {
+	now := time.Now()
+	ts := now.UnixNano()
+	errorTs := LatestException{err, ts}
+	stat.latestUserException = append(stat.latestUserException, errorTs)
+	if len(stat.latestUserException) > 10 {
+		stat.latestUserException = stat.latestUserException[1:]
+	}
+	// report exception via prometheus
+	stat.reportUserExceptionPrometheus(err, ts)
+}
+
+//@limits(calls=5, period=60)
+func (stat *StatWithLabelValues) reportUserExceptionPrometheus(exception error, ts int64) {
+	errorTs := []string{exception.Error(), strconv.FormatInt(ts, 10)}
+	exceptionMetricLabels := append(stat.metricsLabels, errorTs...)
+	userExceptions.WithLabelValues(exceptionMetricLabels...).Set(1.0)
+}
+
+func (stat *StatWithLabelValues) incrTotalProcessedSuccessfully() {
+	stat.statTotalProcessedSuccessfully.Inc()
+	stat.statTotalProcessedSuccessfully1min.Inc()
+}
+
+func (stat *StatWithLabelValues) incrTotalSysExceptions(exception error) {
+	stat.statTotalSysExceptions.Inc()
+	stat.statTotalSysExceptions1min.Inc()
+	stat.addSysException(exception)
+}
+
+func (stat *StatWithLabelValues) addSysException(exception error) {
+	now := time.Now()
+	ts := now.UnixNano()
+	errorTs := LatestException{exception, ts}
+	stat.latestSysException = append(stat.latestSysException, errorTs)
+	if len(stat.latestSysException) > 10 {
+		stat.latestSysException = stat.latestSysException[1:]
+	}
+	// report exception via prometheus
+	stat.reportSystemExceptionPrometheus(exception, ts)
+}
+
+//@limits(calls=5, period=60)
+func (stat *StatWithLabelValues) reportSystemExceptionPrometheus(exception error, ts int64) {
+	errorTs := []string{exception.Error(), strconv.FormatInt(ts, 10)}
+	exceptionMetricLabels := append(stat.metricsLabels, errorTs...)
+	systemExceptions.WithLabelValues(exceptionMetricLabels...).Set(1.0)
+}
+
+func (stat *StatWithLabelValues) incrTotalReceived() {
+	stat.statTotalReceived.Inc()
+	stat.statTotalReceived1min.Inc()
+}
+
+func (stat *StatWithLabelValues) reset() {
+	stat.statTotalProcessedSuccessfully1min.Set(0.0)
+	stat.statTotalUserExceptions1min.Set(0.0)
+	stat.statTotalSysExceptions1min.Set(0.0)
+	//stat._stat_process_latency_ms_1min._sum.set(0.0)
+	//stat._stat_process_latency_ms_1min._count.set(0.0)
+	stat.statTotalReceived1min.Set(0.0)
+}
+
+/*
+// start time for windowed metrics
+util.FixedTimer(60, reset, name="windowed-metrics-timer").start()
+*/
diff --git a/pulsar-function-go/pf/stats_test.go b/pulsar-function-go/pf/stats_test.go
new file mode 100644
index 0000000000000..c79c4940bd106
--- /dev/null
+++ b/pulsar-function-go/pf/stats_test.go
@@ -0,0 +1,222 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package pf
+
+import (
+	"fmt"
+	"math"
+	"testing"
+
+	"github.com/golang/protobuf/proto"
+	"github.com/prometheus/client_golang/prometheus"
+	io_prometheus_client "github.com/prometheus/client_model/go"
+	"github.com/stretchr/testify/assert"
+)
+
+/*func test(){
+	var metrics_label_names = []string{"tenant", "namespace", "name", "instance_id", "cluster", "fqfn"}
+	var exception_label_names = []string{"error", "ts"}
+	var exception_metrics_label_names = append(metrics_label_names, exception_label_names...)
+	var stat_process_latency_ms = prometheus.NewSummaryVec(
+		prometheus.SummaryOpts{
+			Name: PULSAR_FUNCTION_METRICS_PREFIX + PROCESS_LATENCY_MS,
+			Help: "Process latency in milliseconds."}, metrics_label_names)
+	var reg *prometheus.Registry
+	reg = prometheus.NewRegistry()
+	reg.MustRegister(stat_process_latency_ms)
+	metrics_labels := []string{"test-tenant","test-tenant/test-namespace", "test-name", "1234", "test-cluster",
+		"test-tenant/test-namespace/test-name"}
+	// 1234 is instanceId
+	// ['test-tenant', 'test-tenant/test-namespace', 'test-name',1234,
+    //    'test-cluster', 'test-tenant/test-namespace/test-name']
+	//var _stat_process_latency_ms = stat_process_latency_ms.WithLabelValues(metrics_labels...)
+	//process_latency_ms_count := stat._stat_process_latency_ms._count.get()
+	//process_latency_ms_sum := stat._stat_process_latency_ms._sum.get()
+}
+func  (stat *StatWithLabelValues) getTotalReceived() float32 {
+	gathering, _ := reg.Gather()
+	out := &bytes.Buffer{}
+	for _, mf := range gathering {
+		if _, err := expfmt.MetricFamilyToText(out, mf); err != nil {
+			panic(err)
+		}
+	}
+	fmt.Print(out.String())
+	fmt.Println("----------")
+}
+*/
+func TestExampleSummaryVec(t *testing.T) {
+
+	temps := prometheus.NewSummaryVec(
+		prometheus.SummaryOpts{
+			Name:       "pond_temperature_celsius",
+			Help:       "The temperature of the frog pond.",
+			Objectives: map[float64]float64{0.5: 0.05, 0.9: 0.01, 0.99: 0.001},
+		},
+		[]string{"species"},
+	)
+	// Simulate some observations.
+	for i := 0; i < 1000; i++ {
+		temps.WithLabelValues("litoria-caerulea").Observe(30 + math.Floor(120*math.Sin(float64(i)*0.1))/10)
+		temps.WithLabelValues("lithobates-catesbeianus").Observe(32 + math.Floor(100*math.Cos(float64(i)*0.11))/10)
+	}
+
+	// Create a Summary without any observations.
+	temps.WithLabelValues("leiopelma-hochstetteri")
+
+	// Just for demonstration, let's check the state of the summary vector
+	// by registering it with a custom registry and then let it collect the
+	// metrics.
+	reg := prometheus.NewRegistry()
+	reg.MustRegister(temps)
+
+	metricFamilies, err := reg.Gather()
+	if err != nil || len(metricFamilies) != 1 {
+		panic("unexpected behavior of custom test registry")
+	}
+	match := func(vect *io_prometheus_client.MetricFamily) bool {
+		return *vect.Name == "pond_temperature_celsius"
+	}
+	fiteredMetricFamilies := filter(metricFamilies, match)
+
+	if len(fiteredMetricFamilies) > 1 {
+		panic("Too many metric families")
+	}
+	// Then, we need to filter the metrics in the family to one that matches our label.
+
+	fmt.Println(proto.MarshalTextString(metricFamilies[0]))
+
+	// Output:
+	// name: "pond_temperature_celsius"
+	// help: "The temperature of the frog pond."
+	// type: SUMMARY
+	// metric: <
+	//   label: <
+	//     name: "species"
+	//     value: "leiopelma-hochstetteri"
+	//   >
+	//   summary: <
+	//     sample_count: 0
+	//     sample_sum: 0
+	//     quantile: <
+	//       quantile: 0.5
+	//       value: nan
+	//     >
+	//     quantile: <
+	//       quantile: 0.9
+	//       value: nan
+	//     >
+	//     quantile: <
+	//       quantile: 0.99
+	//       value: nan
+	//     >
+	//   >
+	// >
+	// metric: <
+	//   label: <
+	//     name: "species"
+	//     value: "lithobates-catesbeianus"
+	//   >
+	//   summary: <
+	//     sample_count: 1000
+	//     sample_sum: 31956.100000000017
+	//     quantile: <
+	//       quantile: 0.5
+	//       value: 32.4
+	//     >
+	//     quantile: <
+	//       quantile: 0.9
+	//       value: 41.4
+	//     >
+	//     quantile: <
+	//       quantile: 0.99
+	//       value: 41.9
+	//     >
+	//   >
+	// >
+	// metric: <
+	//   label: <
+	//     name: "species"
+	//     value: "litoria-caerulea"
+	//   >
+	//   summary: <
+	//     sample_count: 1000
+	//     sample_sum: 29969.50000000001
+	//     quantile: <
+	//       quantile: 0.5
+	//       value: 31.1
+	//     >
+	//     quantile: <
+	//       quantile: 0.9
+	//       value: 41.3
+	//     >
+	//     quantile: <
+	//       quantile: 0.99
+	//       value: 41.9
+	//     >
+	//   >
+	// >
+}
+func TestExampleSummaryVec_Pulsar(t *testing.T) {
+
+	_statProcessLatencyMs1 := prometheus.NewSummaryVec(
+		prometheus.SummaryOpts{
+			Name: "pulsar_function_process_latency_ms",
+			Help: "Process latency in milliseconds."}, metricsLabelNames)
+
+	metricsLabels := []string{"test-tenant", "test-tenant/test-namespace", "test-name", "1234", "test-cluster",
+		"test-tenant/test-namespace/test-name"}
+	// 1234 is instanceId
+	statProcessLatencyMs := _statProcessLatencyMs1.WithLabelValues(metricsLabels...)
+
+	// Simulate some observations.
+	for i := 0; i < 1000; i++ {
+		statProcessLatencyMs.Observe(30 + math.Floor(120*math.Sin(float64(i)*0.1))/10)
+		statProcessLatencyMs.Observe(32 + math.Floor(100*math.Cos(float64(i)*0.11))/10)
+	}
+
+	// Just for demonstration, let's check the state of the summary vector
+	// by registering it with a custom registry and then let it collect the
+	// metrics.
+	reg := prometheus.NewRegistry()
+	reg.MustRegister(_statProcessLatencyMs1)
+
+	metricFamilies, err := reg.Gather()
+	if err != nil || len(metricFamilies) != 1 {
+		panic("unexpected behavior of custom test registry")
+	}
+	matchFamilyFunc := func(vect *io_prometheus_client.MetricFamily) bool {
+		return *vect.Name == "pulsar_function_process_latency_ms"
+	}
+	fiteredMetricFamilies := filter(metricFamilies, matchFamilyFunc)
+	if len(fiteredMetricFamilies) > 1 {
+		panic("Too many metric families")
+	}
+	// Then, we need to filter the metrics in the family to one that matches our label.
+	// *lbl.Name == "fqfn" && *lbl.Value == fqfn
+	matchMetricFunc := func(lbl *io_prometheus_client.LabelPair) bool {
+		return *lbl.Name == "fqfn" && *lbl.Value == "test-tenant/test-namespace/test-name"
+	}
+	matchingMetric := getFirstMatch(fiteredMetricFamilies[0].Metric, matchMetricFunc)
+	count := matchingMetric.GetSummary().SampleCount
+	sum := matchingMetric.GetSummary().SampleSum
+	assert.Equal(t, 61925, int(*sum))
+	assert.Equal(t, 2000, int(*count))
+}
diff --git a/pulsar-functions/api-java/src/test/java/org/apache/pulsar/functions/api/utils/JavaSerDeTest.java b/pulsar-functions/api-java/src/test/java/org/apache/pulsar/functions/api/utils/JavaSerDeTest.java
index cb067e86def30..20821b2d5a6ab 100644
--- a/pulsar-functions/api-java/src/test/java/org/apache/pulsar/functions/api/utils/JavaSerDeTest.java
+++ b/pulsar-functions/api-java/src/test/java/org/apache/pulsar/functions/api/utils/JavaSerDeTest.java
@@ -23,8 +23,6 @@
 import java.io.Serializable;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 import org.testng.annotations.Test;
 
 /**
@@ -34,8 +32,6 @@ public class JavaSerDeTest {
 
     @Data
     @AllArgsConstructor
-    @EqualsAndHashCode
-    @ToString
     private static class TestObject implements Serializable {
 
         private int intField;
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/AuthenticationConfig.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/AuthenticationConfig.java
index f4c78eac66412..a3461cc3e8b52 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/AuthenticationConfig.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/AuthenticationConfig.java
@@ -20,19 +20,11 @@
 
 import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
 
 /**
  * Configuration to aggregate various authentication params.
  */
 @Data
-@Getter
-@Setter
-@EqualsAndHashCode
-@ToString
 @Builder
 public class AuthenticationConfig {
     private String clientAuthenticationPlugin;
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceConfig.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceConfig.java
index f8237286024bb..14dadacf6cfae 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceConfig.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/InstanceConfig.java
@@ -19,10 +19,6 @@
 package org.apache.pulsar.functions.instance;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
 import org.apache.pulsar.functions.proto.Function;
 import org.apache.pulsar.functions.proto.Function.FunctionDetails;
 
@@ -31,10 +27,6 @@
  * passed to run functions.
  */
 @Data
-@Getter
-@Setter
-@EqualsAndHashCode
-@ToString
 public class InstanceConfig {
     private int instanceId;
     private String functionId;
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaExecutionResult.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaExecutionResult.java
index f003ea35b63c9..8552dfdffdf8f 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaExecutionResult.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaExecutionResult.java
@@ -18,7 +18,7 @@
  */
 package org.apache.pulsar.functions.instance;
 
-import lombok.*;
+import lombok.Data;
 
 /**
  * This is the Java Instance. This is started by the runtimeSpawner using the JavaInstanceClient
@@ -26,10 +26,6 @@
  * based invocation.
  */
 @Data
-@Setter
-@Getter
-@EqualsAndHashCode
-@ToString
 public class JavaExecutionResult {
     private Exception userException;
     private Exception systemException;
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceRunnable.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceRunnable.java
index 8a3008c8a1d21..037b799ae972d 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceRunnable.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/JavaInstanceRunnable.java
@@ -53,10 +53,8 @@
 import org.apache.pulsar.client.impl.PulsarClientImpl;
 import org.apache.pulsar.common.functions.ConsumerConfig;
 import org.apache.pulsar.common.functions.FunctionConfig;
-import org.apache.pulsar.common.protocol.schema.LatestVersion;
 import org.apache.pulsar.functions.api.Function;
 import org.apache.pulsar.functions.api.Record;
-import org.apache.pulsar.functions.instance.state.StateContextImpl;
 import org.apache.pulsar.functions.instance.stats.ComponentStatsManager;
 import org.apache.pulsar.functions.proto.Function.SinkSpec;
 import org.apache.pulsar.functions.proto.Function.SourceSpec;
@@ -756,6 +754,8 @@ public void setupOutput(ContextImpl contextImpl) throws Exception {
                 pulsarSinkConfig.setProcessingGuarantees(FunctionConfig.ProcessingGuarantees.valueOf(
                         this.instanceConfig.getFunctionDetails().getProcessingGuarantees().name()));
                 pulsarSinkConfig.setTopic(sinkSpec.getTopic());
+                pulsarSinkConfig.setForwardSourceMessageProperty(
+                        this.instanceConfig.getFunctionDetails().getSink().getForwardSourceMessageProperty());
 
                 if (!StringUtils.isEmpty(sinkSpec.getSchemaType())) {
                     pulsarSinkConfig.setSchemaType(sinkSpec.getSchemaType());
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/go/GoInstanceConfig.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/go/GoInstanceConfig.java
index 5c95208225f95..2d2d7ad66b73e 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/go/GoInstanceConfig.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/instance/go/GoInstanceConfig.java
@@ -32,6 +32,7 @@ public class GoInstanceConfig {
     private int port;
     private String clusterName = "";
     private int killAfterIdleMs;
+    private int expectedHealthCheckInterval;
 
     private String tenant = "";
     private String nameSpace = "";
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java
index f4763b8e0662a..386c621ed1ba3 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSink.java
@@ -281,7 +281,7 @@ public void write(Record<T> record) {
 
         msg.value(record.getValue());
 
-        if (!record.getProperties().isEmpty()) {
+        if (!record.getProperties().isEmpty() && pulsarSinkConfig.isForwardSourceMessageProperty()) {
             msg.properties(record.getProperties());
         }
 
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSinkConfig.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSinkConfig.java
index b25b3208c1a6d..9cf50c5a80145 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSinkConfig.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/sink/PulsarSinkConfig.java
@@ -32,4 +32,5 @@ public class PulsarSinkConfig {
     private String serdeClassName;
     private String schemaType;
     private String typeClassName;
+    private boolean forwardSourceMessageProperty;
 }
diff --git a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java
index 5f4636554e711..f52aa412699c9 100644
--- a/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java
+++ b/pulsar-functions/instance/src/main/java/org/apache/pulsar/functions/windowing/WindowManager.java
@@ -192,7 +192,7 @@ private void track(Event<T> windowEvent) {
      * @return the list of events to be processed as a part of the current window
      */
     private List<Event<T>> scanEvents(boolean fullScan) {
-        log.debug(String.format("Scan events, eviction policy %s", evictionPolicy));
+        log.debug("Scan events, eviction policy {}", evictionPolicy);
         List<Event<T>> eventsToExpire = new ArrayList<>();
         List<Event<T>> eventsToProcess = new ArrayList<>();
 
diff --git a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/Tick.java b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/Tick.java
index efff8496c6e50..23d6d5a8554a5 100644
--- a/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/Tick.java
+++ b/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/pojo/Tick.java
@@ -19,15 +19,11 @@
 package org.apache.pulsar.functions.api.examples.pojo;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
 
 /**
  * Pojo to represent a stock tick.
  */
 @Data
-@ToString
-@EqualsAndHashCode
 public class Tick {
 
     private long timeStamp;
diff --git a/pulsar-functions/proto/src/main/proto/Function.proto b/pulsar-functions/proto/src/main/proto/Function.proto
index c479cd9d34563..d2ad02859c7fd 100644
--- a/pulsar-functions/proto/src/main/proto/Function.proto
+++ b/pulsar-functions/proto/src/main/proto/Function.proto
@@ -140,6 +140,8 @@ message SinkSpec {
      * Builtin schema type or custom schema class name
      */
     string schemaType = 7;
+
+    bool forwardSourceMessageProperty = 8;
 }
 
 message PackageLocationMetaData {
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryConfig.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryConfig.java
index 0422f7011febd..085a640194122 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryConfig.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/kubernetes/KubernetesRuntimeFactoryConfig.java
@@ -19,14 +19,12 @@
 package org.apache.pulsar.functions.runtime.kubernetes;
 
 import lombok.Data;
-import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.apache.pulsar.common.configuration.FieldContext;
 
 import java.util.Map;
 
 @Data
-@ToString
 @Accessors(chain = true)
 public class KubernetesRuntimeFactoryConfig {
     @FieldContext(
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntime.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntime.java
index 3c37372d0815f..adc477f477b1d 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntime.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntime.java
@@ -134,7 +134,7 @@ class ProcessRuntime implements Runtime {
     }
 
     /**
-     * The core logic that initialize the thread container and executes the function.
+     * The core logic that initialize the process container and executes the function.
      */
     @Override
     public void start() {
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeFactoryConfig.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeFactoryConfig.java
index e17abd950faf1..b6db3084e1c44 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeFactoryConfig.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/process/ProcessRuntimeFactoryConfig.java
@@ -19,11 +19,9 @@
 package org.apache.pulsar.functions.runtime.process;
 
 import lombok.Data;
-import lombok.ToString;
 import org.apache.pulsar.common.configuration.FieldContext;
 
 @Data
-@ToString
 public class ProcessRuntimeFactoryConfig {
     @FieldContext(
         doc = "The path to the java instance. Change the jar location only when you put"
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactoryConfig.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactoryConfig.java
index c078e8d6d4704..795a83cae3a55 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactoryConfig.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/runtime/thread/ThreadRuntimeFactoryConfig.java
@@ -19,12 +19,10 @@
 package org.apache.pulsar.functions.runtime.thread;
 
 import lombok.Data;
-import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.apache.pulsar.common.configuration.FieldContext;
 
 @Data
-@ToString
 @Accessors(chain = true)
 public class ThreadRuntimeFactoryConfig {
     @FieldContext(
diff --git a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
index f07e83f946ceb..6c4f3ab73ebfd 100644
--- a/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
+++ b/pulsar-functions/runtime/src/main/java/org/apache/pulsar/functions/worker/WorkerConfig.java
@@ -43,10 +43,6 @@
 import org.apache.pulsar.common.functions.Resources;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.apache.pulsar.functions.runtime.kubernetes.KubernetesRuntimeFactoryConfig;
 import org.apache.pulsar.functions.runtime.process.ProcessRuntimeFactoryConfig;
@@ -54,10 +50,6 @@
 import org.apache.pulsar.functions.runtime.thread.ThreadRuntimeFactoryConfig;
 
 @Data
-@Setter
-@Getter
-@EqualsAndHashCode
-@ToString
 @Accessors(chain = true)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class WorkerConfig implements Serializable, PulsarConfiguration {
diff --git a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfigUtils.java b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfigUtils.java
index 2d325319652e3..00b31abb96fe8 100644
--- a/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfigUtils.java
+++ b/pulsar-functions/utils/src/main/java/org/apache/pulsar/functions/utils/FunctionConfigUtils.java
@@ -147,6 +147,9 @@ public static FunctionDetails convert(FunctionConfig functionConfig, ClassLoader
         if (!StringUtils.isBlank(functionConfig.getOutputSchemaType())) {
             sinkSpecBuilder.setSchemaType(functionConfig.getOutputSchemaType());
         }
+        if (functionConfig.getForwardSourceMessageProperty() != null) {
+            sinkSpecBuilder.setForwardSourceMessageProperty(functionConfig.getForwardSourceMessageProperty());
+        }
 
         if (typeArgs != null) {
             sinkSpecBuilder.setTypeClassName(typeArgs[1].getName());
@@ -291,6 +294,7 @@ public static FunctionConfig convertFromDetails(FunctionDetails functionDetails)
         if (!isEmpty(functionDetails.getLogTopic())) {
             functionConfig.setLogTopic(functionDetails.getLogTopic());
         }
+        functionConfig.setForwardSourceMessageProperty(functionDetails.getSink().getForwardSourceMessageProperty());
         functionConfig.setRuntime(FunctionCommon.convertRuntime(functionDetails.getRuntime()));
         functionConfig.setProcessingGuarantees(FunctionCommon.convertProcessingGuarantee(functionDetails.getProcessingGuarantees()));
         if (functionDetails.hasRetryDetails()) {
@@ -381,7 +385,8 @@ private static void doJavaChecks(FunctionConfig functionConfig, ClassLoader clsL
             Class functionClass = clsLoader.loadClass(functionConfig.getClassName());
 
             if (!org.apache.pulsar.functions.api.Function.class.isAssignableFrom(functionClass)
-                    && !java.util.function.Function.class.isAssignableFrom(functionClass)) {
+                    && !java.util.function.Function.class.isAssignableFrom(functionClass)
+                    && !org.apache.pulsar.functions.api.WindowFunction.class.isAssignableFrom(functionClass)) {
                 throw new IllegalArgumentException(
                         String.format("Function class %s does not implement the correct interface",
                                 functionClass.getName()));
diff --git a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionConfigUtilsTest.java b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionConfigUtilsTest.java
index 29c5e5546b87c..10aeac1040e45 100644
--- a/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionConfigUtilsTest.java
+++ b/pulsar-functions/utils/src/test/java/org/apache/pulsar/functions/utils/FunctionConfigUtilsTest.java
@@ -59,6 +59,7 @@ public void testConvertBackFidelity() {
         functionConfig.setRuntime(FunctionConfig.Runtime.JAVA);
         functionConfig.setProcessingGuarantees(FunctionConfig.ProcessingGuarantees.ATLEAST_ONCE);
         functionConfig.setRetainOrdering(false);
+        functionConfig.setForwardSourceMessageProperty(true);
         functionConfig.setUserConfig(new HashMap<>());
         functionConfig.setAutoAck(true);
         functionConfig.setTimeoutMs(2000l);
@@ -92,6 +93,7 @@ public void testConvertWindow() {
         functionConfig.setRuntime(FunctionConfig.Runtime.JAVA);
         functionConfig.setProcessingGuarantees(FunctionConfig.ProcessingGuarantees.ATLEAST_ONCE);
         functionConfig.setRetainOrdering(false);
+        functionConfig.setForwardSourceMessageProperty(true);
         functionConfig.setUserConfig(new HashMap<>());
         functionConfig.setAutoAck(true);
         functionConfig.setTimeoutMs(2000l);
@@ -419,6 +421,7 @@ private FunctionConfig createFunctionConfig() {
         functionConfig.setRuntime(FunctionConfig.Runtime.JAVA);
         functionConfig.setProcessingGuarantees(FunctionConfig.ProcessingGuarantees.ATLEAST_ONCE);
         functionConfig.setRetainOrdering(false);
+        functionConfig.setForwardSourceMessageProperty(false);
         functionConfig.setUserConfig(new HashMap<>());
         functionConfig.setAutoAck(true);
         functionConfig.setTimeoutMs(2000l);
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java
index c1b49713189d2..5c4f8712dea61 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionActioner.java
@@ -22,10 +22,6 @@
 import com.google.common.io.RecursiveDeleteOption;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.distributedlog.api.namespace.Namespace;
@@ -74,10 +70,6 @@
 import static org.apache.pulsar.functions.utils.FunctionCommon.getSourceType;
 
 @Data
-@Setter
-@Getter
-@EqualsAndHashCode
-@ToString
 @Slf4j
 public class FunctionActioner {
 
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeInfo.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeInfo.java
index ea3b1b6bbed3b..ca4e2b064b711 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeInfo.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/FunctionRuntimeInfo.java
@@ -18,14 +18,12 @@
  */
 package org.apache.pulsar.functions.worker;
 
-import lombok.*;
+import lombok.Data;
 import lombok.experimental.Accessors;
 import org.apache.pulsar.functions.proto.Function.Instance;
 import org.apache.pulsar.functions.runtime.RuntimeSpawner;
 
 @Data
-@Setter
-@Getter
 @Accessors(chain = true)
 public class FunctionRuntimeInfo {
 
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerUtils.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerUtils.java
index 0ad04c3732d9b..538a57273f7e5 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerUtils.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/WorkerUtils.java
@@ -75,13 +75,11 @@ public static void uploadToBookeeper(Namespace dlogNamespace,
         // if the dest directory does not exist, create it.
         if (dlogNamespace.logExists(destPkgPath)) {
             // if the destination file exists, write a log message
-            log.info(String.format("Target function file already exists at '%s'. Overwriting it now",
-                    destPkgPath));
+            log.info("Target function file already exists at '{}'. Overwriting it now", destPkgPath);
             dlogNamespace.deleteLog(destPkgPath);
         }
         // copy the topology package to target working directory
-        log.info(String.format("Uploading function package to '%s'",
-                destPkgPath));
+        log.info("Uploading function package to '{}'", destPkgPath);
 
         try (DistributedLogManager dlm = dlogNamespace.openLog(destPkgPath)) {
             try (AppendOnlyStreamWriter writer = dlm.getAppendOnlyStreamWriter()){
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/request/ServiceRequestInfo.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/request/ServiceRequestInfo.java
index 5e94c11878ac4..9b652d07fe3fd 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/request/ServiceRequestInfo.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/request/ServiceRequestInfo.java
@@ -19,10 +19,7 @@
 package org.apache.pulsar.functions.worker.request;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
 import lombok.Setter;
-import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.apache.pulsar.client.api.MessageId;
 
@@ -31,9 +28,6 @@
 import org.apache.pulsar.functions.proto.Request.ServiceRequest;
 
 @Data
-@Getter
-@EqualsAndHashCode
-@ToString
 @Accessors(chain = true)
 public class ServiceRequestInfo {
     private final ServiceRequest serviceRequest;
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionsApiV2Resource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionsApiV2Resource.java
index 01656982ac72c..cd8acda4a24b6 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionsApiV2Resource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionsApiV2Resource.java
@@ -143,6 +143,7 @@ public Response getFunctionInfo(final @PathParam("tenant") String tenant,
             response = InstanceCommunication.FunctionStatus.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 404, message = "The function doesn't exist")
@@ -163,6 +164,7 @@ public Response getFunctionInstanceStatus(final @PathParam("tenant") String tena
             response = InstanceCommunication.FunctionStatus.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions")
     })
@@ -233,7 +235,9 @@ public Response getFunctionState(final @PathParam("tenant") String tenant,
 
     @POST
     @ApiOperation(value = "Restart function instance", response = Void.class)
-    @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
+            @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 404, message = "The function does not exist"),
             @ApiResponse(code = 500, message = "Internal server error") })
     @Path("/{tenant}/{namespace}/{functionName}/{instanceId}/restart")
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionsApiV3Resource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionsApiV3Resource.java
index 203ae627999dc..29979b6d30514 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionsApiV3Resource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionsApiV3Resource.java
@@ -114,6 +114,7 @@ public FunctionConfig getFunctionInfo(final @PathParam("tenant") String tenant,
             response = FunctionStatus.FunctionInstanceStatus.FunctionInstanceStatusData.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 404, message = "The function doesn't exist")
@@ -135,6 +136,7 @@ public FunctionStatus.FunctionInstanceStatus.FunctionInstanceStatusData getFunct
             response = FunctionStatus.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 404, message = "The function doesn't exist")
@@ -155,6 +157,7 @@ public FunctionStatus getFunctionStatus(
             response = FunctionStats.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 404, message = "The function doesn't exist")
@@ -173,6 +176,7 @@ public FunctionStats getFunctionStats(final @PathParam("tenant") String tenant,
             response = FunctionStats.FunctionInstanceStats.FunctionInstanceStatsData.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 404, message = "The function doesn't exist")
@@ -203,6 +207,7 @@ public String triggerFunction(final @PathParam("tenant") String tenant,
     @POST
     @ApiOperation(value = "Restart function instance", response = Void.class)
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this function"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 404, message = "The function does not exist"),
             @ApiResponse(code = 500, message = "Internal server error")
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SinksApiV3Resource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SinksApiV3Resource.java
index d9f788bdff95e..fe48afabeca2f 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SinksApiV3Resource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SinksApiV3Resource.java
@@ -114,6 +114,7 @@ public SinkConfig getSinkInfo(final @PathParam("tenant") String tenant,
             response = SinkStatus.SinkInstanceStatus.SinkInstanceStatusData.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this sink"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 404, message = "The sink doesn't exist")
@@ -134,6 +135,7 @@ public SinkStatus.SinkInstanceStatus.SinkInstanceStatusData getSinkInstanceStatu
             response = SinkStatus.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this sink"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 404, message = "The sink doesn't exist")
@@ -155,9 +157,11 @@ public List<String> listSink(final @PathParam("tenant") String tenant,
 
     @POST
     @ApiOperation(value = "Restart sink instance", response = Void.class)
-    @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"),
-    @ApiResponse(code = 404, message = "The function does not exist"),
-    @ApiResponse(code = 500, message = "Internal server error") })
+    @ApiResponses(value = {
+        @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this sink"),
+        @ApiResponse(code = 400, message = "Invalid request"),
+        @ApiResponse(code = 404, message = "The function does not exist"),
+        @ApiResponse(code = 500, message = "Internal server error") })
     @Path("/{tenant}/{namespace}/{sinkName}/{instanceId}/restart")
     @Consumes(MediaType.APPLICATION_JSON)
     public void restartSink(final @PathParam("tenant") String tenant,
diff --git a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SourcesApiV3Resource.java b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SourcesApiV3Resource.java
index 9be158101c6cf..5dcd18c7ed27e 100644
--- a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SourcesApiV3Resource.java
+++ b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v3/SourcesApiV3Resource.java
@@ -117,6 +117,7 @@ public SourceConfig getSourceInfo(final @PathParam("tenant") String tenant,
             response = SourceStatus.SourceInstanceStatus.SourceInstanceStatusData.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this source"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 404, message = "The source doesn't exist")
@@ -138,6 +139,7 @@ public SourceStatus.SourceInstanceStatus.SourceInstanceStatusData getSourceInsta
             response = SourceStatus.class
     )
     @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this source"),
             @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 403, message = "The requester doesn't have admin permissions"),
             @ApiResponse(code = 404, message = "The source doesn't exist")
@@ -160,7 +162,9 @@ public List<String> listSources(final @PathParam("tenant") String tenant,
 
     @POST
     @ApiOperation(value = "Restart source instance", response = Void.class)
-    @ApiResponses(value = { @ApiResponse(code = 400, message = "Invalid request"),
+    @ApiResponses(value = {
+            @ApiResponse(code = 307, message = "Current broker doesn't serve the namespace of this source"),
+            @ApiResponse(code = 400, message = "Invalid request"),
             @ApiResponse(code = 404, message = "The function does not exist"),
             @ApiResponse(code = 500, message = "Internal server error") })
     @Path("/{tenant}/{namespace}/{sourceName}/{instanceId}/restart")
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockExecutorController.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockExecutorController.java
index a0f051fef289a..f65bdbf5d0dd2 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockExecutorController.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/executor/MockExecutorController.java
@@ -53,7 +53,6 @@
 public class MockExecutorController {
 
     @Data
-    @Getter
     private class DeferredTask implements ScheduledFuture<Void> {
 
         private final Runnable runnable;
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2ResourceTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2ResourceTest.java
index 9865111572a5f..90c134d902c94 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2ResourceTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2ResourceTest.java
@@ -41,6 +41,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URL;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -1031,10 +1033,12 @@ public void testUpdateFunctionSuccess() throws Exception {
     }
 
     @Test
-    public void testUpdateFunctionWithUrl() {
+    public void testUpdateFunctionWithUrl() throws Exception {
         Configurator.setRootLevel(Level.DEBUG);
 
-        String fileLocation = FutureUtil.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+        URL fileUrl = getClass().getClassLoader().getResource("test_worker_config.yml");
+        File file = Paths.get(fileUrl.toURI()).toFile();
+        String fileLocation = file.getAbsolutePath();
         String filePackageUrl = "file://" + fileLocation;
 
         FunctionConfig functionConfig = new FunctionConfig();
@@ -1447,7 +1451,9 @@ public void testDownloadFunctionHttpUrl() throws Exception {
 
     @Test
     public void testDownloadFunctionFile() throws Exception {
-        String fileLocation = FutureUtil.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+        URL fileUrl = getClass().getClassLoader().getResource("test_worker_config.yml");
+        File file = Paths.get(fileUrl.toURI()).toFile();
+        String fileLocation = file.getAbsolutePath();
         String testDir = FunctionApiV2ResourceTest.class.getProtectionDomain().getCodeSource().getLocation().getPath();
         FunctionsImplV2 function = new FunctionsImplV2(() -> mockedWorkerService);
         StreamingOutput streamOutput = (StreamingOutput) function.downloadFunction("file://" + fileLocation, null).getEntity();
@@ -1461,10 +1467,12 @@ public void testDownloadFunctionFile() throws Exception {
     }
 
     @Test
-    public void testRegisterFunctionFileUrlWithValidSinkClass() {
+    public void testRegisterFunctionFileUrlWithValidSinkClass() throws Exception {
         Configurator.setRootLevel(Level.DEBUG);
 
-        String fileLocation = FutureUtil.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+        URL fileUrl = getClass().getClassLoader().getResource("test_worker_config.yml");
+        File file = Paths.get(fileUrl.toURI()).toFile();
+        String fileLocation = file.getAbsolutePath();
         String filePackageUrl = "file://" + fileLocation;
         when(mockedManager.containsFunction(eq(tenant), eq(namespace), eq(function))).thenReturn(false);
 
@@ -1492,14 +1500,16 @@ public void testRegisterFunctionFileUrlWithValidSinkClass() {
     }
 
     @Test
-    public void testRegisterFunctionWithConflictingFields() {
+    public void testRegisterFunctionWithConflictingFields() throws Exception {
         Configurator.setRootLevel(Level.DEBUG);
         String actualTenant = "DIFFERENT_TENANT";
         String actualNamespace = "DIFFERENT_NAMESPACE";
         String actualName = "DIFFERENT_NAME";
         this.namespaceList.add(actualTenant + "/" + actualNamespace);
 
-        String fileLocation = FutureUtil.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+        URL fileUrl = getClass().getClassLoader().getResource("test_worker_config.yml");
+        File file = Paths.get(fileUrl.toURI()).toFile();
+        String fileLocation = file.getAbsolutePath();
         String filePackageUrl = "file://" + fileLocation;
         when(mockedManager.containsFunction(eq(tenant), eq(namespace), eq(function))).thenReturn(true);
         when(mockedManager.containsFunction(eq(actualTenant), eq(actualNamespace), eq(actualName))).thenReturn(false);
diff --git a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionApiV3ResourceTest.java b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionApiV3ResourceTest.java
index b65d5402f7b35..16e5e3077f72e 100644
--- a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionApiV3ResourceTest.java
+++ b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/rest/api/v3/FunctionApiV3ResourceTest.java
@@ -37,6 +37,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URL;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -1488,7 +1490,9 @@ public void testDownloadFunctionHttpUrl() throws Exception {
 
     @Test
     public void testDownloadFunctionFile() throws Exception {
-        String fileLocation = FutureUtil.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+        URL fileUrl = getClass().getClassLoader().getResource("test_worker_config.yml");
+        File file = Paths.get(fileUrl.toURI()).toFile();
+        String fileLocation = file.getAbsolutePath();
         String testDir = FunctionApiV3ResourceTest.class.getProtectionDomain().getCodeSource().getLocation().getPath();
         WorkerService worker = mock(WorkerService.class);
         doReturn(true).when(worker).isInitialized();
@@ -1507,10 +1511,12 @@ public void testDownloadFunctionFile() throws Exception {
     }
 
     @Test
-    public void testRegisterFunctionFileUrlWithValidSinkClass() {
+    public void testRegisterFunctionFileUrlWithValidSinkClass() throws Exception {
         Configurator.setRootLevel(Level.DEBUG);
 
-        String fileLocation = FutureUtil.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+        URL fileUrl = getClass().getClassLoader().getResource("test_worker_config.yml");
+        File file = Paths.get(fileUrl.toURI()).toFile();
+        String fileLocation = file.getAbsolutePath();
         String filePackageUrl = "file://" + fileLocation;
         when(mockedManager.containsFunction(eq(tenant), eq(namespace), eq(function))).thenReturn(false);
 
@@ -1533,14 +1539,16 @@ public void testRegisterFunctionFileUrlWithValidSinkClass() {
     }
 
     @Test
-    public void testRegisterFunctionWithConflictingFields() {
+    public void testRegisterFunctionWithConflictingFields() throws Exception {
         Configurator.setRootLevel(Level.DEBUG);
         String actualTenant = "DIFFERENT_TENANT";
         String actualNamespace = "DIFFERENT_NAMESPACE";
         String actualName = "DIFFERENT_NAME";
         this.namespaceList.add(actualTenant + "/" + actualNamespace);
 
-        String fileLocation = FutureUtil.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+        URL fileUrl = getClass().getClassLoader().getResource("test_worker_config.yml");
+        File file = Paths.get(fileUrl.toURI()).toFile();
+        String fileLocation = file.getAbsolutePath();
         String filePackageUrl = "file://" + fileLocation;
         when(mockedManager.containsFunction(eq(tenant), eq(namespace), eq(function))).thenReturn(true);
         when(mockedManager.containsFunction(eq(actualTenant), eq(actualNamespace), eq(actualName))).thenReturn(false);
@@ -1563,10 +1571,12 @@ public void testRegisterFunctionWithConflictingFields() {
     }
 
     @Test(expectedExceptions = RestException.class, expectedExceptionsMessageRegExp = "Function language runtime is either not set or cannot be determined")
-    public void testCreateFunctionWithoutSettingRuntime() {
+    public void testCreateFunctionWithoutSettingRuntime() throws Exception {
         Configurator.setRootLevel(Level.DEBUG);
 
-        String fileLocation = FutureUtil.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+        URL fileUrl = getClass().getClassLoader().getResource("test_worker_config.yml");
+        File file = Paths.get(fileUrl.toURI()).toFile();
+        String fileLocation = file.getAbsolutePath();
         String filePackageUrl = "file://" + fileLocation;
         when(mockedManager.containsFunction(eq(tenant), eq(namespace), eq(function))).thenReturn(false);
 
diff --git a/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeAbstractSink.java b/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeAbstractSink.java
index fe3787a0ce169..7374f8adc713e 100644
--- a/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeAbstractSink.java
+++ b/pulsar-io/aerospike/src/main/java/org/apache/pulsar/io/aerospike/AerospikeAbstractSink.java
@@ -71,14 +71,13 @@ public void open(Map<String, Object> config, SinkContext sinkContext) throws Exc
         writePolicy = new WritePolicy();
         writePolicy.maxRetries = aerospikeSinkConfig.getRetries();
         writePolicy.setTimeout(aerospikeSinkConfig.getTimeoutMs());
-        createClient();
+        eventLoops = new NioEventLoops(new EventPolicy(), 1);
+        eventLoop = eventLoops.next();
+        createClient(eventLoops);
         queue = new LinkedBlockingDeque<>(aerospikeSinkConfig.getMaxConcurrentRequests());
         for (int i = 0; i < aerospikeSinkConfig.getMaxConcurrentRequests(); ++i) {
             queue.put(new AWriteListener(queue));
         }
-
-        eventLoops = new NioEventLoops(new EventPolicy(), 1);
-        eventLoop = eventLoops.next();
     }
 
     @Override
@@ -109,7 +108,7 @@ public void write(Record<byte[]> record) {
         client.put(eventLoop, listener, writePolicy, key, bin);
     }
 
-    private void createClient() {
+    private void createClient(NioEventLoops eventLoops) {
         String[] hosts = aerospikeSinkConfig.getSeedHosts().split(",");
         if (hosts.length <= 0) {
             throw new RuntimeException("Invalid Seed Hosts");
@@ -125,6 +124,7 @@ private void createClient() {
             policy.user = aerospikeSinkConfig.getUserName();
             policy.password = aerospikeSinkConfig.getPassword();
         }
+        policy.eventLoops = eventLoops;
         client = new AerospikeClient(policy, aeroSpikeHosts);
     }
 
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfig.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfig.java
index 9a7b1cbe58ad4..b646236af21ba 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfig.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfig.java
@@ -52,6 +52,15 @@ public class ElasticSearchConfig implements Serializable {
     )
     private String indexName;
 
+    @FieldDoc(
+        required = false,
+        defaultValue = "_doc",
+        help = "The type name that the connector writes messages to, with the default value set to _doc." +
+                " This value should be set explicitly to a valid type name other than _doc for Elasticsearch version before 6.2," +
+                " and left to the default value otherwise."
+    )
+    private String typeName = "_doc";
+
     @FieldDoc(
         required = false,
         defaultValue = "1",
diff --git a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSink.java b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSink.java
index 58eb30aa55c02..d55510d1408b4 100644
--- a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSink.java
+++ b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchSink.java
@@ -61,8 +61,6 @@
 )
 public class ElasticSearchSink implements Sink<byte[]> {
 
-    protected static final String DOCUMENT = "_doc";
-
     private URL url;
     private RestHighLevelClient client;
     private CredentialsProvider credentialsProvider;
@@ -84,7 +82,7 @@ public void close() throws Exception {
     public void write(Record<byte[]> record) {
         KeyValue<String, byte[]> keyValue = extractKeyValue(record);
         IndexRequest indexRequest = Requests.indexRequest(elasticSearchConfig.getIndexName());
-        indexRequest.type(DOCUMENT);
+        indexRequest.type(elasticSearchConfig.getTypeName());
         indexRequest.source(keyValue.getValue(), XContentType.JSON);
 
         try {
diff --git a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfigTests.java b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfigTests.java
index 63fbe1680c80f..68928ff07bce8 100644
--- a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfigTests.java
+++ b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfigTests.java
@@ -20,9 +20,11 @@
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -37,8 +39,9 @@ public final void loadFromYamlFileTest() throws IOException {
         assertNotNull(config);
         assertEquals(config.getElasticSearchUrl(), "http://localhost:90902");
         assertEquals(config.getIndexName(), "myIndex");
+        assertEquals(config.getTypeName(), "doc");
         assertEquals(config.getUsername(), "scooby");
-        assertEquals(config.getPassword(), "doobie");               
+        assertEquals(config.getPassword(), "doobie");
     }
     
     @Test
@@ -46,6 +49,7 @@ public final void loadFromMapTest() throws IOException {
         Map<String, Object> map = new HashMap<String, Object> ();
         map.put("elasticSearchUrl", "http://localhost:90902");
         map.put("indexName", "myIndex");
+        map.put("typeName", "doc");
         map.put("username", "racerX");
         map.put("password", "go-speedie-go");
         
@@ -53,9 +57,23 @@ public final void loadFromMapTest() throws IOException {
         assertNotNull(config);
         assertEquals(config.getElasticSearchUrl(), "http://localhost:90902");
         assertEquals(config.getIndexName(), "myIndex");
+        assertEquals(config.getTypeName(), "doc");
         assertEquals(config.getUsername(), "racerX");
         assertEquals(config.getPassword(), "go-speedie-go");  
     }
+
+    @Test
+    public final void defaultValueTest() throws IOException {
+        ElasticSearchConfig config = ElasticSearchConfig.load(Collections.emptyMap());
+
+        assertNull(config.getElasticSearchUrl());
+        assertNull(config.getIndexName());
+        assertEquals(config.getTypeName(), "_doc");
+        assertNull(config.getUsername());
+        assertNull(config.getPassword());
+        assertEquals(config.getIndexNumberOfReplicas(), 1);
+        assertEquals(config.getIndexNumberOfShards(), 1);
+    }
     
     @Test
     public final void validValidateTest() throws IOException {
diff --git a/pulsar-io/elastic-search/src/test/resources/sinkConfig.yaml b/pulsar-io/elastic-search/src/test/resources/sinkConfig.yaml
index 1872d8132982d..4347a4a09ad72 100644
--- a/pulsar-io/elastic-search/src/test/resources/sinkConfig.yaml
+++ b/pulsar-io/elastic-search/src/test/resources/sinkConfig.yaml
@@ -20,6 +20,7 @@
 {
    "elasticSearchUrl": "http://localhost:90902",
    "indexName": "myIndex",
+   "typeName": "doc",
    "username": "scooby",
    "password": "doobie"
-}
\ No newline at end of file
+}
diff --git a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/node/AbstractConfigurationProvider.java b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/node/AbstractConfigurationProvider.java
index 36bbe5510e93e..7b39714cb7d95 100644
--- a/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/node/AbstractConfigurationProvider.java
+++ b/pulsar-io/flume/src/main/java/org/apache/pulsar/io/flume/node/AbstractConfigurationProvider.java
@@ -109,8 +109,8 @@ public MaterializedConfiguration getConfiguration() {
                 for (String channelName : channelNames) {
                     ChannelComponent channelComponent = channelComponentMap.get(channelName);
                     if (channelComponent.components.isEmpty()) {
-                        LOGGER.warn(String.format("Channel %s has no components connected" +
-                                " and has been removed.", channelName));
+                        LOGGER.warn("Channel {} has no components connected" +
+                                " and has been removed.", channelName);
                         channelComponentMap.remove(channelName);
                         Map<String, Channel> nameChannelMap =
                                 channelCache.get(channelComponent.channel.getClass());
@@ -118,8 +118,8 @@ public MaterializedConfiguration getConfiguration() {
                             nameChannelMap.remove(channelName);
                         }
                     } else {
-                        LOGGER.info(String.format("Channel %s connected to %s",
-                                channelName, channelComponent.components.toString()));
+                        LOGGER.info("Channel {} connected to {}",
+                                channelName, channelComponent.components.toString());
                         conf.addChannel(channelName, channelComponent.channel);
                     }
                 }
diff --git a/pulsar-io/kinesis/pom.xml b/pulsar-io/kinesis/pom.xml
index 5f76aed100526..43c5ed072280f 100644
--- a/pulsar-io/kinesis/pom.xml
+++ b/pulsar-io/kinesis/pom.xml
@@ -81,13 +81,13 @@
     <dependency>
       <groupId>software.amazon.kinesis</groupId>
       <artifactId>amazon-kinesis-client</artifactId>
-      <version>2.2.3</version>
+      <version>2.2.8</version>
     </dependency>
 
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>amazon-kinesis-producer</artifactId>
-      <version>0.13.1</version>
+      <version>0.14.0</version>
     </dependency>
 
     <dependency>
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>sts</artifactId>
-      <version>2.8.5</version>
+      <version>2.10.56</version>
     </dependency>
 	<!-- /kinesis dependencies -->
 
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/zookeeper/ZKMetadataStore.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/zookeeper/ZKMetadataStore.java
index 58b1c107dce13..77b3ba2494643 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/zookeeper/ZKMetadataStore.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/zookeeper/ZKMetadataStore.java
@@ -18,13 +18,13 @@
  */
 package org.apache.pulsar.metadata.impl.zookeeper;
 
-import com.google.common.annotations.VisibleForTesting;
-
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import org.apache.bookkeeper.util.ZkUtils;
 import org.apache.bookkeeper.zookeeper.BoundExponentialBackoffRetryPolicy;
@@ -43,26 +43,35 @@
 import org.apache.zookeeper.ZooDefs;
 import org.apache.zookeeper.ZooKeeper;
 
+import com.google.common.annotations.VisibleForTesting;
+
+import io.netty.util.concurrent.DefaultThreadFactory;
+
 public class ZKMetadataStore implements MetadataStore {
 
+    private final boolean isZkManaged;
     private final ZooKeeper zkc;
+    private final ExecutorService executor;
 
     public ZKMetadataStore(String metadataURL, MetadataStoreConfig metadataStoreConfig) throws IOException {
         try {
-            zkc = ZooKeeperClient.newBuilder()
-                    .connectString(metadataURL)
+            isZkManaged = true;
+            zkc = ZooKeeperClient.newBuilder().connectString(metadataURL)
                     .connectRetryPolicy(new BoundExponentialBackoffRetryPolicy(100, 60_000, Integer.MAX_VALUE))
                     .allowReadOnlyMode(metadataStoreConfig.isAllowReadOnlyOperations())
-                    .sessionTimeoutMs(metadataStoreConfig.getSessionTimeoutMillis())
-                    .build();
+                    .sessionTimeoutMs(metadataStoreConfig.getSessionTimeoutMillis()).build();
         } catch (KeeperException | InterruptedException e) {
             throw new IOException(e);
         }
+
+        this.executor = Executors.newSingleThreadExecutor(new DefaultThreadFactory("zk-metadata-store-callback"));
     }
 
     @VisibleForTesting
     public ZKMetadataStore(ZooKeeper zkc) {
+        this.isZkManaged = false;
         this.zkc = zkc;
+        this.executor = Executors.newSingleThreadExecutor(new DefaultThreadFactory("zk-metadata-store-callback"));
     }
 
     @Override
@@ -71,14 +80,16 @@ public CompletableFuture<Optional<GetResult>> get(String path) {
 
         try {
             zkc.getData(path, null, (rc, path1, ctx, data, stat) -> {
-                Code code = Code.get(rc);
-                if (code == Code.OK) {
-                    future.complete(Optional.of(new GetResult(data, getStat(stat))));
-                } else if (code == Code.NONODE) {
-                    future.complete(Optional.empty());
-                } else {
-                    future.completeExceptionally(getException(code, path));
-                }
+                executor.execute(() -> {
+                    Code code = Code.get(rc);
+                    if (code == Code.OK) {
+                        future.complete(Optional.of(new GetResult(data, getStat(stat))));
+                    } else if (code == Code.NONODE) {
+                        future.complete(Optional.empty());
+                    } else {
+                        future.completeExceptionally(getException(code, path));
+                    }
+                });
             }, null);
         } catch (Throwable t) {
             future.completeExceptionally(new MetadataStoreException(t));
@@ -93,36 +104,37 @@ public CompletableFuture<List<String>> getChildren(String path) {
 
         try {
             zkc.getChildren(path, null, (rc, path1, ctx, children) -> {
-                Code code = Code.get(rc);
-                if (code == Code.OK) {
-                    Collections.sort(children);
-                    future.complete(children);
-                } else if (code == Code.NONODE) {
-                    // The node we want may not exist yet, so put a watcher on its existence
-                    // before throwing up the exception. Its possible that the node could have
-                    // been created after the call to getChildren, but before the call to exists().
-                    // If this is the case, exists will return true, and we just call getChildren again.
-                    exists(path).thenAccept(exists -> {
-                        if (exists) {
-                            getChildren(path)
-                                    .thenAccept(c -> future.complete(c))
-                                    .exceptionally(ex -> {
-                                        future.completeExceptionally(ex);
-                                        return null;
-                                    });
-                        } else {
-                            // Z-node does not exist
-                            future.complete(Collections.emptyList());
-                        }
-                    }).exceptionally(ex -> {
-                        future.completeExceptionally(ex);
-                        return null;
-                    });
+                executor.execute(() -> {
+                    Code code = Code.get(rc);
+                    if (code == Code.OK) {
+                        Collections.sort(children);
+                        future.complete(children);
+                    } else if (code == Code.NONODE) {
+                        // The node we want may not exist yet, so put a watcher on its existence
+                        // before throwing up the exception. Its possible that the node could have
+                        // been created after the call to getChildren, but before the call to exists().
+                        // If this is the case, exists will return true, and we just call getChildren
+                        // again.
+                        exists(path).thenAccept(exists -> {
+                            if (exists) {
+                                getChildren(path).thenAccept(c -> future.complete(c)).exceptionally(ex -> {
+                                    future.completeExceptionally(ex);
+                                    return null;
+                                });
+                            } else {
+                                // Z-node does not exist
+                                future.complete(Collections.emptyList());
+                            }
+                        }).exceptionally(ex -> {
+                            future.completeExceptionally(ex);
+                            return null;
+                        });
 
-                    future.complete(Collections.emptyList());
-                } else {
-                    future.completeExceptionally(getException(code, path));
-                }
+                        future.complete(Collections.emptyList());
+                    } else {
+                        future.completeExceptionally(getException(code, path));
+                    }
+                });
             }, null);
         } catch (Throwable t) {
             future.completeExceptionally(new MetadataStoreException(t));
@@ -137,14 +149,16 @@ public CompletableFuture<Boolean> exists(String path) {
 
         try {
             zkc.exists(path, null, (StatCallback) (rc, path1, ctx, stat) -> {
-                Code code = Code.get(rc);
-                if (code == Code.OK) {
-                    future.complete(true);
-                } else if (code == Code.NONODE) {
-                    future.complete(false);
-                } else {
-                    future.completeExceptionally(getException(code, path));
-                }
+                executor.execute(() -> {
+                    Code code = Code.get(rc);
+                    if (code == Code.OK) {
+                        future.complete(true);
+                    } else if (code == Code.NONODE) {
+                        future.complete(false);
+                    } else {
+                        future.completeExceptionally(getException(code, path));
+                    }
+                });
             }, future);
         } catch (Throwable t) {
             future.completeExceptionally(new MetadataStoreException(t));
@@ -163,39 +177,42 @@ public CompletableFuture<Stat> put(String path, byte[] value, Optional<Long> opt
         try {
             if (hasVersion && expectedVersion == -1) {
                 ZkUtils.asyncCreateFullPathOptimistic(zkc, path, value, ZooDefs.Ids.OPEN_ACL_UNSAFE,
-                        CreateMode.PERSISTENT,
-                        (rc, path1, ctx, name) -> {
-                            Code code = Code.get(rc);
-                            if (code == Code.OK) {
-                                future.complete(new Stat(0, 0, 0));
-                            } else if (code == Code.NODEEXISTS) {
-                                // We're emulating a request to create node, so the version is invalid
-                                future.completeExceptionally(getException(Code.BADVERSION, path));
-                            } else {
-                                future.completeExceptionally(getException(code, path));
-                            }
+                        CreateMode.PERSISTENT, (rc, path1, ctx, name) -> {
+                            executor.execute(() -> {
+                                Code code = Code.get(rc);
+                                if (code == Code.OK) {
+                                    future.complete(new Stat(0, 0, 0));
+                                } else if (code == Code.NODEEXISTS) {
+                                    // We're emulating a request to create node, so the version is invalid
+                                    future.completeExceptionally(getException(Code.BADVERSION, path));
+                                } else {
+                                    future.completeExceptionally(getException(code, path));
+                                }
+                            });
                         }, null);
             } else {
                 zkc.setData(path, value, expectedVersion, (rc, path1, ctx, stat) -> {
-                    Code code = Code.get(rc);
-                    if (code == Code.OK) {
-                        future.complete(getStat(stat));
-                    } else if (code == Code.NONODE) {
-                        if (hasVersion) {
-                            // We're emulating here a request to update or create the znode, depending on the version
-                            future.completeExceptionally(getException(Code.BADVERSION, path));
+                    executor.execute(() -> {
+                        Code code = Code.get(rc);
+                        if (code == Code.OK) {
+                            future.complete(getStat(stat));
+                        } else if (code == Code.NONODE) {
+                            if (hasVersion) {
+                                // We're emulating here a request to update or create the znode, depending on
+                                // the version
+                                future.completeExceptionally(getException(Code.BADVERSION, path));
+                            } else {
+                                // The z-node does not exist, let's create it first
+                                put(path, value, Optional.of(-1L)).thenAccept(s -> future.complete(s))
+                                        .exceptionally(ex -> {
+                                            future.completeExceptionally(ex.getCause());
+                                            return null;
+                                        });
+                            }
                         } else {
-                            // The z-node does not exist, let's create it first
-                            put(path, value, Optional.of(-1L))
-                                    .thenAccept(s -> future.complete(s))
-                                    .exceptionally(ex -> {
-                                        future.completeExceptionally(ex.getCause());
-                                        return null;
-                                    });
+                            future.completeExceptionally(getException(code, path));
                         }
-                    } else {
-                        future.completeExceptionally(getException(code, path));
-                    }
+                    });
                 }, null);
             }
         } catch (Throwable t) {
@@ -213,12 +230,14 @@ public CompletableFuture<Void> delete(String path, Optional<Long> optExpectedVer
 
         try {
             zkc.delete(path, expectedVersion, (rc, path1, ctx) -> {
-                Code code = Code.get(rc);
-                if (code == Code.OK) {
-                    future.complete(null);
-                } else {
-                    future.completeExceptionally(getException(code, path));
-                }
+                executor.execute(() -> {
+                    Code code = Code.get(rc);
+                    if (code == Code.OK) {
+                        future.complete(null);
+                    } else {
+                        future.completeExceptionally(getException(code, path));
+                    }
+                });
             }, null);
         } catch (Throwable t) {
             future.completeExceptionally(new MetadataStoreException(t));
@@ -229,7 +248,10 @@ public CompletableFuture<Void> delete(String path, Optional<Long> optExpectedVer
 
     @Override
     public void close() throws Exception {
-        zkc.close();
+        if (isZkManaged) {
+            zkc.close();
+        }
+        executor.shutdownNow();
     }
 
     private static Stat getStat(org.apache.zookeeper.data.Stat zkStat) {
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyParserTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyParserTest.java
index 7ae6cc03a00c5..3557441d80612 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyParserTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyParserTest.java
@@ -141,7 +141,8 @@ public void testProducerConsumer() throws Exception {
 
     @Test
     public void testPartitions() throws Exception {
-        admin.tenants().createTenant("sample", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("sample", tenantInfo);
         PulsarClient client = PulsarClient.builder().serviceUrl(proxyService.getServiceUrl())
                 .build();
         admin.topics().createPartitionedTopic("persistent://sample/test/local/partitioned-topic", 2);
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTest.java
index f9e4e11203cc3..7b308d198e401 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTest.java
@@ -45,6 +45,7 @@
 import org.apache.pulsar.client.api.Producer;
 import org.apache.pulsar.client.api.PulsarClient;
 import org.apache.pulsar.client.api.Schema;
+import org.apache.pulsar.client.api.SubscriptionInitialPosition;
 import org.apache.pulsar.client.api.SubscriptionType;
 import org.apache.pulsar.client.impl.ClientCnx;
 import org.apache.pulsar.client.impl.ConnectionPool;
@@ -112,22 +113,27 @@ protected void cleanup() throws Exception {
 
     @Test
     public void testProducer() throws Exception {
+        @Cleanup
         PulsarClient client = PulsarClient.builder().serviceUrl(proxyService.getServiceUrl())
                 .build();
-        Producer<byte[]> producer = client.newProducer(Schema.BYTES).topic("persistent://sample/test/local/producer-topic")
-                .create();
+
+        @Cleanup
+        Producer<byte[]> producer = client.newProducer()
+            .topic("persistent://sample/test/local/producer-topic")
+            .create();
 
         for (int i = 0; i < 10; i++) {
             producer.send("test".getBytes());
         }
-
-        client.close();
     }
 
     @Test
     public void testProducerConsumer() throws Exception {
+        @Cleanup
         PulsarClient client = PulsarClient.builder().serviceUrl(proxyService.getServiceUrl())
                 .build();
+
+        @Cleanup
         Producer<byte[]> producer = client.newProducer(Schema.BYTES)
             .topic("persistent://sample/test/local/producer-consumer-topic")
             .enableBatching(false)
@@ -135,6 +141,7 @@ public void testProducerConsumer() throws Exception {
             .create();
 
         // Create a consumer directly attached to broker
+        @Cleanup
         Consumer<byte[]> consumer = pulsarClient.newConsumer()
                 .topic("persistent://sample/test/local/producer-consumer-topic").subscriptionName("my-sub").subscribe();
 
@@ -150,24 +157,25 @@ public void testProducerConsumer() throws Exception {
 
         Message<byte[]> msg = consumer.receive(0, TimeUnit.SECONDS);
         checkArgument(msg == null);
-
-        consumer.close();
-        client.close();
     }
 
     @Test
     public void testPartitions() throws Exception {
-        admin.tenants().createTenant("sample", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("sample", tenantInfo);
+        @Cleanup
         PulsarClient client = PulsarClient.builder().serviceUrl(proxyService.getServiceUrl())
                 .build();
         admin.topics().createPartitionedTopic("persistent://sample/test/local/partitioned-topic", 2);
 
+        @Cleanup
         Producer<byte[]> producer = client.newProducer(Schema.BYTES)
             .topic("persistent://sample/test/local/partitioned-topic")
             .enableBatching(false)
             .messageRoutingMode(MessageRoutingMode.RoundRobinPartition).create();
 
         // Create a consumer directly attached to broker
+        @Cleanup
         Consumer<byte[]> consumer = pulsarClient.newConsumer().topic("persistent://sample/test/local/partitioned-topic")
                 .subscriptionName("my-sub").subscribe();
 
@@ -179,8 +187,6 @@ public void testPartitions() throws Exception {
             Message<byte[]> msg = consumer.receive(1, TimeUnit.SECONDS);
             checkNotNull(msg);
         }
-
-        client.close();
     }
 
     @Test
@@ -191,12 +197,12 @@ public void testRegexSubscription() throws Exception {
 
         // create two topics by subscribing to a topic and closing it
         try (Consumer<byte[]> ignored = client.newConsumer()
-            .topic("persistent://sample/test/local/topic1")
+            .topic("persistent://sample/test/local/regex-sub-topic1")
             .subscriptionName("proxy-ignored")
             .subscribe()) {
         }
         try (Consumer<byte[]> ignored = client.newConsumer()
-            .topic("persistent://sample/test/local/topic2")
+            .topic("persistent://sample/test/local/regex-sub-topic2")
             .subscriptionName("proxy-ignored")
             .subscribe()) {
         }
@@ -204,11 +210,12 @@ public void testRegexSubscription() throws Exception {
         String subName = "regex-sub-proxy-test-" + System.currentTimeMillis();
 
         // make sure regex subscription
-        String regexSubscriptionPattern = "persistent://sample/test/local/topic.*";
+        String regexSubscriptionPattern = "persistent://sample/test/local/regex-sub-topic.*";
         log.info("Regex subscribe to topics {}", regexSubscriptionPattern);
         try (Consumer<byte[]> consumer = client.newConsumer()
             .topicsPattern(regexSubscriptionPattern)
             .subscriptionName(subName)
+            .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
             .subscribe()) {
             log.info("Successfully subscribe to topics using regex {}", regexSubscriptionPattern);
 
@@ -231,13 +238,14 @@ public void testRegexSubscription() throws Exception {
 
     @Test
     public void testGetSchema() throws Exception {
+        @Cleanup
         PulsarClient client = PulsarClient.builder().serviceUrl(proxyService.getServiceUrl())
                 .build();
-        Producer<Foo> producer;
         Schema<Foo> schema = Schema.AVRO(Foo.class);
         try {
-            producer = client.newProducer(schema).topic("persistent://sample/test/local/get-schema")
-                    .create();
+            try (Producer<Foo> ignored = client.newProducer(schema).topic("persistent://sample/test/local/get-schema")
+                .create()) {
+            }
         } catch (Exception ex) {
             Assert.fail("Should not have failed since can acquire LookupRequestSemaphore");
         }
@@ -246,10 +254,9 @@ public void testGetSchema() throws Exception {
         for (int i = 0; i<8; i++){
             schemaVersion[i] = b;
         }
-        SchemaInfo schemaInfo = ((PulsarClientImpl)client).getLookup()
+        SchemaInfo schemaInfo = ((PulsarClientImpl) client).getLookup()
                 .getSchema(TopicName.get("persistent://sample/test/local/get-schema"), schemaVersion).get().orElse(null);
         Assert.assertEquals(new String(schemaInfo.getSchema()), new String(schema.getSchemaInfo().getSchema()));
-        client.close();
     }
 
     @Test
@@ -259,9 +266,14 @@ public void testProtocolVersionAdvertisement() throws Exception {
 
         ClientConfigurationData conf = new ClientConfigurationData();
         conf.setServiceUrl(proxyService.getServiceUrl());
+
+        @Cleanup
         PulsarClient client = getClientActiveConsumerChangeNotSupported(conf);
 
+        @Cleanup
         Producer<byte[]> producer = client.newProducer().topic(topic).create();
+
+        @Cleanup
         Consumer<byte[]> consumer = client.newConsumer().topic(topic).subscriptionName(sub)
                 .subscriptionType(SubscriptionType.Failover).subscribe();
 
@@ -274,10 +286,6 @@ public void testProtocolVersionAdvertisement() throws Exception {
             checkNotNull(msg);
             consumer.acknowledge(msg);
         }
-
-        producer.close();
-        consumer.close();
-        client.close();
     }
 
 
diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsTest.java
index 7fdd9fd95bf87..847e6a569ca6e 100644
--- a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsTest.java
+++ b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyTlsTest.java
@@ -98,7 +98,8 @@ public void testPartitions() throws Exception {
         PulsarClient client = PulsarClient.builder()
                 .serviceUrl(proxyService.getServiceUrlTls())
                 .allowTlsInsecureConnection(false).tlsTrustCertsFilePath(TLS_TRUST_CERT_FILE_PATH).build();
-        admin.tenants().createTenant("sample", new TenantInfo());
+        TenantInfo tenantInfo = createDefaultTenantInfo();
+        admin.tenants().createTenant("sample", tenantInfo);
         admin.topics().createPartitionedTopic("persistent://sample/test/local/partitioned-topic", 2);
 
         Producer<byte[]> producer = client.newProducer(Schema.BYTES).topic("persistent://sample/test/local/partitioned-topic")
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index d130836de8d0f..32b2396743f0b 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -246,8 +245,9 @@ The Apache Software License, Version 2.0
     - netty-tcnative-boringssl-static-2.0.26.Final.jar
     - netty-transport-4.1.43.Final.jar
     - netty-transport-native-epoll-4.1.43.Final.jar
-    - netty-transport-native-epoll-4.1.33.Final-linux-x86_64.jar
+    - netty-transport-native-epoll-4.1.43.Final-linux-x86_64.jar
     - netty-transport-native-unix-common-4.1.43.Final.jar
+    - netty-transport-native-unix-common-4.1.43.Final-linux-x86_64.jar
  * Joda Time
     - joda-time-2.9.9.jar
     - joda-time-2.10.1.jar
@@ -355,6 +355,8 @@ The Apache Software License, Version 2.0
   * Avro
     - avro-1.9.1.jar
     - avro-protobuf-1.9.1.jar
+  * Caffeine
+    - caffeine-2.6.2.jar
   * Javax
     - javax.inject-1.jar
     - javax.inject-1.jar
@@ -446,8 +448,8 @@ The Apache Software License, Version 2.0
     - memory-0.8.3.jar
     - sketches-core-0.8.3.jar
   * Apache Zookeeper
-    - zookeeper-3.5.6.jar
-    - zookeeper-jute-3.5.6.jar 
+    - zookeeper-3.5.7.jar
+    - zookeeper-jute-3.5.7.jar
   * Apache Yetus Audience Annotations
     - audience-annotations-0.5.0.jar
   * Swagger
diff --git a/pulsar-sql/presto-pulsar/pom.xml b/pulsar-sql/presto-pulsar/pom.xml
index 87dfa2838534c..4d184d58c37bd 100644
--- a/pulsar-sql/presto-pulsar/pom.xml
+++ b/pulsar-sql/presto-pulsar/pom.xml
@@ -124,6 +124,7 @@
                                     <include>org.apache.pulsar:pulsar-client-original</include>
                                     <include>org.apache.pulsar:pulsar-client-admin-original</include>
                                     <include>org.apache.pulsar:managed-ledger</include>
+                                    <include>org.apache.pulsar:pulsar-metadata</include>
 
                                     <include>org.glassfish.jersey*:*</include>
                                     <include>javax.ws.rs:*</include>
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/AvroSchemaHandler.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/AvroSchemaHandler.java
index f6807a2b19a14..3e3685ebd6175 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/AvroSchemaHandler.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/AvroSchemaHandler.java
@@ -77,6 +77,11 @@ public Object deserialize(ByteBuf payload) {
         return null;
     }
 
+    @Override
+    public Object deserialize(ByteBuf keyPayload, ByteBuf dataPayload) {
+        return null;
+    }
+
     @Override
     public Object extractField(int index, Object currentRecord) {
         try {
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/JSONSchemaHandler.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/JSONSchemaHandler.java
index 8649e41fc3c7a..99863a36dae5c 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/JSONSchemaHandler.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/JSONSchemaHandler.java
@@ -73,6 +73,11 @@ public Object deserialize(ByteBuf payload) {
         }
     }
 
+    @Override
+    public Object deserialize(ByteBuf keyPayload, ByteBuf dataPayload) {
+        return null;
+    }
+
     @Override
     public Object extractField(int index, Object currentRecord) {
         try {
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/KeyValueSchemaHandler.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/KeyValueSchemaHandler.java
new file mode 100644
index 0000000000000..2f056d3abb8a3
--- /dev/null
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/KeyValueSchemaHandler.java
@@ -0,0 +1,91 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.sql.presto;
+
+import io.airlift.log.Logger;
+import io.netty.buffer.ByteBuf;
+import java.util.List;
+import java.util.Objects;
+import org.apache.pulsar.client.impl.schema.KeyValueSchemaInfo;
+import org.apache.pulsar.common.schema.KeyValue;
+import org.apache.pulsar.common.schema.KeyValueEncodingType;
+import org.apache.pulsar.common.schema.SchemaInfo;
+
+
+/**
+ * Schema handler for payload in the KeyValue format.
+ */
+public class KeyValueSchemaHandler implements SchemaHandler {
+
+    private static final Logger log = Logger.get(KeyValueSchemaHandler.class);
+
+    private final List<PulsarColumnHandle> columnHandles;
+
+    private final SchemaHandler keySchemaHandler;
+
+    private final SchemaHandler valueSchemaHandler;
+
+    private KeyValueEncodingType keyValueEncodingType;
+
+    public KeyValueSchemaHandler(SchemaInfo schemaInfo, List<PulsarColumnHandle> columnHandles) {
+        this.columnHandles = columnHandles;
+        KeyValue<SchemaInfo, SchemaInfo> kvSchemaInfo = KeyValueSchemaInfo.decodeKeyValueSchemaInfo(schemaInfo);
+        keySchemaHandler = PulsarSchemaHandlers.newPulsarSchemaHandler(kvSchemaInfo.getKey(), columnHandles);
+        valueSchemaHandler = PulsarSchemaHandlers.newPulsarSchemaHandler(kvSchemaInfo.getValue(), columnHandles);
+        keyValueEncodingType = KeyValueSchemaInfo.decodeKeyValueEncodingType(schemaInfo);
+    }
+
+    @Override
+    public Object deserialize(ByteBuf payload) {
+        return null;
+    }
+
+    @Override
+    public Object deserialize(ByteBuf keyPayload, ByteBuf dataPayload) {
+        ByteBuf keyByteBuf;
+        ByteBuf valueByteBuf;
+        if (Objects.equals(keyValueEncodingType, KeyValueEncodingType.INLINE)) {
+            dataPayload.resetReaderIndex();
+            int keyLength = dataPayload.readInt();
+            keyByteBuf = dataPayload.readSlice(keyLength);
+
+            int valueLength = dataPayload.readInt();
+            valueByteBuf = dataPayload.readSlice(valueLength);
+        } else {
+            keyByteBuf = keyPayload;
+            valueByteBuf = dataPayload;
+        }
+        Object keyObj = keySchemaHandler.deserialize(keyByteBuf);
+        Object valueObj = valueSchemaHandler.deserialize(valueByteBuf);
+        return new KeyValue<>(keyObj, valueObj);
+    }
+
+    @Override
+    public Object extractField(int index, Object currentRecord) {
+        PulsarColumnHandle pulsarColumnHandle = this.columnHandles.get(index);
+        KeyValue<Object, Object> keyValue = (KeyValue<Object, Object>) currentRecord;
+        if (pulsarColumnHandle.isKey()) {
+            return keySchemaHandler.extractField(index, keyValue.getKey());
+        } else if (pulsarColumnHandle.isValue()) {
+            return valueSchemaHandler.extractField(index, keyValue.getValue());
+        }
+        return null;
+    }
+
+}
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnHandle.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnHandle.java
index 2a1bd43e07e97..2a07f52e548bd 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnHandle.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnHandle.java
@@ -24,8 +24,10 @@
 import com.facebook.presto.spi.ColumnMetadata;
 import com.facebook.presto.spi.type.Type;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * This class represents the basic information about a presto column.
@@ -58,6 +60,26 @@ public class PulsarColumnHandle implements ColumnHandle {
 
     private final Integer[] positionIndices;
 
+    private HandleKeyValueType handleKeyValueType;
+
+    /**
+     * Column Handle keyValue type, used for keyValue schema.
+     */
+    public enum HandleKeyValueType {
+        /**
+         * The handle not for keyValue schema.
+         */
+        NONE,
+        /**
+         * The key schema handle for keyValue schema.
+         */
+        KEY,
+        /**
+         * The value schema handle for keyValue schema.
+         */
+        VALUE
+    }
+
     @JsonCreator
     public PulsarColumnHandle(
             @JsonProperty("connectorId") String connectorId,
@@ -66,7 +88,8 @@ public PulsarColumnHandle(
             @JsonProperty("hidden") boolean hidden,
             @JsonProperty("internal") boolean internal,
             @JsonProperty("fieldNames") String[] fieldNames,
-            @JsonProperty("positionIndices") Integer[] positionIndices) {
+            @JsonProperty("positionIndices") Integer[] positionIndices,
+            @JsonProperty("handleKeyValueType") HandleKeyValueType handleKeyValueType) {
         this.connectorId = requireNonNull(connectorId, "connectorId is null");
         this.name = requireNonNull(name, "name is null");
         this.type = requireNonNull(type, "type is null");
@@ -74,6 +97,11 @@ public PulsarColumnHandle(
         this.internal = internal;
         this.fieldNames = fieldNames;
         this.positionIndices = positionIndices;
+        if (handleKeyValueType == null) {
+            this.handleKeyValueType = HandleKeyValueType.NONE;
+        } else {
+            this.handleKeyValueType = handleKeyValueType;
+        }
     }
 
     @JsonProperty
@@ -111,6 +139,20 @@ public Integer[] getPositionIndices() {
         return positionIndices;
     }
 
+    @JsonProperty
+    public HandleKeyValueType getHandleKeyValueType() {
+        return handleKeyValueType;
+    }
+
+    @JsonIgnore
+    public boolean isKey() {
+        return Objects.equals(handleKeyValueType, HandleKeyValueType.KEY);
+    }
+
+    @JsonIgnore
+    public boolean isValue() {
+        return Objects.equals(handleKeyValueType, HandleKeyValueType.VALUE);
+    }
 
     ColumnMetadata getColumnMetadata() {
         return new ColumnMetadata(name, type, null, hidden);
@@ -145,7 +187,10 @@ public boolean equals(Object o) {
         if (!Arrays.deepEquals(fieldNames, that.fieldNames)) {
             return false;
         }
-        return Arrays.deepEquals(positionIndices, that.positionIndices);
+        if (!Arrays.deepEquals(positionIndices, that.positionIndices)) {
+            return false;
+        }
+        return Objects.equals(handleKeyValueType, that.handleKeyValueType);
     }
 
     @Override
@@ -157,6 +202,7 @@ public int hashCode() {
         result = 31 * result + (internal ? 1 : 0);
         result = 31 * result + Arrays.hashCode(fieldNames);
         result = 31 * result + Arrays.hashCode(positionIndices);
+        result = 31 * result + (handleKeyValueType != null ? handleKeyValueType.hashCode() : 0);
         return result;
     }
 
@@ -170,6 +216,7 @@ public String toString() {
             + ", internal=" + internal
             + ", fieldNames=" + Arrays.toString(fieldNames)
             + ", positionIndices=" + Arrays.toString(positionIndices)
+            + ", handleKeyValueType=" + handleKeyValueType
             + '}';
     }
 }
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnMetadata.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnMetadata.java
index 5b033fac86fec..789ea7f580ac4 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnMetadata.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarColumnMetadata.java
@@ -21,6 +21,7 @@
 import com.facebook.presto.spi.ColumnMetadata;
 import com.facebook.presto.spi.type.Type;
 import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * Description of the column metadata.
@@ -32,15 +33,19 @@ public class PulsarColumnMetadata extends ColumnMetadata {
     private String nameWithCase;
     private String[] fieldNames;
     private Integer[] positionIndices;
+    private PulsarColumnHandle.HandleKeyValueType handleKeyValueType;
+    public final static String KEY_SCHEMA_COLUMN_PREFIX = "__key.";
 
     public PulsarColumnMetadata(String name, Type type, String comment, String extraInfo,
                                 boolean hidden, boolean isInternal,
-                                String[] fieldNames, Integer[] positionIndices) {
+                                String[] fieldNames, Integer[] positionIndices,
+                                PulsarColumnHandle.HandleKeyValueType handleKeyValueType) {
         super(name, type, comment, extraInfo, hidden);
         this.nameWithCase = name;
         this.isInternal = isInternal;
         this.fieldNames = fieldNames;
         this.positionIndices = positionIndices;
+        this.handleKeyValueType = handleKeyValueType;
     }
 
     public String getNameWithCase() {
@@ -59,6 +64,25 @@ public Integer[] getPositionIndices() {
         return positionIndices;
     }
 
+    public PulsarColumnHandle.HandleKeyValueType getHandleKeyValueType() {
+        return handleKeyValueType;
+    }
+
+    public boolean isKey() {
+        return Objects.equals(handleKeyValueType, PulsarColumnHandle.HandleKeyValueType.KEY);
+    }
+
+    public boolean isValue() {
+        return Objects.equals(handleKeyValueType, PulsarColumnHandle.HandleKeyValueType.VALUE);
+    }
+
+    public static String getColumnName(PulsarColumnHandle.HandleKeyValueType handleKeyValueType, String name) {
+        if (Objects.equals(PulsarColumnHandle.HandleKeyValueType.KEY, handleKeyValueType)) {
+            return KEY_SCHEMA_COLUMN_PREFIX + name;
+        }
+        return name;
+    }
+
     @Override
     public String toString() {
         return "PulsarColumnMetadata{"
@@ -66,6 +90,7 @@ public String toString() {
             + ", nameWithCase='" + nameWithCase + '\''
             + ", fieldNames=" + Arrays.toString(fieldNames)
             + ", positionIndices=" + Arrays.toString(positionIndices)
+            + ", handleKeyValueType=" + handleKeyValueType
             + '}';
     }
 
@@ -92,7 +117,10 @@ public boolean equals(Object o) {
         if (!Arrays.deepEquals(fieldNames, that.fieldNames)) {
             return false;
         }
-        return Arrays.deepEquals(positionIndices, that.positionIndices);
+        if (!Arrays.deepEquals(positionIndices, that.positionIndices)) {
+            return false;
+        }
+        return Objects.equals(handleKeyValueType, that.handleKeyValueType);
     }
 
     @Override
@@ -102,6 +130,7 @@ public int hashCode() {
         result = 31 * result + (nameWithCase != null ? nameWithCase.hashCode() : 0);
         result = 31 * result + Arrays.hashCode(fieldNames);
         result = 31 * result + Arrays.hashCode(positionIndices);
+        result = 31 * result + (handleKeyValueType != null ? handleKeyValueType.hashCode() : 0);
         return result;
     }
 }
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorCache.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorCache.java
index 1af86a2225a06..a29aabd155879 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorCache.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarConnectorCache.java
@@ -25,6 +25,9 @@
 import io.airlift.log.Logger;
 import java.io.IOException;
 import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.bookkeeper.common.util.OrderedScheduler;
 import org.apache.bookkeeper.conf.ClientConfiguration;
 import org.apache.bookkeeper.mledger.LedgerOffloader;
@@ -37,8 +40,11 @@
 import org.apache.bookkeeper.mledger.offload.OffloaderUtils;
 import org.apache.bookkeeper.mledger.offload.Offloaders;
 import org.apache.bookkeeper.stats.StatsProvider;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pulsar.PulsarVersion;
+import org.apache.pulsar.common.naming.NamespaceName;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 
 /**
  * Implementation of a cache for the Pulsar connector.
@@ -55,7 +61,8 @@ public class PulsarConnectorCache {
     private final StatsProvider statsProvider;
     private OrderedScheduler offloaderScheduler;
     private Offloaders offloaderManager;
-    private LedgerOffloader offloader;
+    private LedgerOffloader defaultOffloader;
+    private Map<NamespaceName, LedgerOffloader> offloaderMap = new ConcurrentHashMap<>();
 
     private static final String OFFLOADERS_DIRECTOR = "offloadersDirectory";
     private static final String MANAGED_LEDGER_OFFLOAD_DRIVER = "managedLedgerOffloadDriver";
@@ -74,7 +81,9 @@ private PulsarConnectorCache(PulsarConnectorConfig pulsarConnectorConfig) throws
 
         this.statsProvider.start(clientConfiguration);
 
-        this.offloader = initManagedLedgerOffloader(pulsarConnectorConfig);
+        OffloadPolicies offloadPolicies = new OffloadPolicies();
+        BeanUtils.copyProperties(offloadPolicies, pulsarConnectorConfig);
+        this.defaultOffloader = initManagedLedgerOffloader(offloadPolicies);
     }
 
     public static PulsarConnectorCache getConnectorCache(PulsarConnectorConfig pulsarConnectorConfig) throws Exception {
@@ -108,46 +117,55 @@ private static ManagedLedgerFactory initManagedLedgerFactory(PulsarConnectorConf
         return new ManagedLedgerFactoryImpl(bkClientConfiguration, managedLedgerFactoryConfig);
     }
 
-    public ManagedLedgerConfig getManagedLedgerConfig() {
-
-        return new ManagedLedgerConfig()
-                .setLedgerOffloader(this.offloader);
+    public ManagedLedgerConfig getManagedLedgerConfig(NamespaceName namespaceName, OffloadPolicies offloadPolicies) {
+        ManagedLedgerConfig managedLedgerConfig = new ManagedLedgerConfig();
+        if (offloadPolicies == null) {
+            managedLedgerConfig.setLedgerOffloader(this.defaultOffloader);
+        } else {
+            LedgerOffloader ledgerOffloader = offloaderMap.compute(namespaceName,
+                    (ns, offloader) -> {
+                        if (offloader != null && Objects.equals(offloader.getOffloadPolicies(), offloadPolicies)) {
+                            return offloader;
+                        } else {
+                            if (offloader != null) {
+                                offloader.close();
+                            }
+                            return initManagedLedgerOffloader(offloadPolicies);
+                        }
+                    });
+            managedLedgerConfig.setLedgerOffloader(ledgerOffloader);
+        }
+        return managedLedgerConfig;
     }
 
-    private synchronized OrderedScheduler getOffloaderScheduler(PulsarConnectorConfig pulsarConnectorConfig) {
+    private synchronized OrderedScheduler getOffloaderScheduler(OffloadPolicies offloadPolicies) {
         if (this.offloaderScheduler == null) {
             this.offloaderScheduler = OrderedScheduler.newSchedulerBuilder()
-                    .numThreads(pulsarConnectorConfig.getManagedLedgerOffloadMaxThreads())
+                    .numThreads(offloadPolicies.getManagedLedgerOffloadMaxThreads())
                     .name("pulsar-offloader").build();
         }
         return this.offloaderScheduler;
     }
 
-    private LedgerOffloader initManagedLedgerOffloader(PulsarConnectorConfig conf) {
+    private LedgerOffloader initManagedLedgerOffloader(OffloadPolicies offloadPolicies) {
 
         try {
-            if (StringUtils.isNotBlank(conf.getManagedLedgerOffloadDriver())) {
-                checkNotNull(conf.getOffloadersDirectory(),
+            if (StringUtils.isNotBlank(offloadPolicies.getManagedLedgerOffloadDriver())) {
+                checkNotNull(offloadPolicies.getOffloadersDirectory(),
                         "Offloader driver is configured to be '%s' but no offloaders directory is configured.",
-                        conf.getManagedLedgerOffloadDriver());
-                this.offloaderManager = OffloaderUtils.searchForOffloaders(conf.getOffloadersDirectory());
+                        offloadPolicies.getManagedLedgerOffloadDriver());
+                this.offloaderManager = OffloaderUtils.searchForOffloaders(offloadPolicies.getOffloadersDirectory());
                 LedgerOffloaderFactory offloaderFactory = this.offloaderManager.getOffloaderFactory(
-                        conf.getManagedLedgerOffloadDriver());
-
-                Map<String, String> offloaderProperties = conf.getOffloaderProperties();
-                offloaderProperties.put(OFFLOADERS_DIRECTOR, conf.getOffloadersDirectory());
-                offloaderProperties.put(MANAGED_LEDGER_OFFLOAD_DRIVER, conf.getManagedLedgerOffloadDriver());
-                offloaderProperties
-                    .put(MANAGED_LEDGER_OFFLOAD_MAX_THREADS, String.valueOf(conf.getManagedLedgerOffloadMaxThreads()));
+                        offloadPolicies.getManagedLedgerOffloadDriver());
 
                 try {
                     return offloaderFactory.create(
-                        PulsarConnectorUtils.getProperties(offloaderProperties),
+                        offloadPolicies,
                         ImmutableMap.of(
                             LedgerOffloader.METADATA_SOFTWARE_VERSION_KEY.toLowerCase(), PulsarVersion.getVersion(),
                             LedgerOffloader.METADATA_SOFTWARE_GITSHA_KEY.toLowerCase(), PulsarVersion.getGitSha()
                         ),
-                        getOffloaderScheduler(conf));
+                        getOffloaderScheduler(offloadPolicies));
                 } catch (IOException ioe) {
                     log.error("Failed to create offloader: ", ioe);
                     throw new RuntimeException(ioe.getMessage(), ioe.getCause());
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarInternalColumn.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarInternalColumn.java
index 71107f86b3d64..4f2587bf0210f 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarInternalColumn.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarInternalColumn.java
@@ -218,11 +218,12 @@ PulsarColumnHandle getColumnHandle(String connectorId, boolean hidden) {
                 getName(),
                 getType(),
                 hidden,
-                true, null, null);
+                true, null, null, PulsarColumnHandle.HandleKeyValueType.NONE);
     }
 
     PulsarColumnMetadata getColumnMetadata(boolean hidden) {
-        return new PulsarColumnMetadata(name, type, comment, null, hidden, true, null, null);
+        return new PulsarColumnMetadata(name, type, comment, null, hidden, true, null, null,
+                PulsarColumnHandle.HandleKeyValueType.NONE);
     }
 
     public static Set<PulsarInternalColumn> getInternalFields() {
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarMetadata.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarMetadata.java
index dc9a479aa3503..420232ba0e439 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarMetadata.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarMetadata.java
@@ -80,7 +80,9 @@
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.client.api.PulsarClientException;
+import org.apache.pulsar.client.impl.schema.KeyValueSchemaInfo;
 import org.apache.pulsar.common.naming.TopicName;
+import org.apache.pulsar.common.schema.KeyValue;
 import org.apache.pulsar.common.schema.SchemaInfo;
 import org.apache.pulsar.common.schema.SchemaType;
 
@@ -222,7 +224,8 @@ public Map<String, ColumnHandle> getColumnHandles(ConnectorSession session, Conn
                     pulsarColumnMetadata.isHidden(),
                     pulsarColumnMetadata.isInternal(),
                     pulsarColumnMetadata.getFieldNames(),
-                    pulsarColumnMetadata.getPositionIndices());
+                    pulsarColumnMetadata.getPositionIndices(),
+                    pulsarColumnMetadata.getHandleKeyValueType());
 
             columnHandles.put(
                     columnMetadata.getName(),
@@ -324,7 +327,7 @@ private ConnectorTableMetadata getTableMetadata(SchemaTableName schemaTableName,
             }
         }
         List<ColumnMetadata> handles = getPulsarColumns(
-                topicName, schemaInfo, withInternalColumns
+                topicName, schemaInfo, withInternalColumns, PulsarColumnHandle.HandleKeyValueType.NONE
         );
 
 
@@ -336,12 +339,15 @@ private ConnectorTableMetadata getTableMetadata(SchemaTableName schemaTableName,
      */
     static List<ColumnMetadata> getPulsarColumns(TopicName topicName,
                                                  SchemaInfo schemaInfo,
-                                                 boolean withInternalColumns) {
+                                                 boolean withInternalColumns,
+                                                 PulsarColumnHandle.HandleKeyValueType handleKeyValueType) {
         SchemaType schemaType = schemaInfo.getType();
         if (schemaType.isStruct()) {
-            return getPulsarColumnsFromStructSchema(topicName, schemaInfo, withInternalColumns);
+            return getPulsarColumnsFromStructSchema(topicName, schemaInfo, withInternalColumns, handleKeyValueType);
         } else if (schemaType.isPrimitive()) {
-            return getPulsarColumnsFromPrimitiveSchema(topicName, schemaInfo, withInternalColumns);
+            return getPulsarColumnsFromPrimitiveSchema(topicName, schemaInfo, withInternalColumns, handleKeyValueType);
+        } else if (schemaType.equals(SchemaType.KEY_VALUE)) {
+            return getPulsarColumnsFromKeyValueSchema(topicName, schemaInfo, withInternalColumns);
         } else {
             throw new IllegalArgumentException("Unsupported schema : " + schemaInfo);
         }
@@ -349,15 +355,16 @@ static List<ColumnMetadata> getPulsarColumns(TopicName topicName,
 
     static List<ColumnMetadata> getPulsarColumnsFromPrimitiveSchema(TopicName topicName,
                                                                     SchemaInfo schemaInfo,
-                                                                    boolean withInternalColumns) {
+                                                                    boolean withInternalColumns,
+                                        PulsarColumnHandle.HandleKeyValueType handleKeyValueType) {
         ImmutableList.Builder<ColumnMetadata> builder = ImmutableList.builder();
 
         ColumnMetadata valueColumn = new PulsarColumnMetadata(
-                "__value__",
+                PulsarColumnMetadata.getColumnName(handleKeyValueType, "__value__"),
                 convertPulsarType(schemaInfo.getType()),
                 "The value of the message with primitive type schema", null, false, false,
                 new String[0],
-                new Integer[0]);
+                new Integer[0], handleKeyValueType);
 
         builder.add(valueColumn);
 
@@ -372,8 +379,8 @@ static List<ColumnMetadata> getPulsarColumnsFromPrimitiveSchema(TopicName topicN
 
     static List<ColumnMetadata> getPulsarColumnsFromStructSchema(TopicName topicName,
                                                                  SchemaInfo schemaInfo,
-                                                                 boolean withInternalColumns) {
-
+                                                                 boolean withInternalColumns,
+                                     PulsarColumnHandle.HandleKeyValueType handleKeyValueType) {
         String schemaJson = new String(schemaInfo.getSchema());
         if (StringUtils.isBlank(schemaJson)) {
             throw new PrestoException(NOT_SUPPORTED, "Topic " + topicName.toString()
@@ -389,7 +396,7 @@ static List<ColumnMetadata> getPulsarColumnsFromStructSchema(TopicName topicName
 
         ImmutableList.Builder<ColumnMetadata> builder = ImmutableList.builder();
 
-        builder.addAll(getColumns(null, schema, new HashSet<>(), new Stack<>(), new Stack<>()));
+        builder.addAll(getColumns(null, schema, new HashSet<>(), new Stack<>(), new Stack<>(), handleKeyValueType));
 
         if (withInternalColumns) {
             PulsarInternalColumn.getInternalFields()
@@ -398,6 +405,29 @@ static List<ColumnMetadata> getPulsarColumnsFromStructSchema(TopicName topicName
         }
          return builder.build();
     }
+
+    static List<ColumnMetadata> getPulsarColumnsFromKeyValueSchema(TopicName topicName,
+                                                                   SchemaInfo schemaInfo,
+                                                                   boolean withInternalColumns) {
+        ImmutableList.Builder<ColumnMetadata> builder = ImmutableList.builder();
+        KeyValue<SchemaInfo, SchemaInfo> kvSchemaInfo = KeyValueSchemaInfo.decodeKeyValueSchemaInfo(schemaInfo);
+        SchemaInfo keySchemaInfo = kvSchemaInfo.getKey();
+        List<ColumnMetadata> keyColumnMetadataList = getPulsarColumns(topicName, keySchemaInfo, false,
+                PulsarColumnHandle.HandleKeyValueType.KEY);
+        builder.addAll(keyColumnMetadataList);
+
+        SchemaInfo valueSchemaInfo = kvSchemaInfo.getValue();
+        List<ColumnMetadata> valueColumnMetadataList = getPulsarColumns(topicName, valueSchemaInfo, false,
+                PulsarColumnHandle.HandleKeyValueType.VALUE);
+        builder.addAll(valueColumnMetadataList);
+
+        if (withInternalColumns) {
+            PulsarInternalColumn.getInternalFields()
+                    .forEach(pulsarInternalColumn -> builder.add(pulsarInternalColumn.getColumnMetadata(false)));
+        }
+        return builder.build();
+    }
+
     @VisibleForTesting
     static Type convertPulsarType(SchemaType pulsarType) {
         switch (pulsarType) {
@@ -435,18 +465,20 @@ static Type convertPulsarType(SchemaType pulsarType) {
 
     @VisibleForTesting
     static List<PulsarColumnMetadata> getColumns(String fieldName, Schema fieldSchema,
-                                                  Set<String> fieldTypes,
-                                                  Stack<String> fieldNames,
-                                                  Stack<Integer> positionIndices) {
+                                                 Set<String> fieldTypes,
+                                                 Stack<String> fieldNames,
+                                                 Stack<Integer> positionIndices,
+                                                 PulsarColumnHandle.HandleKeyValueType handleKeyValueType) {
 
         List<PulsarColumnMetadata> columnMetadataList = new LinkedList<>();
 
         if (isPrimitiveType(fieldSchema.getType())) {
-            columnMetadataList.add(new PulsarColumnMetadata(fieldName,
+            columnMetadataList.add(new PulsarColumnMetadata(
+                    PulsarColumnMetadata.getColumnName(handleKeyValueType, fieldName),
                     convertType(fieldSchema.getType(), fieldSchema.getLogicalType()),
                     null, null, false, false,
                     fieldNames.toArray(new String[fieldNames.size()]),
-                    positionIndices.toArray(new Integer[positionIndices.size()])));
+                    positionIndices.toArray(new Integer[positionIndices.size()]), handleKeyValueType));
         } else if (fieldSchema.getType() == Schema.Type.UNION) {
             boolean canBeNull = false;
             for (Schema type : fieldSchema.getTypes()) {
@@ -454,17 +486,19 @@ static List<PulsarColumnMetadata> getColumns(String fieldName, Schema fieldSchem
                     PulsarColumnMetadata columnMetadata;
                     if (type.getType() != Schema.Type.NULL) {
                         if (!canBeNull) {
-                            columnMetadata = new PulsarColumnMetadata(fieldName,
+                            columnMetadata = new PulsarColumnMetadata(
+                                    PulsarColumnMetadata.getColumnName(handleKeyValueType, fieldName),
                                     convertType(type.getType(), type.getLogicalType()),
                                     null, null, false, false,
                                     fieldNames.toArray(new String[fieldNames.size()]),
-                                    positionIndices.toArray(new Integer[positionIndices.size()]));
+                                    positionIndices.toArray(new Integer[positionIndices.size()]), handleKeyValueType);
                         } else {
-                            columnMetadata = new PulsarColumnMetadata(fieldName,
+                            columnMetadata = new PulsarColumnMetadata(
+                                    PulsarColumnMetadata.getColumnName(handleKeyValueType, fieldName),
                                     convertType(type.getType(), type.getLogicalType()),
                                     "field can be null", null, false, false,
                                     fieldNames.toArray(new String[fieldNames.size()]),
-                                    positionIndices.toArray(new Integer[positionIndices.size()]));
+                                    positionIndices.toArray(new Integer[positionIndices.size()]), handleKeyValueType);
                         }
                         columnMetadataList.add(columnMetadata);
                     } else {
@@ -472,7 +506,7 @@ static List<PulsarColumnMetadata> getColumns(String fieldName, Schema fieldSchem
                     }
                 } else {
                     List<PulsarColumnMetadata> columns = getColumns(fieldName, type, fieldTypes, fieldNames,
-                        positionIndices);
+                        positionIndices, handleKeyValueType);
                     columnMetadataList.addAll(columns);
                 }
             }
@@ -488,10 +522,11 @@ static List<PulsarColumnMetadata> getColumns(String fieldName, Schema fieldSchem
                     positionIndices.push(i);
                     List<PulsarColumnMetadata> columns;
                     if (fieldName == null) {
-                        columns = getColumns(field.name(), field.schema(), fieldTypes, fieldNames, positionIndices);
+                        columns = getColumns(field.name(), field.schema(), fieldTypes, fieldNames, positionIndices,
+                                handleKeyValueType);
                     } else {
                         columns = getColumns(String.format("%s.%s", fieldName, field.name()), field.schema(),
-                            fieldTypes, fieldNames, positionIndices);
+                            fieldTypes, fieldNames, positionIndices, handleKeyValueType);
 
                     }
                     positionIndices.pop();
@@ -507,11 +542,12 @@ static List<PulsarColumnMetadata> getColumns(String fieldName, Schema fieldSchem
         } else if (fieldSchema.getType() == Schema.Type.MAP) {
 
         } else if (fieldSchema.getType() == Schema.Type.ENUM) {
-            PulsarColumnMetadata columnMetadata = new PulsarColumnMetadata(fieldName,
+            PulsarColumnMetadata columnMetadata = new PulsarColumnMetadata(
+                    PulsarColumnMetadata.getColumnName(handleKeyValueType, fieldName),
                     convertType(fieldSchema.getType(), fieldSchema.getLogicalType()),
                     null, null, false, false,
                     fieldNames.toArray(new String[fieldNames.size()]),
-                    positionIndices.toArray(new Integer[positionIndices.size()]));
+                    positionIndices.toArray(new Integer[positionIndices.size()]), handleKeyValueType);
             columnMetadataList.add(columnMetadata);
 
         } else if (fieldSchema.getType() == Schema.Type.FIXED) {
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarPrimitiveSchemaHandler.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarPrimitiveSchemaHandler.java
index 28980a9f13be4..f26587bfcbf80 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarPrimitiveSchemaHandler.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarPrimitiveSchemaHandler.java
@@ -56,6 +56,11 @@ public Object deserialize(ByteBuf byteBuf) {
         }
     }
 
+    @Override
+    public Object deserialize(ByteBuf keyPayload, ByteBuf dataPayload) {
+        return null;
+    }
+
     @Override
     public Object extractField(int index, Object currentRecord) {
         return currentRecord;
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordCursor.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordCursor.java
index 4d5a25db836d6..6899f97bbd1c2 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordCursor.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarRecordCursor.java
@@ -40,6 +40,7 @@
 import io.airlift.log.Logger;
 import io.airlift.slice.Slice;
 import io.airlift.slice.Slices;
+import io.netty.buffer.ByteBuf;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -57,6 +58,7 @@
 import org.apache.pulsar.common.api.raw.RawMessage;
 import org.apache.pulsar.common.naming.NamespaceName;
 import org.apache.pulsar.common.naming.TopicName;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.apache.pulsar.sql.presto.PulsarInternalColumn.PartitionColumn;
 import org.jctools.queues.MessagePassingQueue;
 import org.jctools.queues.SpscArrayQueue;
@@ -110,8 +112,18 @@ public PulsarRecordCursor(List<PulsarColumnHandle> columnHandles, PulsarSplit pu
             close();
             throw new RuntimeException(e);
         }
+
+        OffloadPolicies offloadPolicies = pulsarSplit.getOffloadPolicies();
+        if (offloadPolicies != null) {
+            offloadPolicies.setOffloadersDirectory(pulsarConnectorConfig.getOffloadersDirectory());
+            offloadPolicies.setManagedLedgerOffloadMaxThreads(
+                    pulsarConnectorConfig.getManagedLedgerOffloadMaxThreads());
+        }
         initialize(columnHandles, pulsarSplit, pulsarConnectorConfig,
-                pulsarConnectorCache.getManagedLedgerFactory(), pulsarConnectorCache.getManagedLedgerConfig(),
+                pulsarConnectorCache.getManagedLedgerFactory(),
+                pulsarConnectorCache.getManagedLedgerConfig(
+                        TopicName.get("persistent", NamespaceName.get(pulsarSplit.getSchemaName()),
+                                pulsarSplit.getTableName()).getNamespaceObject(), offloadPolicies),
                 new PulsarConnectorMetricsTracker(pulsarConnectorCache.getStatsProvider()));
     }
 
@@ -407,7 +419,15 @@ public boolean advanceNextPosition() {
         //start time for deseralizing record
         metricsTracker.start_RECORD_DESERIALIZE_TIME();
 
-        currentRecord = this.schemaHandler.deserialize(this.currentMessage.getData());
+        if (this.schemaHandler instanceof KeyValueSchemaHandler) {
+            ByteBuf keyByteBuf = null;
+            if (this.currentMessage.getKeyBytes().isPresent()) {
+                keyByteBuf = this.currentMessage.getKeyBytes().get();
+            }
+            currentRecord = this.schemaHandler.deserialize(keyByteBuf, this.currentMessage.getData());
+        } else {
+            currentRecord = this.schemaHandler.deserialize(this.currentMessage.getData());
+        }
         metricsTracker.incr_NUM_RECORD_DESERIALIZED();
 
         // stats for time spend deserializing
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSchemaHandlers.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSchemaHandlers.java
index c0282df14007e..3b091ad74c77a 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSchemaHandlers.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSchemaHandlers.java
@@ -23,9 +23,9 @@
 
 import com.facebook.presto.spi.PrestoException;
 import java.util.List;
-
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.common.schema.SchemaInfo;
+import org.apache.pulsar.common.schema.SchemaType;
 
 class PulsarSchemaHandlers {
 
@@ -45,6 +45,8 @@ static SchemaHandler newPulsarSchemaHandler(SchemaInfo schemaInfo,
                     throw new PrestoException(NOT_SUPPORTED, "Not supported schema type: " + schemaInfo.getType());
             }
 
+        } else if (schemaInfo.getType().equals(SchemaType.KEY_VALUE)) {
+            return new KeyValueSchemaHandler(schemaInfo, columnHandles);
         } else {
             throw new PrestoException(
                     NOT_SUPPORTED,
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplit.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplit.java
index eeebbd174dd3f..9893d8ffab0ea 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplit.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplit.java
@@ -26,10 +26,14 @@
 import com.facebook.presto.spi.predicate.TupleDomain;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
+import io.airlift.log.Logger;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import org.apache.bookkeeper.mledger.impl.PositionImpl;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.apache.pulsar.common.schema.SchemaInfo;
 import org.apache.pulsar.common.schema.SchemaType;
 
@@ -38,9 +42,12 @@
  */
 public class PulsarSplit implements ConnectorSplit {
 
+    private static final Logger log = Logger.get(PulsarSplit.class);
+
     private final long splitId;
     private final String connectorId;
     private final String schemaName;
+    private final String originSchemaName;
     private final String tableName;
     private final long splitSize;
     private final String schema;
@@ -54,12 +61,16 @@ public class PulsarSplit implements ConnectorSplit {
 
     private final PositionImpl startPosition;
     private final PositionImpl endPosition;
+    private final String schemaInfoProperties;
+
+    private final OffloadPolicies offloadPolicies;
 
     @JsonCreator
     public PulsarSplit(
             @JsonProperty("splitId") long splitId,
             @JsonProperty("connectorId") String connectorId,
             @JsonProperty("schemaName") String schemaName,
+            @JsonProperty("originSchemaName") String originSchemaName,
             @JsonProperty("tableName") String tableName,
             @JsonProperty("splitSize") long splitSize,
             @JsonProperty("schema") String schema,
@@ -69,15 +80,11 @@ public PulsarSplit(
             @JsonProperty("startPositionLedgerId") long startPositionLedgerId,
             @JsonProperty("endPositionLedgerId") long endPositionLedgerId,
             @JsonProperty("tupleDomain") TupleDomain<ColumnHandle> tupleDomain,
-            @JsonProperty("properties") Map<String, String> schemaInfoProperties) {
+            @JsonProperty("schemaInfoProperties") String schemaInfoProperties,
+            @JsonProperty("offloadPolicies") OffloadPolicies offloadPolicies) throws IOException {
         this.splitId = splitId;
         requireNonNull(schemaName, "schema name is null");
-        this.schemaInfo = SchemaInfo.builder()
-                .type(schemaType)
-                .name(schemaName)
-                .schema(schema.getBytes())
-                .properties(schemaInfoProperties)
-                .build();
+        this.originSchemaName = originSchemaName;
         this.schemaName = requireNonNull(schemaName, "schema name is null");
         this.connectorId = requireNonNull(connectorId, "connector id is null");
         this.tableName = requireNonNull(tableName, "table name is null");
@@ -91,6 +98,16 @@ public PulsarSplit(
         this.tupleDomain = requireNonNull(tupleDomain, "tupleDomain is null");
         this.startPosition = PositionImpl.get(startPositionLedgerId, startPositionEntryId);
         this.endPosition = PositionImpl.get(endPositionLedgerId, endPositionEntryId);
+        this.schemaInfoProperties = schemaInfoProperties;
+        this.offloadPolicies = offloadPolicies;
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        this.schemaInfo = SchemaInfo.builder()
+                .name(originSchemaName)
+                .type(schemaType)
+                .schema(schema.getBytes("ISO8859-1"))
+                .properties(objectMapper.readValue(schemaInfoProperties, Map.class))
+                .build();
     }
 
     @JsonProperty
@@ -123,6 +140,11 @@ public long getSplitSize() {
         return splitSize;
     }
 
+    @JsonProperty
+    public String getOriginSchemaName() {
+        return originSchemaName;
+    }
+
     @JsonProperty
     public String getSchema() {
         return schema;
@@ -161,6 +183,16 @@ public PositionImpl getEndPosition() {
         return endPosition;
     }
 
+    @JsonProperty
+    public String getSchemaInfoProperties() {
+        return schemaInfoProperties;
+    }
+
+    @JsonProperty
+    public OffloadPolicies getOffloadPolicies() {
+        return offloadPolicies;
+    }
+
     @Override
     public boolean isRemotelyAccessible() {
         return true;
@@ -181,6 +213,7 @@ public String toString() {
         return "PulsarSplit{"
             + "splitId=" + splitId
             + ", connectorId='" + connectorId + '\''
+            + ", originSchemaName='" + originSchemaName + '\''
             + ", schemaName='" + schemaName + '\''
             + ", tableName='" + tableName + '\''
             + ", splitSize=" + splitSize
@@ -190,6 +223,8 @@ public String toString() {
             + ", endPositionEntryId=" + endPositionEntryId
             + ", startPositionLedgerId=" + startPositionLedgerId
             + ", endPositionLedgerId=" + endPositionLedgerId
+            + ", schemaInfoProperties=" + schemaInfoProperties
+            + (offloadPolicies == null ? "" : offloadPolicies.toString())
             + '}';
     }
 
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplitManager.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplitManager.java
index 06bc1200146f7..cce071ae15f12 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplitManager.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/PulsarSplitManager.java
@@ -35,9 +35,11 @@
 import com.facebook.presto.spi.predicate.Domain;
 import com.facebook.presto.spi.predicate.Range;
 import com.facebook.presto.spi.predicate.TupleDomain;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Predicate;
 import io.airlift.log.Logger;
+import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -59,6 +61,7 @@
 import org.apache.pulsar.client.impl.MessageImpl;
 import org.apache.pulsar.common.naming.NamespaceName;
 import org.apache.pulsar.common.naming.TopicName;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.apache.pulsar.common.schema.SchemaInfo;
 
 /**
@@ -74,6 +77,8 @@ public class PulsarSplitManager implements ConnectorSplitManager {
 
     private static final Logger log = Logger.get(PulsarSplitManager.class);
 
+    private ObjectMapper objectMapper = new ObjectMapper();
+
     @Inject
     public PulsarSplitManager(PulsarConnectorId connectorId, PulsarConnectorConfig pulsarConnectorConfig) {
         this.connectorId = requireNonNull(connectorId, "connectorId is null").toString();
@@ -122,11 +127,15 @@ public ConnectorSplitSource getSplits(ConnectorTransactionHandle transactionHand
 
         Collection<PulsarSplit> splits;
         try {
+            OffloadPolicies offloadPolicies = this.pulsarAdmin.namespaces()
+                                                .getOffloadPolicies(topicName.getNamespace());
             if (!PulsarConnectorUtils.isPartitionedTopic(topicName, this.pulsarAdmin)) {
-                splits = getSplitsNonPartitionedTopic(numSplits, topicName, tableHandle, schemaInfo, tupleDomain);
+                splits = getSplitsNonPartitionedTopic(
+                        numSplits, topicName, tableHandle, schemaInfo, tupleDomain, offloadPolicies);
                 log.debug("Splits for non-partitioned topic %s: %s", topicName, splits);
             } else {
-                splits = getSplitsPartitionedTopic(numSplits, topicName, tableHandle, schemaInfo, tupleDomain);
+                splits = getSplitsPartitionedTopic(
+                        numSplits, topicName, tableHandle, schemaInfo, tupleDomain, offloadPolicies);
                 log.debug("Splits for partitioned topic %s: %s", topicName, splits);
             }
         } catch (Exception e) {
@@ -138,7 +147,8 @@ public ConnectorSplitSource getSplits(ConnectorTransactionHandle transactionHand
 
     @VisibleForTesting
     Collection<PulsarSplit> getSplitsPartitionedTopic(int numSplits, TopicName topicName, PulsarTableHandle
-            tableHandle, SchemaInfo schemaInfo, TupleDomain<ColumnHandle> tupleDomain) throws Exception {
+            tableHandle, SchemaInfo schemaInfo, TupleDomain<ColumnHandle> tupleDomain,
+              OffloadPolicies offloadPolicies) throws Exception {
 
         List<Integer> predicatedPartitions = getPredicatedPartitions(topicName, tupleDomain);
         if (log.isDebugEnabled()) {
@@ -165,7 +175,8 @@ Collection<PulsarSplit> getSplitsPartitionedTopic(int numSplits, TopicName topic
                     tableHandle,
                     schemaInfo,
                     topicName.getPartition(predicatedPartitions.get(i)).getLocalName(),
-                    tupleDomain));
+                    tupleDomain,
+                    offloadPolicies));
         }
         return splits;
     }
@@ -219,8 +230,8 @@ private List<Integer> getPredicatedPartitions(TopicName topicName, TupleDomain<C
 
     @VisibleForTesting
     Collection<PulsarSplit> getSplitsNonPartitionedTopic(int numSplits, TopicName topicName,
-            PulsarTableHandle tableHandle, SchemaInfo schemaInfo, TupleDomain<ColumnHandle> tupleDomain)
-            throws Exception {
+            PulsarTableHandle tableHandle, SchemaInfo schemaInfo, TupleDomain<ColumnHandle> tupleDomain,
+             OffloadPolicies offloadPolicies) throws Exception {
         ManagedLedgerFactory managedLedgerFactory = PulsarConnectorCache.getConnectorCache(pulsarConnectorConfig)
                 .getManagedLedgerFactory();
 
@@ -230,7 +241,9 @@ Collection<PulsarSplit> getSplitsNonPartitionedTopic(int numSplits, TopicName to
                 numSplits,
                 tableHandle,
                 schemaInfo,
-                tableHandle.getTableName(), tupleDomain);
+                tableHandle.getTableName(),
+                tupleDomain,
+                offloadPolicies);
     }
 
     @VisibleForTesting
@@ -239,8 +252,9 @@ Collection<PulsarSplit> getSplitsForTopic(String topicNamePersistenceEncoding,
                                               int numSplits,
                                               PulsarTableHandle tableHandle,
                                               SchemaInfo schemaInfo, String tableName,
-                                              TupleDomain<ColumnHandle> tupleDomain)
-            throws ManagedLedgerException, InterruptedException {
+                                              TupleDomain<ColumnHandle> tupleDomain,
+                                              OffloadPolicies offloadPolicies)
+            throws ManagedLedgerException, InterruptedException, IOException {
 
         ReadOnlyCursor readOnlyCursor = null;
         try {
@@ -285,18 +299,21 @@ Collection<PulsarSplit> getSplitsForTopic(String topicNamePersistenceEncoding,
                 readOnlyCursor.skipEntries(Math.toIntExact(entriesForSplit));
                 PositionImpl endPosition = (PositionImpl) readOnlyCursor.getReadPosition();
 
-                splits.add(new PulsarSplit(i, this.connectorId,
+                PulsarSplit pulsarSplit = new PulsarSplit(i, this.connectorId,
                         restoreNamespaceDelimiterIfNeeded(tableHandle.getSchemaName(), pulsarConnectorConfig),
+                        schemaInfo.getName(),
                         tableName,
                         entriesForSplit,
-                        new String(schemaInfo.getSchema()),
+                        new String(schemaInfo.getSchema(),  "ISO8859-1"),
                         schemaInfo.getType(),
                         startPosition.getEntryId(),
                         endPosition.getEntryId(),
                         startPosition.getLedgerId(),
                         endPosition.getLedgerId(),
                         tupleDomain,
-                        schemaInfo.getProperties()));
+                        objectMapper.writeValueAsString(schemaInfo.getProperties()),
+                        offloadPolicies);
+                splits.add(pulsarSplit);
             }
             return splits;
         } finally {
diff --git a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/SchemaHandler.java b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/SchemaHandler.java
index 37fce04329555..7529034accea6 100644
--- a/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/SchemaHandler.java
+++ b/pulsar-sql/presto-pulsar/src/main/java/org/apache/pulsar/sql/presto/SchemaHandler.java
@@ -27,6 +27,8 @@ public interface SchemaHandler {
 
     Object deserialize(ByteBuf payload);
 
+    Object deserialize(ByteBuf keyPayload, ByteBuf dataPayload);
+
     Object extractField(int index, Object currentRecord);
 
 }
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnector.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnector.java
index cd81442db6b8b..adeababe481e8 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnector.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarConnector.java
@@ -26,6 +26,7 @@
 import com.facebook.presto.spi.type.RealType;
 import com.facebook.presto.spi.type.Type;
 import com.facebook.presto.spi.type.VarcharType;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.airlift.log.Logger;
 import io.netty.buffer.ByteBuf;
 import org.apache.bookkeeper.mledger.AsyncCallbacks;
@@ -118,6 +119,7 @@ public abstract class TestPulsarConnector {
     protected static Map<String, SchemaInfo> topicsToSchemas;
     protected static Map<String, Long> topicsToNumEntries;
 
+    private final static ObjectMapper objectMapper = new ObjectMapper();
 
     protected static final NamespaceName NAMESPACE_NAME_1 = NamespaceName.get("tenant-1", "ns-1");
     protected static final NamespaceName NAMESPACE_NAME_2 = NamespaceName.get("tenant-1", "ns-2");
@@ -299,7 +301,7 @@ public static class Boo {
                     false,
                     false,
                     fooFieldNames.get("field1"),
-                    fooPositionIndices.get("field1")));
+                    fooPositionIndices.get("field1"), null));
 
 
             String[] fieldNames2 = {"field2"};
@@ -312,7 +314,7 @@ public static class Boo {
                     false,
                     false,
                     fieldNames2,
-                    positionIndices2));
+                    positionIndices2, null));
 
             String[] fieldNames3 = {"field3"};
             Integer[] positionIndices3 = {2};
@@ -324,7 +326,7 @@ public static class Boo {
                     false,
                     false,
                     fieldNames3,
-                    positionIndices3));
+                    positionIndices3,  null));
 
             String[] fieldNames4 = {"field4"};
             Integer[] positionIndices4 = {3};
@@ -336,7 +338,7 @@ public static class Boo {
                     false,
                     false,
                     fieldNames4,
-                    positionIndices4));
+                    positionIndices4, null));
 
 
             String[] fieldNames5 = {"field5"};
@@ -349,7 +351,7 @@ public static class Boo {
                     false,
                     false,
                     fieldNames5,
-                    positionIndices5));
+                    positionIndices5, null));
 
             String[] fieldNames6 = {"field6"};
             Integer[] positionIndices6 = {5};
@@ -361,7 +363,7 @@ public static class Boo {
                     false,
                     false,
                     fieldNames6,
-                    positionIndices6));
+                    positionIndices6, null));
 
             String[] fieldNames7 = {"timestamp"};
             Integer[] positionIndices7 = {6};
@@ -373,7 +375,7 @@ public static class Boo {
                     false,
                     false,
                     fieldNames7,
-                    positionIndices7));
+                    positionIndices7, null));
 
             String[] fieldNames8 = {"time"};
             Integer[] positionIndices8 = {7};
@@ -385,7 +387,7 @@ public static class Boo {
                     false,
                     false,
                     fieldNames8,
-                    positionIndices8));
+                    positionIndices8, null));
 
             String[] fieldNames9 = {"date"};
             Integer[] positionIndices9 = {8};
@@ -397,7 +399,7 @@ public static class Boo {
                     false,
                     false,
                     fieldNames9,
-                    positionIndices9));
+                    positionIndices9, null));
 
             String[] bar_fieldNames1 = {"bar", "field1"};
             Integer[] bar_positionIndices1 = {9, 0};
@@ -409,7 +411,7 @@ public static class Boo {
                     false,
                     false,
                     bar_fieldNames1,
-                    bar_positionIndices1));
+                    bar_positionIndices1, null));
 
             String[] bar_fieldNames2 = {"bar", "field2"};
             Integer[] bar_positionIndices2 = {9, 1};
@@ -421,7 +423,7 @@ public static class Boo {
                     false,
                     false,
                     bar_fieldNames2,
-                    bar_positionIndices2));
+                    bar_positionIndices2, null));
 
             String[] bar_test_fieldNames4 = {"bar", "test", "field4"};
             Integer[] bar_test_positionIndices4 = {9, 2, 0};
@@ -433,7 +435,7 @@ public static class Boo {
                     false,
                     false,
                     bar_test_fieldNames4,
-                    bar_test_positionIndices4));
+                    bar_test_positionIndices4, null));
 
             String[] bar_test_fieldNames5 = {"bar", "test", "field5"};
             Integer[] bar_test_positionIndices5 = {9, 2, 1};
@@ -445,7 +447,7 @@ public static class Boo {
                     false,
                     false,
                     bar_test_fieldNames5,
-                    bar_test_positionIndices5));
+                    bar_test_positionIndices5, null));
 
             String[] bar_test_fieldNames6 = {"bar", "test", "field6"};
             Integer[] bar_test_positionIndices6 = {9, 2, 2};
@@ -457,7 +459,7 @@ public static class Boo {
                     false,
                     false,
                     bar_test_fieldNames6,
-                    bar_test_positionIndices6));
+                    bar_test_positionIndices6, null));
 
             String[] bar_test_foobar_fieldNames1 = {"bar", "test", "foobar", "field1"};
             Integer[] bar_test_foobar_positionIndices1 = {9, 2, 6, 0};
@@ -469,7 +471,7 @@ public static class Boo {
                     false,
                     false,
                     bar_test_foobar_fieldNames1,
-                    bar_test_foobar_positionIndices1));
+                    bar_test_foobar_positionIndices1, null));
 
             String[] bar_field3 = {"bar", "field3"};
             Integer[] bar_positionIndices3 = {9, 3};
@@ -481,7 +483,7 @@ public static class Boo {
                     false,
                     false,
                     bar_field3,
-                    bar_positionIndices3));
+                    bar_positionIndices3, null));
 
             String[] bar_test2_fieldNames4 = {"bar", "test2", "field4"};
             Integer[] bar_test2_positionIndices4 = {9, 4, 0};
@@ -493,7 +495,7 @@ public static class Boo {
                     false,
                     false,
                     bar_test2_fieldNames4,
-                    bar_test2_positionIndices4));
+                    bar_test2_positionIndices4, null));
 
             String[] bar_test2_fieldNames5 = {"bar", "test2", "field5"};
             Integer[] bar_test2_positionIndices5 = {9, 4, 1};
@@ -505,7 +507,7 @@ public static class Boo {
                     false,
                     false,
                     bar_test2_fieldNames5,
-                    bar_test2_positionIndices5));
+                    bar_test2_positionIndices5, null));
 
             String[] bar_test2_fieldNames6 = {"bar", "test2", "field6"};
             Integer[] bar_test2_positionIndices6 = {9, 4, 2};
@@ -517,7 +519,7 @@ public static class Boo {
                     false,
                     false,
                     bar_test2_fieldNames6,
-                    bar_test2_positionIndices6));
+                    bar_test2_positionIndices6, null));
 
             String[] bar_test2_foobar_fieldNames1 = {"bar", "test2", "foobar", "field1"};
             Integer[] bar_test2_foobar_positionIndices1 = {9, 4, 6, 0};
@@ -529,7 +531,7 @@ public static class Boo {
                     false,
                     false,
                     bar_test2_foobar_fieldNames1,
-                    bar_test2_foobar_positionIndices1));
+                    bar_test2_foobar_positionIndices1, null));
 
             String[] fieldNames10 = {"field7"};
             Integer[] positionIndices10 = {10};
@@ -541,7 +543,7 @@ public static class Boo {
                     false,
                     false,
                     fieldNames10,
-                    positionIndices10));
+                    positionIndices10, null));
 
             fooColumnHandles.addAll(PulsarInternalColumn.getInternalFields().stream()
                 .map(pulsarInternalColumn -> pulsarInternalColumn.getColumnHandle(pulsarConnectorId.toString(), false))
@@ -556,12 +558,14 @@ public static class Boo {
             for (TopicName topicName : allTopics) {
                 if (topicsToSchemas.containsKey(topicName.getSchemaName())) {
                     splits.put(topicName, new PulsarSplit(0, pulsarConnectorId.toString(),
-                        topicName.getNamespace(), topicName.getLocalName(),
+                        topicName.getNamespace(), topicName.getLocalName(), topicName.getLocalName(),
                         topicsToNumEntries.get(topicName.getSchemaName()),
                         new String(topicsToSchemas.get(topicName.getSchemaName()).getSchema()),
                         topicsToSchemas.get(topicName.getSchemaName()).getType(),
                         0, topicsToNumEntries.get(topicName.getSchemaName()),
-                        0, 0, TupleDomain.all(), new HashMap<>()));
+                        0, 0, TupleDomain.all(),
+                            objectMapper.writeValueAsString(
+                                    topicsToSchemas.get(topicName.getSchemaName()).getProperties()), null));
                 }
             }
 
@@ -601,7 +605,6 @@ public static class Boo {
         } catch (Throwable e) {
             System.out.println("Error: " + e);
             System.out.println("Stacktrace: " + Arrays.asList(e.getStackTrace()));
-            throw e;
         }
     }
 
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarKeyValueSchemaHandler.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarKeyValueSchemaHandler.java
new file mode 100644
index 0000000000000..193f68e00b069
--- /dev/null
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarKeyValueSchemaHandler.java
@@ -0,0 +1,331 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.sql.presto;
+
+import com.facebook.presto.spi.ColumnMetadata;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.client.api.Schema;
+import org.apache.pulsar.client.impl.schema.KeyValueSchema;
+import org.apache.pulsar.client.impl.schema.KeyValueSchemaInfo;
+import org.apache.pulsar.common.api.raw.RawMessage;
+import org.apache.pulsar.common.api.raw.RawMessageImpl;
+import org.apache.pulsar.common.naming.TopicName;
+import org.apache.pulsar.common.schema.KeyValue;
+import org.apache.pulsar.common.schema.KeyValueEncodingType;
+import org.mockito.Mockito;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+/**
+ * Unit test for KeyValueSchemaHandler
+ */
+@Slf4j
+public class TestPulsarKeyValueSchemaHandler {
+
+    private final static ObjectMapper objectMapper = new ObjectMapper();
+
+    private Schema<KeyValue<String, Integer>> schema1 =
+            Schema.KeyValue(Schema.STRING, Schema.INT32, KeyValueEncodingType.INLINE);
+
+    private Schema<KeyValue<String, Foo>> schema2 =
+            Schema.KeyValue(Schema.STRING, Schema.JSON(Foo.class), KeyValueEncodingType.INLINE);
+
+    private Schema<KeyValue<Boo, Long>> schema3 =
+            Schema.KeyValue(Schema.AVRO(Boo.class), Schema.INT64, KeyValueEncodingType.SEPARATED);
+
+    private Schema<KeyValue<Boo, Foo>> schema4 =
+            Schema.KeyValue(Schema.JSON(Boo.class), Schema.AVRO(Foo.class), KeyValueEncodingType.SEPARATED);
+
+    private final static TopicName topicName = TopicName.get("persistent://public/default/kv-test");
+
+    private final static Foo foo;
+
+    private final static Boo boo;
+
+    private final Integer KEY_FIELD_NAME_PREFIX_LENGTH = PulsarColumnMetadata.KEY_SCHEMA_COLUMN_PREFIX.length();
+
+    static {
+        foo = new Foo();
+        foo.field1 = "field1-value";
+        foo.field2 = 20;
+
+        boo = new Boo();
+        boo.field1 = "field1-value";
+        boo.field2 = true;
+        boo.field3 = 10.2;
+    }
+
+
+    @Test
+    public void testSchema1() throws IOException {
+        final String keyData = "test-key";
+        final Integer valueData = 10;
+        List<ColumnMetadata> columnMetadataList =
+                PulsarMetadata.getPulsarColumns(topicName, schema1.getSchemaInfo(),
+                        true,   null);
+        int keyCount = 0;
+        int valueCount = 0;
+        for (ColumnMetadata columnMetadata : columnMetadataList) {
+            PulsarColumnMetadata pulsarColumnMetadata = (PulsarColumnMetadata) columnMetadata;
+            if (pulsarColumnMetadata.isKey()) {
+                keyCount++;
+            } else if (pulsarColumnMetadata.isValue()) {
+                valueCount++;
+            }
+        }
+        Assert.assertEquals(keyCount, 1);
+        Assert.assertEquals(valueCount, 1);
+
+        List<PulsarColumnHandle> columnHandleList = getColumnHandlerList(columnMetadataList);
+
+        KeyValueSchemaHandler keyValueSchemaHandler =
+                new KeyValueSchemaHandler(schema1.getSchemaInfo(), columnHandleList);
+
+        RawMessageImpl message = Mockito.mock(RawMessageImpl.class);
+        Mockito.when(message.getData()).thenReturn(
+                Unpooled.wrappedBuffer(schema1.encode(new KeyValue<>(keyData, valueData)))
+        );
+
+        KeyValue<ByteBuf, ByteBuf> byteBufKeyValue = getKeyValueByteBuf(message, schema1);
+        Object object = keyValueSchemaHandler.deserialize(byteBufKeyValue.getKey(), byteBufKeyValue.getValue());
+        Assert.assertEquals(keyValueSchemaHandler.extractField(0, object), keyData);
+        Assert.assertEquals(keyValueSchemaHandler.extractField(1, object), valueData);
+    }
+
+    @Test
+    public void testSchema2() throws IOException {
+        final String keyData = "test-key";
+
+        List<ColumnMetadata> columnMetadataList =
+                PulsarMetadata.getPulsarColumns(topicName, schema2.getSchemaInfo(),
+                        true, null);
+        int keyCount = 0;
+        int valueCount = 0;
+        for (ColumnMetadata columnMetadata : columnMetadataList) {
+            PulsarColumnMetadata pulsarColumnMetadata = (PulsarColumnMetadata) columnMetadata;
+            if (pulsarColumnMetadata.isKey()) {
+                keyCount++;
+            } else if (pulsarColumnMetadata.isValue()) {
+                valueCount++;
+            }
+        }
+        Assert.assertEquals(keyCount, 1);
+        Assert.assertEquals(valueCount, 2);
+
+        List<PulsarColumnHandle> columnHandleList = getColumnHandlerList(columnMetadataList);
+
+        RawMessage message = Mockito.mock(RawMessage.class);
+        Mockito.when(message.getData()).thenReturn(
+                Unpooled.wrappedBuffer(schema2.encode(new KeyValue<>(keyData, foo)))
+        );
+
+
+        KeyValueSchemaHandler keyValueSchemaHandler =
+                new KeyValueSchemaHandler(schema2.getSchemaInfo(), columnHandleList);
+
+        KeyValue<ByteBuf, ByteBuf> byteBufKeyValue = getKeyValueByteBuf(message, schema2);
+        Object object = keyValueSchemaHandler.deserialize(byteBufKeyValue.getKey(), byteBufKeyValue.getValue());
+        Assert.assertEquals(keyValueSchemaHandler.extractField(0, object), keyData);
+        Assert.assertEquals(keyValueSchemaHandler.extractField(1, object),
+                foo.getValue(columnHandleList.get(1).getName()));
+        Assert.assertEquals(keyValueSchemaHandler.extractField(2, object),
+                foo.getValue(columnHandleList.get(2).getName()));
+    }
+
+    @Test
+    public void testSchema3() throws IOException {
+        final Boo boo = new Boo();
+        boo.field1 = "field1-value";
+        boo.field2 = true;
+        boo.field3 = 10.2;
+        final Long valueData = 999999L;
+
+        List<ColumnMetadata> columnMetadataList =
+                PulsarMetadata.getPulsarColumns(topicName, schema3.getSchemaInfo(),
+                        true, null);
+        int keyCount = 0;
+        int valueCount = 0;
+        for (ColumnMetadata columnMetadata : columnMetadataList) {
+            PulsarColumnMetadata pulsarColumnMetadata = (PulsarColumnMetadata) columnMetadata;
+            if (pulsarColumnMetadata.isKey()) {
+                keyCount++;
+            } else if (pulsarColumnMetadata.isValue()) {
+                valueCount++;
+            }
+        }
+        Assert.assertEquals(keyCount, 3);
+        Assert.assertEquals(valueCount, 1);
+
+        List<PulsarColumnHandle> columnHandleList = getColumnHandlerList(columnMetadataList);
+
+        KeyValueSchemaHandler keyValueSchemaHandler =
+                new KeyValueSchemaHandler(schema3.getSchemaInfo(), columnHandleList);
+
+        RawMessage message = Mockito.mock(RawMessage.class);
+        Mockito.when(message.getKeyBytes()).thenReturn(
+                Optional.of(Unpooled.wrappedBuffer(
+                    ((KeyValueSchema) schema3).getKeySchema().encode(boo)
+                ))
+        );
+        Mockito.when(message.getData()).thenReturn(
+                Unpooled.wrappedBuffer(schema3.encode(new KeyValue<>(boo, valueData)))
+        );
+
+        KeyValue<ByteBuf, ByteBuf> byteBufKeyValue = getKeyValueByteBuf(message, schema3);
+        Object object = keyValueSchemaHandler.deserialize(byteBufKeyValue.getKey(), byteBufKeyValue.getValue());
+        Assert.assertEquals(keyValueSchemaHandler.extractField(0, object).toString(),
+                boo.getValue(columnHandleList.get(0).getName().substring(KEY_FIELD_NAME_PREFIX_LENGTH)));
+        Assert.assertEquals(keyValueSchemaHandler.extractField(1, object),
+                boo.getValue(columnHandleList.get(1).getName().substring(KEY_FIELD_NAME_PREFIX_LENGTH)));
+        Assert.assertEquals(keyValueSchemaHandler.extractField(2, object),
+                boo.getValue(columnHandleList.get(2).getName().substring(KEY_FIELD_NAME_PREFIX_LENGTH)));
+        Assert.assertEquals(keyValueSchemaHandler.extractField(3, object), valueData);
+    }
+
+    @Test
+    public void testSchema4() throws IOException {
+        List<ColumnMetadata> columnMetadataList =
+                PulsarMetadata.getPulsarColumns(topicName, schema4.getSchemaInfo(),
+                        true, null);
+        int keyCount = 0;
+        int valueCount = 0;
+        for (ColumnMetadata columnMetadata : columnMetadataList) {
+            PulsarColumnMetadata pulsarColumnMetadata = (PulsarColumnMetadata) columnMetadata;
+            if (pulsarColumnMetadata.isKey()) {
+                keyCount++;
+            } else if (pulsarColumnMetadata.isValue()) {
+                valueCount++;
+            }
+        }
+        Assert.assertEquals(keyCount, 3);
+        Assert.assertEquals(valueCount, 2);
+
+        List<PulsarColumnHandle> columnHandleList = getColumnHandlerList(columnMetadataList);
+
+        KeyValueSchemaHandler keyValueSchemaHandler =
+                new KeyValueSchemaHandler(schema4.getSchemaInfo(), columnHandleList);
+
+        RawMessage message = Mockito.mock(RawMessage.class);
+        Mockito.when(message.getKeyBytes()).thenReturn(
+                Optional.of(Unpooled.wrappedBuffer(
+                        ((KeyValueSchema) schema4).getKeySchema().encode(boo)
+                ))
+        );
+        Mockito.when(message.getData()).thenReturn(
+                Unpooled.wrappedBuffer(schema4.encode(new KeyValue<>(boo, foo)))
+        );
+
+        KeyValue<ByteBuf, ByteBuf> byteBufKeyValue = getKeyValueByteBuf(message, schema4);
+        Object object = keyValueSchemaHandler.deserialize(byteBufKeyValue.getKey(), byteBufKeyValue.getValue());
+        Assert.assertEquals(keyValueSchemaHandler.extractField(0, object).toString(),
+                boo.getValue(columnHandleList.get(0).getName().substring(KEY_FIELD_NAME_PREFIX_LENGTH)));
+        Assert.assertEquals(keyValueSchemaHandler.extractField(1, object),
+                boo.getValue(columnHandleList.get(1).getName().substring(KEY_FIELD_NAME_PREFIX_LENGTH)));
+        Assert.assertEquals(keyValueSchemaHandler.extractField(2, object),
+                boo.getValue(columnHandleList.get(2).getName().substring(KEY_FIELD_NAME_PREFIX_LENGTH)));
+        Assert.assertEquals(keyValueSchemaHandler.extractField(3, object).toString(),
+                foo.getValue(columnHandleList.get(3).getName()));
+        Assert.assertEquals(keyValueSchemaHandler.extractField(4, object).toString(),
+                foo.getValue(columnHandleList.get(4).getName()) + "");
+    }
+
+    private List<PulsarColumnHandle> getColumnHandlerList(List<ColumnMetadata> columnMetadataList) {
+        List<PulsarColumnHandle> columnHandleList = new LinkedList<>();
+
+        columnMetadataList.forEach(columnMetadata -> {
+            PulsarColumnMetadata pulsarColumnMetadata = (PulsarColumnMetadata) columnMetadata;
+            PulsarColumnHandle pulsarColumnHandle = new PulsarColumnHandle(
+                    "connectorId",
+                    pulsarColumnMetadata.getNameWithCase(),
+                    pulsarColumnMetadata.getType(),
+                    pulsarColumnMetadata.isHidden(),
+                    pulsarColumnMetadata.isInternal(),
+                    pulsarColumnMetadata.getFieldNames(),
+                    pulsarColumnMetadata.getPositionIndices(),
+                    pulsarColumnMetadata.getHandleKeyValueType());
+            columnHandleList.add(pulsarColumnHandle);
+        });
+
+        return columnHandleList;
+    }
+
+    public KeyValue<ByteBuf, ByteBuf> getKeyValueByteBuf(RawMessage message, Schema schema) {
+        KeyValueEncodingType encodingType = KeyValueSchemaInfo.decodeKeyValueEncodingType(schema.getSchemaInfo());
+        ByteBuf keyByteBuf = null;
+        if (Objects.equals(KeyValueEncodingType.SEPARATED, encodingType)) {
+            if (message.getKeyBytes().isPresent()) {
+                keyByteBuf = message.getKeyBytes().get();
+            } else {
+                keyByteBuf = null;
+            }
+        } else {
+            keyByteBuf = null;
+        }
+        return new KeyValue<>(keyByteBuf, Unpooled.wrappedBuffer(message.getData()));
+    }
+
+    @Data
+    static class Foo {
+        private String field1;
+        private Integer field2;
+
+        public Object getValue(String fieldName) {
+            switch (fieldName) {
+                case "field1":
+                    return field1;
+                case "field2":
+                    return field2 == null ? null : new Long(field2);
+                default:
+                    return null;
+            }
+        }
+    }
+
+    @Data
+    static class Boo {
+        private String field1;
+        private Boolean field2;
+        private Double field3;
+
+        public Object getValue(String fieldName) {
+            switch (fieldName) {
+                case "field1":
+                    return field1;
+                case "field2":
+                    return field2;
+                case "field3":
+                    return field3  == null ? null : field3.doubleValue();
+                default:
+                    return null;
+            }
+        }
+
+    }
+
+}
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarPrimitiveSchemaHandler.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarPrimitiveSchemaHandler.java
index 87e148db84f1c..ac2e1f4bd3815 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarPrimitiveSchemaHandler.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarPrimitiveSchemaHandler.java
@@ -153,7 +153,7 @@ public void testNewPulsarPrimitiveSchemaHandler() {
     @Test
     public void testNewColumnMetadata() {
         List<ColumnMetadata> columnMetadataList = PulsarMetadata.getPulsarColumns(stringTopicName,
-                StringSchema.utf8().getSchemaInfo(), false);
+                StringSchema.utf8().getSchemaInfo(), false, null);
         Assert.assertEquals(columnMetadataList.size(), 1);
         ColumnMetadata columnMetadata = columnMetadataList.get(0);
         Assert.assertEquals("__value__", columnMetadata.getName());
diff --git a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarSplitManager.java b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarSplitManager.java
index ef361487a054f..5ecbffc307764 100644
--- a/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarSplitManager.java
+++ b/pulsar-sql/presto-pulsar/src/test/java/org/apache/pulsar/sql/presto/TestPulsarSplitManager.java
@@ -87,7 +87,7 @@ public void testTopic(String delimiter) throws Exception {
             PulsarTableLayoutHandle pulsarTableLayoutHandle = new PulsarTableLayoutHandle(pulsarTableHandle, TupleDomain.all());
 
             final ResultCaptor<Collection<PulsarSplit>> resultCaptor = new ResultCaptor<>();
-            doAnswer(resultCaptor).when(this.pulsarSplitManager).getSplitsNonPartitionedTopic(anyInt(), any(), any(), any(), any());
+            doAnswer(resultCaptor).when(this.pulsarSplitManager).getSplitsNonPartitionedTopic(anyInt(), any(), any(), any(), any(), any());
 
 
             ConnectorSplitSource connectorSplitSource = this.pulsarSplitManager.getSplits(
@@ -95,7 +95,7 @@ public void testTopic(String delimiter) throws Exception {
                     pulsarTableLayoutHandle, null);
 
             verify(this.pulsarSplitManager, times(1))
-                    .getSplitsNonPartitionedTopic(anyInt(), any(), any(), any(), any());
+                    .getSplitsNonPartitionedTopic(anyInt(), any(), any(), any(), any(), any());
 
             int totalSize = 0;
             for (PulsarSplit pulsarSplit : resultCaptor.getResult()) {
@@ -134,13 +134,13 @@ public void testPartitionedTopic(String delimiter) throws Exception {
             PulsarTableLayoutHandle pulsarTableLayoutHandle = new PulsarTableLayoutHandle(pulsarTableHandle, TupleDomain.all());
 
             final ResultCaptor<Collection<PulsarSplit>> resultCaptor = new ResultCaptor<>();
-            doAnswer(resultCaptor).when(this.pulsarSplitManager).getSplitsPartitionedTopic(anyInt(), any(), any(), any(), any());
+            doAnswer(resultCaptor).when(this.pulsarSplitManager).getSplitsPartitionedTopic(anyInt(), any(), any(), any(), any(), any());
 
             this.pulsarSplitManager.getSplits(mock(ConnectorTransactionHandle.class), mock(ConnectorSession.class),
                     pulsarTableLayoutHandle, null);
 
             verify(this.pulsarSplitManager, times(1))
-                    .getSplitsPartitionedTopic(anyInt(), any(), any(), any(), any());
+                    .getSplitsPartitionedTopic(anyInt(), any(), any(), any(), any(), any());
 
             int partitions = partitionedTopicsToPartitions.get(topicName.toString());
 
@@ -200,8 +200,8 @@ public void testPublishTimePredicatePushdown(String delimiter) throws Exception
         PulsarTableLayoutHandle pulsarTableLayoutHandle = new PulsarTableLayoutHandle(pulsarTableHandle, tupleDomain);
 
         final ResultCaptor<Collection<PulsarSplit>> resultCaptor = new ResultCaptor<>();
-        doAnswer(resultCaptor).when(this.pulsarSplitManager).getSplitsNonPartitionedTopic(anyInt(), any(), any(), any
-                (), any());
+        doAnswer(resultCaptor).when(this.pulsarSplitManager)
+                .getSplitsNonPartitionedTopic(anyInt(), any(), any(), any(), any(), any());
 
         ConnectorSplitSource connectorSplitSource = this.pulsarSplitManager.getSplits(
                 mock(ConnectorTransactionHandle.class), mock(ConnectorSession.class),
@@ -209,7 +209,7 @@ public void testPublishTimePredicatePushdown(String delimiter) throws Exception
 
 
         verify(this.pulsarSplitManager, times(1))
-                .getSplitsNonPartitionedTopic(anyInt(), any(), any(), any(), any());
+                .getSplitsNonPartitionedTopic(anyInt(), any(), any(), any(), any(), any());
 
         int totalSize = 0;
         int initalStart = 1;
@@ -258,7 +258,7 @@ public void testPublishTimePredicatePushdownPartitionedTopic(String delimiter) t
 
         final ResultCaptor<Collection<PulsarSplit>> resultCaptor = new ResultCaptor<>();
         doAnswer(resultCaptor).when(this.pulsarSplitManager)
-                .getSplitsPartitionedTopic(anyInt(), any(), any(), any(), any());
+                .getSplitsPartitionedTopic(anyInt(), any(), any(), any(), any(), any());
 
         ConnectorSplitSource connectorSplitSource = this.pulsarSplitManager.getSplits(
                 mock(ConnectorTransactionHandle.class), mock(ConnectorSession.class),
@@ -266,7 +266,7 @@ public void testPublishTimePredicatePushdownPartitionedTopic(String delimiter) t
 
 
         verify(this.pulsarSplitManager, times(1))
-                .getSplitsPartitionedTopic(anyInt(), any(), any(), any(), any());
+                .getSplitsPartitionedTopic(anyInt(), any(), any(), any(), any(), any());
 
 
         int partitions = partitionedTopicsToPartitions.get(topicName.toString());
@@ -315,7 +315,7 @@ public void testPartitionFilter(String delimiter) throws Exception {
             domainMap.put(PulsarInternalColumn.PARTITION.getColumnHandle(pulsarConnectorId.toString(), false), domain);
             TupleDomain<ColumnHandle> tupleDomain = TupleDomain.withColumnDomains(domainMap);
             Collection<PulsarSplit> splits = this.pulsarSplitManager.getSplitsPartitionedTopic(2, topicName, pulsarTableHandle,
-                schemas.getSchemaInfo(topicName.getSchemaName()), tupleDomain);
+                schemas.getSchemaInfo(topicName.getSchemaName()), tupleDomain, null);
             if (topicsToNumEntries.get(topicName.getSchemaName()) > 1) {
                 Assert.assertEquals(splits.size(), 2);
             }
@@ -332,7 +332,7 @@ public void testPartitionFilter(String delimiter) throws Exception {
             domainMap.put(PulsarInternalColumn.PARTITION.getColumnHandle(pulsarConnectorId.toString(), false), domain);
             tupleDomain = TupleDomain.withColumnDomains(domainMap);
             splits = this.pulsarSplitManager.getSplitsPartitionedTopic(1, topicName, pulsarTableHandle,
-                schemas.getSchemaInfo(topicName.getSchemaName()), tupleDomain);
+                schemas.getSchemaInfo(topicName.getSchemaName()), tupleDomain, null);
             if (topicsToNumEntries.get(topicName.getSchemaName()) > 1) {
                 Assert.assertEquals(splits.size(), 2);
             }
@@ -348,7 +348,7 @@ public void testPartitionFilter(String delimiter) throws Exception {
             domainMap.put(PulsarInternalColumn.PARTITION.getColumnHandle(pulsarConnectorId.toString(), false), domain);
             tupleDomain = TupleDomain.withColumnDomains(domainMap);
             splits = this.pulsarSplitManager.getSplitsPartitionedTopic(2, topicName, pulsarTableHandle,
-                schemas.getSchemaInfo(topicName.getSchemaName()), tupleDomain);
+                schemas.getSchemaInfo(topicName.getSchemaName()), tupleDomain, null);
             if (topicsToNumEntries.get(topicName.getSchemaName()) > 1) {
                 Assert.assertEquals(splits.size(), 3);
             }
@@ -367,7 +367,7 @@ public void testPartitionFilter(String delimiter) throws Exception {
             domainMap.put(PulsarInternalColumn.PARTITION.getColumnHandle(pulsarConnectorId.toString(), false), domain);
             tupleDomain = TupleDomain.withColumnDomains(domainMap);
             splits = this.pulsarSplitManager.getSplitsPartitionedTopic(2, topicName, pulsarTableHandle,
-                schemas.getSchemaInfo(topicName.getSchemaName()), tupleDomain);
+                schemas.getSchemaInfo(topicName.getSchemaName()), tupleDomain, null);
             if (topicsToNumEntries.get(topicName.getSchemaName()) > 1) {
                 Assert.assertEquals(splits.size(), 4);
             }
diff --git a/pulsar-storm/src/main/java/org/apache/pulsar/storm/MessageToValuesMapper.java b/pulsar-storm/src/main/java/org/apache/pulsar/storm/MessageToValuesMapper.java
index 4291fa8fd97ea..92e127c2d5e65 100644
--- a/pulsar-storm/src/main/java/org/apache/pulsar/storm/MessageToValuesMapper.java
+++ b/pulsar-storm/src/main/java/org/apache/pulsar/storm/MessageToValuesMapper.java
@@ -33,12 +33,12 @@ public interface MessageToValuesMapper extends Serializable {
      * @param msg
      * @return
      */
-    public Values toValues(Message<byte[]> msg);
+    Values toValues(Message<byte[]> msg);
 
     /**
      * Declare the output schema for the spout.
      *
      * @param declarer
      */
-    public void declareOutputFields(OutputFieldsDeclarer declarer);
+    void declareOutputFields(OutputFieldsDeclarer declarer);
 }
diff --git a/pulsar-storm/src/main/java/org/apache/pulsar/storm/PulsarSpout.java b/pulsar-storm/src/main/java/org/apache/pulsar/storm/PulsarSpout.java
index 773cb2b44c0da..63887a4f4309b 100644
--- a/pulsar-storm/src/main/java/org/apache/pulsar/storm/PulsarSpout.java
+++ b/pulsar-storm/src/main/java/org/apache/pulsar/storm/PulsarSpout.java
@@ -326,7 +326,11 @@ private boolean mapToValueAndEmit(Message<byte[]> msg) {
                 }
                 ack(msg);
             } else {
-                collector.emit(values, msg);
+                if (values instanceof PulsarTuple) {
+                    collector.emit(((PulsarTuple) values).getOutputStream(), values, msg);
+                } else {
+                    collector.emit(values, msg);
+                }
                 ++messagesEmitted;
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("[{}] Emitted message {} to the collector", spoutId, msg.getMessageId());
diff --git a/pulsar-storm/src/main/java/org/apache/pulsar/storm/PulsarTuple.java b/pulsar-storm/src/main/java/org/apache/pulsar/storm/PulsarTuple.java
new file mode 100644
index 0000000000000..b000827d8c4eb
--- /dev/null
+++ b/pulsar-storm/src/main/java/org/apache/pulsar/storm/PulsarTuple.java
@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.storm;
+
+
+import org.apache.storm.tuple.Values;
+
+/**
+ * Returned by MessageToValuesMapper, this specifies the Values
+ * for an output tuple and the stream it should be sent to.
+ */
+public class PulsarTuple extends Values {
+
+    protected final String outputStream;
+
+    public PulsarTuple(String outStream, Object ... values) {
+        super(values);
+        outputStream = outStream;
+    }
+
+    /**
+     * Return stream the tuple should be emitted on.
+     *
+     * @return String
+     */
+    public String getOutputStream() {
+        return outputStream;
+    }
+}
diff --git a/pulsar-storm/src/test/java/org/apache/pulsar/storm/PulsarSpoutTest.java b/pulsar-storm/src/test/java/org/apache/pulsar/storm/PulsarSpoutTest.java
index f8a1aa009b7a5..ba6705190a3bc 100644
--- a/pulsar-storm/src/test/java/org/apache/pulsar/storm/PulsarSpoutTest.java
+++ b/pulsar-storm/src/test/java/org/apache/pulsar/storm/PulsarSpoutTest.java
@@ -22,10 +22,13 @@
 import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 import java.lang.reflect.Field;
@@ -47,6 +50,7 @@
 import org.apache.storm.task.TopologyContext;
 import org.apache.storm.topology.OutputFieldsDeclarer;
 import org.apache.storm.tuple.Values;
+import org.mockito.ArgumentCaptor;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.Maps;
@@ -92,8 +96,17 @@ public void declareOutputFields(OutputFieldsDeclarer declarer) {
         verify(consumer, atLeast(1)).receive(anyInt(), any());
     }
 
+    @Test
+    public void testPulsarTuple() throws Exception {
+        testPulsarSpout(true);
+    }
+
     @Test
     public void testPulsarSpout() throws Exception {
+        testPulsarSpout(false);
+    }
+
+    public void testPulsarSpout(boolean pulsarTuple) throws Exception {
         PulsarSpoutConfiguration conf = new PulsarSpoutConfiguration();
         conf.setServiceUrl("http://localhost:8080");
         conf.setSubscriptionName("sub1");
@@ -105,7 +118,15 @@ public void testPulsarSpout() throws Exception {
             @Override
             public Values toValues(Message<byte[]> msg) {
                 called.set(true);
-                return new Values("test");
+                if ("message to be dropped".equals(new String(msg.getData()))) {
+                    return null;
+                }
+                String val = new String(msg.getData());
+                if (val.startsWith("stream:")) {
+                    String stream = val.split(":")[1];
+                    return new PulsarTuple(stream, val);
+                }
+                return new Values(val);
             }
 
             @Override
@@ -114,6 +135,8 @@ public void declareOutputFields(OutputFieldsDeclarer declarer) {
 
         });
 
+        String msgContent = pulsarTuple ? "stream:pstream" : "test";
+
         ClientBuilder builder = spy(new ClientBuilderImpl());
         PulsarSpout spout = spy(new PulsarSpout(conf, builder));
         TopologyContext context = mock(TopologyContext.class);
@@ -131,7 +154,7 @@ public void declareOutputFields(OutputFieldsDeclarer declarer) {
         when(client.getSharedConsumer(any())).thenReturn(consumer);
         instances.put(componentId, client);
 
-        Message<byte[]> msg = new MessageImpl<>(conf.getTopic(), "1:1", Maps.newHashMap(), "test".getBytes(), Schema.BYTES);
+        Message<byte[]> msg = new MessageImpl<>(conf.getTopic(), "1:1", Maps.newHashMap(), msgContent.getBytes(), Schema.BYTES);
         when(consumer.receive(anyInt(), any())).thenReturn(msg);
 
         spout.open(config, context, collector);
@@ -139,6 +162,14 @@ public void declareOutputFields(OutputFieldsDeclarer declarer) {
 
         assertTrue(called.get());
         verify(consumer, atLeast(1)).receive(anyInt(), any());
+        ArgumentCaptor<Values> capt = ArgumentCaptor.forClass(Values.class);
+        if (pulsarTuple) {
+            verify(collector, times(1)).emit(eq("pstream"), capt.capture(), eq(msg));
+        } else {
+            verify(collector, times(1)).emit(capt.capture(), eq(msg));
+        }
+        Values vals = capt.getValue();
+        assertEquals(msgContent, vals.get(0));
     }
 
 }
diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketService.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketService.java
index 79cd4366e9fdf..062af7efb82ed 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketService.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/WebSocketService.java
@@ -30,6 +30,7 @@
 import javax.servlet.ServletException;
 import javax.websocket.DeploymentException;
 
+import lombok.Setter;
 import org.apache.bookkeeper.common.util.OrderedScheduler;
 import org.apache.pulsar.broker.PulsarServerException;
 import org.apache.pulsar.broker.ServiceConfiguration;
@@ -77,6 +78,7 @@ public class WebSocketService implements Closeable {
     private ServiceConfiguration config;
     private ConfigurationCacheService configurationCacheService;
 
+    @Setter
     private ClusterData localCluster;
     private final ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<ProducerHandler>> topicProducerMap;
     private final ConcurrentOpenHashMap<String, ConcurrentOpenHashSet<ConsumerHandler>> topicConsumerMap;
diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
index 0a743c8cf2b26..2658035a1ba26 100644
--- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
+++ b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/LocalBookkeeperEnsemble.java
@@ -310,6 +310,9 @@ public void runStreamStorage(CompositeConfiguration conf) throws Exception {
         // stream storage port
         conf.setProperty("storageserver.grpc.port", streamStoragePort);
 
+        // storage server settings
+        conf.setProperty("storage.range.store.dirs", bkDataDirName + "/ranges/data");
+
         // initialize the stream storage metadata
         ClusterInitializer initializer = new ZkClusterInitializer(zkServers);
         initializer.initializeCluster(metadataServiceUri, 2);
diff --git a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperCache.java b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperCache.java
index d69a161b9c3f8..5052605f1685d 100644
--- a/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperCache.java
+++ b/pulsar-zookeeper-utils/src/main/java/org/apache/pulsar/zookeeper/ZooKeeperCache.java
@@ -28,6 +28,7 @@
 import java.nio.file.Paths;
 import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.Collections;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
@@ -458,7 +459,12 @@ public CompletableFuture<Set<String>> getChildrenAsync(String path, Watcher watc
 
     @SuppressWarnings("unchecked")
     public <T> T getDataIfPresent(String path) {
-        return (T) dataCache.getIfPresent(path);
+        CompletableFuture<Map.Entry<Object, Stat>> f = dataCache.getIfPresent(path);
+        if (f != null && f.isDone() && !f.isCompletedExceptionally()) {
+            return (T) f.join().getKey();
+        } else {
+            return null;
+        }
     }
 
     public Set<String> getChildrenIfPresent(String path) {
diff --git a/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZookeeperCacheTest.java b/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZookeeperCacheTest.java
index a83b3705ec085..0b4100a4d6bb6 100644
--- a/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZookeeperCacheTest.java
+++ b/pulsar-zookeeper-utils/src/test/java/org/apache/pulsar/zookeeper/ZookeeperCacheTest.java
@@ -109,6 +109,7 @@ public String deserialize(String key, byte[] content) throws Exception {
         zkClient.create("/my_test", value.getBytes(), null, null);
 
         assertEquals(zkCache.get("/my_test").get(), value);
+        assertEquals(zkCache.getDataIfPresent("/my_test"), value);
 
         String newValue = "test2";
 
@@ -501,11 +502,11 @@ public String deserialize(String key, byte[] content) throws Exception {
         assertEquals(zkCache.getAsync(key1).get().get(), value);
         zkExecutor.shutdown();
     }
-    
+
     /**
      * This tests verifies that {{@link ZooKeeperDataCache} invalidates the cache if the get-operation time-out on that
      * path.
-     * 
+     *
      * @throws Exception
      */
     @Test
diff --git a/site2/docs/adaptors-kafka.md b/site2/docs/adaptors-kafka.md
index 8a5310622402c..4ec0f15ae0ec6 100644
--- a/site2/docs/adaptors-kafka.md
+++ b/site2/docs/adaptors-kafka.md
@@ -250,6 +250,7 @@ You can configure Pulsar authentication provider directly from the Kafka propert
 | [`pulsar.producer.max.pending.messages.across.partitions`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setMaxPendingMessagesAcrossPartitions-int-) | `50000` | Set the maximum number of pending messages across all the partitions.  |
 | [`pulsar.producer.batching.enabled`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setBatchingEnabled-boolean-) | `true` | Control whether automatic batching of messages is enabled for the producer. |
 | [`pulsar.producer.batching.max.messages`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setBatchingMaxMessages-int-) | `1000` | The maximum number of messages in a batch. |
+| [`pulsar.block.if.producer.queue.full`](http://pulsar.apache.org/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html#setBlockIfQueueFull-boolean-) | | Specify the block producer if queue  is full. |
 
 
 ### Pulsar consumer Properties
diff --git a/site2/docs/admin-api-non-partitioned-topics.md b/site2/docs/admin-api-non-partitioned-topics.md
index 61f7409b47938..a8cfe0fc8d183 100644
--- a/site2/docs/admin-api-non-partitioned-topics.md
+++ b/site2/docs/admin-api-non-partitioned-topics.md
@@ -101,3 +101,59 @@ persistent://tenant/namespace/topic2
 ```java
 admin.topics().getList(namespace);
 ```
+
+### Stats
+
+It shows current statistics of a given topic. Here's an example payload:
+
+The following stats are available:
+
+|Stat|Description|
+|----|-----------|
+|msgRateIn|The sum of all local and replication publishers’ publish rates in messages per second|
+|msgThroughputIn|Same as msgRateIn but in bytes per second instead of messages per second|
+|msgRateOut|The sum of all local and replication consumers’ dispatch rates in messages per second|
+|msgThroughputOut|Same as msgRateOut but in bytes per second instead of messages per second|
+|averageMsgSize|Average message size, in bytes, from this publisher within the last interval|
+|storageSize|The sum of the ledgers’ storage size for this topic|
+|publishers|The list of all local publishers into the topic. There can be anywhere from zero to thousands.|
+|producerId|Internal identifier for this producer on this topic|
+|producerName|Internal identifier for this producer, generated by the client library|
+|address|IP address and source port for the connection of this producer|
+|connectedSince|Timestamp this producer was created or last reconnected|
+|subscriptions|The list of all local subscriptions to the topic|
+|my-subscription|The name of this subscription (client defined)|
+|msgBacklog|The count of messages in backlog for this subscription|
+|msgBacklogNoDelayed|The count of messages in backlog without delayed messages for this subscription|
+|type|This subscription type|
+|msgRateExpired|The rate at which messages were discarded instead of dispatched from this subscription due to TTL|
+|consumers|The list of connected consumers for this subscription|
+|consumerName|Internal identifier for this consumer, generated by the client library|
+|availablePermits|The number of messages this consumer has space for in the client library’s listen queue. A value of 0 means the client library’s queue is full and receive() isn’t being called. A nonzero value means this consumer is ready to be dispatched messages.|
+|replication|This section gives the stats for cross-colo replication of this topic|
+|replicationBacklog|The outbound replication backlog in messages|
+|connected|Whether the outbound replicator is connected|
+|replicationDelayInSeconds|How long the oldest message has been waiting to be sent through the connection, if connected is true|
+|inboundConnection|The IP and port of the broker in the remote cluster’s publisher connection to this broker|
+|inboundConnectedSince|The TCP connection being used to publish messages to the remote cluster. If there are no local publishers connected, this connection is automatically closed after a minute.|
+
+#### pulsar-admin
+
+The stats for the topic and its connected producers and consumers can be fetched by using the
+[`stats`](reference-pulsar-admin.md#stats) command, specifying the topic by name:
+
+```shell
+$ pulsar-admin topics stats \
+  persistent://test-tenant/namespace/topic \
+  --get-precise-backlog
+```
+
+#### REST API
+
+{@inject: endpoint|GET|/admin/v2/persistent/:tenant/:namespace/:topic/stats|operation/getStats}
+
+#### Java
+
+```java
+admin.topics().getStats(persistentTopic, false /* is precise backlog */);
+```
diff --git a/site2/docs/admin-api-partitioned-topics.md b/site2/docs/admin-api-partitioned-topics.md
index a6507e073b759..d413425c282f1 100644
--- a/site2/docs/admin-api-partitioned-topics.md
+++ b/site2/docs/admin-api-partitioned-topics.md
@@ -254,6 +254,7 @@ The following stats are available:
 |subscriptions|The list of all local subscriptions to the topic|
 |my-subscription|The name of this subscription (client defined)|
 |msgBacklog|The count of messages in backlog for this subscription|
+|msgBacklogNoDelayed|The count of messages in backlog without delayed messages for this subscription|
 |type|This subscription type|
 |msgRateExpired|The rate at which messages were discarded instead of dispatched from this subscription due to TTL|
 |consumers|The list of connected consumers for this subscription|
@@ -274,7 +275,7 @@ The stats for the partitioned topic and its connected producers and consumers ca
 ```shell
 $ pulsar-admin topics partitioned-stats \
   persistent://test-tenant/namespace/topic \
-  --per-partition        
+  --per-partition
 ```
 
 #### REST API
@@ -284,7 +285,7 @@ $ pulsar-admin topics partitioned-stats \
 #### Java
 
 ```java
-admin.persistentTopics().getStats(persistentTopic);
+admin.topics().getPartitionedStats(persistentTopic, true /* per partition */, false /* is precise backlog */);
 ```
 
 ### Internal stats
diff --git a/site2/docs/admin-api-persistent-topics.md b/site2/docs/admin-api-persistent-topics.md
index 1f688c547021e..b09040d098016 100644
--- a/site2/docs/admin-api-persistent-topics.md
+++ b/site2/docs/admin-api-persistent-topics.md
@@ -222,6 +222,14 @@ It shows current statistics of a given non-partitioned topic.
           -   **type**: This subscription type
 
           -   **msgRateExpired**: The rate at which messages were discarded instead of dispatched from this subscription due to TTL
+          
+          -   **lastExpireTimestamp**: The last message expire execution timestamp
+          
+          -   **lastConsumedFlowTimestamp**: The last flow command received timestamp 
+          
+          -   **lastConsumedTimestamp**: The latest timestamp of all the consumed timestamp of the consumers
+          
+          -   **lastAckedTimestamp**: The latest timestamp of all the acked timestamp of the consumers
 
           -   **consumers**: The list of connected consumers for this subscription
 
@@ -236,6 +244,10 @@ It shows current statistics of a given non-partitioned topic.
                 -   **unackedMessages**: Number of unacknowledged messages for the consumer
 
                 -   **blockedConsumerOnUnackedMsgs**: Flag to verify if the consumer is blocked due to reaching threshold of unacked messages
+                
+                -   **lastConsumedTimestamp**: The timestamp of the consumer last consume a message
+          
+                -   **lastAckedTimestamp**: The timestamp of the consumer last ack a message
 
   -   **replication**: This section gives the stats for cross-colo replication of this topic
 
diff --git a/site2/docs/administration-pulsar-manager.md b/site2/docs/administration-pulsar-manager.md
index af89091b4a5dd..54267e600c319 100644
--- a/site2/docs/administration-pulsar-manager.md
+++ b/site2/docs/administration-pulsar-manager.md
@@ -6,6 +6,9 @@ sidebar_label: Pulsar Manager
 
 Pulsar Manager is a web-based GUI management and monitoring tool that helps administrators and users manage and monitor tenants, namespaces, topics, subscriptions, brokers, clusters, and so on, and supports dynamic configuration of multiple environments.
 
+> Note   
+> If you monitor your current stats with [Pulsar dashboard](administration-dashboard.md), you can try to use Pulsar Manager instead. Pulsar dashboard is deprecated.
+
 ## Install
 
 The easiest way to use the Pulsar Manager is to run it inside a [Docker](https://www.docker.com/products/docker) container.
diff --git a/site2/docs/assets/pulsar-functions-word-count.png b/site2/docs/assets/pulsar-functions-word-count.png
index ad0c280938aad..db1e4970b42df 100644
Binary files a/site2/docs/assets/pulsar-functions-word-count.png and b/site2/docs/assets/pulsar-functions-word-count.png differ
diff --git a/site2/docs/client-libraries-cpp.md b/site2/docs/client-libraries-cpp.md
index 6656122355266..ddfba789399c3 100644
--- a/site2/docs/client-libraries-cpp.md
+++ b/site2/docs/client-libraries-cpp.md
@@ -4,10 +4,16 @@ title: Pulsar C++ client
 sidebar_label: C++
 ---
 
+You can use Pulsar C++ client to create Pulsar producers and consumers in C++.
+
+All the methods in producer, consumer, and reader of a C++ client are thread-safe.
+
 ## Supported platforms
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are available [here](/api/cpp).
+
 ## Linux
 
 > Since 2.1.0 release, Pulsar ships pre-built RPM and Debian packages. You can download and install those packages directly.
diff --git a/site2/docs/client-libraries-go.md b/site2/docs/client-libraries-go.md
index 716efed9638c9..bdeb032b30d6e 100644
--- a/site2/docs/client-libraries-go.md
+++ b/site2/docs/client-libraries-go.md
@@ -1,10 +1,19 @@
 ---
 id: client-libraries-go
-title: The Pulsar Go client
+title: Pulsar Go client
 sidebar_label: Go
 ---
 
-The Pulsar Go client can be used to create Pulsar [producers](#producers), [consumers](#consumers), and [readers](#readers) in Go (aka Golang).
+You can use Pulsar Go client to create Pulsar [producers](#producers), [consumers](#consumers), and [readers](#readers) in Go (aka Golang).
+
+All the methods in [producers](#producers), [consumers](#consumers), and [readers](#readers) of a Go client are thread-safe.
+
+Currently, the following Go clients are maintained in two repositories.
+
+| Language | Project | Maintainer | License | Description |
+|----------|---------|------------|---------|-------------|
+| CGo | [pulsar-client-go](https://github.com/apache/pulsar/tree/master/pulsar-client-go) | [Apache Pulsar](https://github.com/apache/pulsar) | [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) | CGo client that depends on C++ client library |
+| Go | [pulsar-client-go](https://github.com/apache/pulsar-client-go) | [Apache Pulsar](https://github.com/apache/pulsar) | [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) | A native golang client |
 
 > #### API docs available as well
 > For standard API docs, consult the [Godoc](https://godoc.org/github.com/apache/pulsar/pulsar-client-go/pulsar).
@@ -15,10 +24,9 @@ The Pulsar Go client can be used to create Pulsar [producers](#producers), [cons
 ### Requirements
 
 Pulsar Go client library is based on the C++ client library. Follow
-the instructions for [C++ library](client-libraries-cpp.md) for installing the binaries
-through [RPM](client-libraries-cpp.md#rpm), [Deb](client-libraries-cpp.md#deb) or [Homebrew packages](client-libraries-cpp.md#macos).
+the instructions for [C++ library](client-libraries-cpp.md) for installing the binaries through [RPM](client-libraries-cpp.md#rpm), [Deb](client-libraries-cpp.md#deb) or [Homebrew packages](client-libraries-cpp.md#macos).
 
-### Installing go package
+### Install go package
 
 > #### Compatibility Warning
 > The version number of the Go client **must match** the version number of the Pulsar C++ client library.
@@ -63,7 +71,7 @@ If you're using [TLS](security-tls-authentication.md) authentication, the URL wi
 pulsar+ssl://pulsar.us-west.example.com:6651
 ```
 
-## Creating a client
+## Create a client
 
 In order to interact with Pulsar, you'll first need a `Client` object. You can create a client object using the `NewClient` function, passing in a `ClientOptions` object (more on configuration [below](#client-configuration)). Here's an example:
 
@@ -433,8 +441,8 @@ reader, err := client.CreateReader(pulsar.ReaderOptions{
 
 Parameter | Description | Default
 :---------|:------------|:-------
-`Topic` | The Pulsar [topic](reference-terminology.md#topic) on which the reader will establish a subscription and listen for messages |
-`Name` | The name of the reader |
+`Topic` | The Pulsar [topic](reference-terminology.md#topic) on which the reader will establish a subscription and listen for messages 
+`Name` | The name of the reader 
 `StartMessageID` | THe initial reader position, i.e. the message at which the reader begins processing messages. The options are `pulsar.EarliestMessage` (the earliest available message on the topic), `pulsar.LatestMessage` (the latest available message on the topic), or a `MessageID` object for a position that isn't earliest or latest. |
 `MessageChannel` | The Go channel used by the reader. Messages that arrive from the Pulsar topic(s) will be passed to this channel. |
 `ReceiverQueueSize` | Sets the size of the reader's receiver queue, i.e. the number of messages that can be accumulated by the reader before the application calls `Next`. A value higher than the default of 1000 could increase reader throughput, though at the expense of more memory utilization. | 1000
diff --git a/site2/docs/client-libraries-java.md b/site2/docs/client-libraries-java.md
index e9bddcbbefe60..dabe0344b9334 100644
--- a/site2/docs/client-libraries-java.md
+++ b/site2/docs/client-libraries-java.md
@@ -4,7 +4,9 @@ title: Pulsar Java client
 sidebar_label: Java
 ---
 
-You can use Pulsar Java client to create Java producers, consumers, and [readers](#reader-interface) of messages and to perform [administrative tasks](admin-api-overview.md). The current version of the Java client is **{{pulsar:version}}**.
+You can use Pulsar Java client to create Java [producer](#producer), [consumer](#consumer), and [readers](#reader-interface) of messages and to perform [administrative tasks](admin-api-overview.md). The current version of the Java client is **{{pulsar:version}}**.
+
+All the methods in [producer](#producer), [consumer](#consumer), and [reader](#reader) of a Java client are thread-safe.
 
 Javadoc for the Pulsar client is divided into two domains by package as follows.
 
diff --git a/site2/docs/client-libraries-node.md b/site2/docs/client-libraries-node.md
index 130f7a058d667..ed7e3803ca024 100644
--- a/site2/docs/client-libraries-node.md
+++ b/site2/docs/client-libraries-node.md
@@ -6,6 +6,8 @@ sidebar_label: Node.js
 
 The Pulsar Node.js client can be used to create Pulsar [producers](#producers), [consumers](#consumers), and [readers](#readers) in Node.js.
 
+All the methods in [producers](#producers), [consumers](#consumers), and [readers](#readers) of a Node.js client are thread-safe.
+
 ## Installation
 
 You can install the [`pusar-client`](https://www.npmjs.com/package/pulsar-client) library via [npm](https://www.npmjs.com/).
@@ -284,7 +286,7 @@ Pulsar Node.js readers have the following methods available:
 | :----- | :---------- | :---------- |
 | `readNext()` | Receives the next message on the topic (analogous to the `receive` method for [consumers](#consumer-operations)). When the message is available, the Promise object run executor function and get message object. | `Promise<Object>` |
 | `readNext(Number)` | Receives a single message from the topic with specific timeout in milliseconds. | `Promise<Object>` |
-| `hasNext()` | Return whether Proker has next message in target topic. | `Boolean` |
+| `hasNext()` | Return whether the broker has next message in target topic. | `Boolean` |
 | `close()` | Closes the reader, disabling its ability to receive messages from the broker. | `Promise<null>` |
 
 ### Reader configuration
diff --git a/site2/docs/client-libraries-python.md b/site2/docs/client-libraries-python.md
index 2e93e96a753a9..4d5c0b0c495d2 100644
--- a/site2/docs/client-libraries-python.md
+++ b/site2/docs/client-libraries-python.md
@@ -1,16 +1,20 @@
 ---
 id: client-libraries-python
-title: The Pulsar Python client
+title: Pulsar Python client
 sidebar_label: Python
 ---
 
-The Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
+Pulsar Python client library is a wrapper over the existing [C++ client library](client-libraries-cpp.md) and exposes all of the [same features](/api/cpp). You can find the code in the [`python` subdirectory](https://github.com/apache/pulsar/tree/master/pulsar-client-cpp/python) of the C++ client code.
 
-## Installation
+All the methods in producer, consumer, and reader of a Python client are thread-safe.
+
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client are available [here](/api/python).
+
+## Install
 
 You can install the [`pulsar-client`](https://pypi.python.org/pypi/pulsar-client) library either via [PyPi](https://pypi.python.org/pypi), using [pip](#installation-using-pip), or by building the library from source.
 
-### Installation using pip
+### Install using pip
 
 To install the `pulsar-client` library as a pre-built package using the [pip](https://pip.pypa.io/en/stable/) package manager:
 
@@ -25,9 +29,9 @@ Platform | Supported Python versions
 MacOS <br />  10.13 (High Sierra), 10.14 (Mojave) <br /> | 2.7, 3.7
 Linux | 2.7, 3.4, 3.5, 3.6, 3.7
 
-### Installing from source
+### Install from source
 
-To install the `pulsar-client` library by building from source, follow [these instructions](client-libraries-cpp.md#compilation) and compile the Pulsar C++ client library. That will also build the Python binding for the library.
+To install the `pulsar-client` library by building from source, follow [instructions](client-libraries-cpp.md#compilation) and compile the Pulsar C++ client library. That builds the Python binding for the library.
 
 To install the built Python bindings:
 
@@ -43,11 +47,11 @@ The complete Python API reference is available at [api/python](/api/python).
 
 ## Examples
 
-Below you'll find a variety of Python code examples for the `pulsar-client` library.
+You can find a variety of Python code examples for the `pulsar-client` library.
 
 ### Producer example
 
-This creates a Python producer for the `my-topic` topic and send 10 messages on that topic:
+The following example creates a Python producer for the `my-topic` topic and sends 10 messages on that topic:
 
 ```python
 import pulsar
@@ -64,7 +68,7 @@ client.close()
 
 ### Consumer example
 
-This creates a consumer with the `my-subscription` subscription on the `my-topic` topic, listen for incoming messages, print the content and ID of messages that arrive, and acknowledge each message to the Pulsar broker:
+The following example creates a consumer with the `my-subscription` subscription name on the `my-topic` topic, receives incoming messages, prints the content and ID of messages that arrive, and acknowledges each message to the Pulsar broker.
 
 ```python
 consumer = client.subscribe('my-topic', 'my-subscription')
@@ -97,13 +101,32 @@ while True:
     print("Received message '{}' id='{}'".format(msg.data(), msg.message_id()))
     # No acknowledgment
 ```
+### Multi-topic subscriptions
+
+In addition to subscribing a consumer to a single Pulsar topic, you can also subscribe to multiple topics simultaneously. To use multi-topic subscriptions, you can supply a regular expression (regex) or a `List` of topics. If you select topics via regex, all topics must be within the same Pulsar namespace.
+
+The following is an example. 
 
+```python
+import re
+consumer = client.subscribe(re.compile('persistent://public/default/topic-*'), 'my-subscription')
+while True:
+    msg = consumer.receive()
+    try:
+        print("Received message '{}' id='{}'".format(msg.data(), msg.message_id()))
+        # Acknowledge successful processing of the message
+        consumer.acknowledge(msg)
+    except:
+        # Message failed to be processed
+        consumer.negative_acknowledge(msg)
+client.close()
+```
 
 ## Schema
 
-### Declaring and validating schema
+### Declare and validate schema
 
-A schema can be declared by passing a class that inherits
+You can declare a schema by passing a class that inherits
 from `pulsar.schema.Record` and defines the fields as
 class variables. For example:
 
@@ -116,8 +139,7 @@ class Example(Record):
     c = Boolean()
 ```
 
-With this simple schema definition we can then create producers,
-consumers and readers instances that will be referring to that.
+With this simple schema definition, you can create producers, consumers and readers instances that refer to that.
 
 ```python
 producer = client.create_producer(
@@ -127,13 +149,9 @@ producer = client.create_producer(
 producer.send(Example(a='Hello', b=1))
 ```
 
-When the producer is created, the Pulsar broker will validate that
-the existing topic schema is indeed of "Avro" type and that the
-format is compatible with the schema definition of the `Example`
-class.
+After creating the producer, the Pulsar broker validates that the existing topic schema is indeed of "Avro" type and that the format is compatible with the schema definition of the `Example` class.
 
-If there is a mismatch, the producer creation will raise an
-exception.
+If there is a mismatch, an exception occurs in the producer creation.
 
 Once a producer is created with a certain schema definition,
 it will only accept objects that are instances of the declared
@@ -163,8 +181,7 @@ while True:
 
 ### Supported schema types
 
-There are different builtin schema types that can be used in Pulsar.
-All the definitions are in the `pulsar.schema` package.
+You can use different builtin schema types in Pulsar. All the definitions are in the `pulsar.schema` package.
 
 | Schema | Notes |
 | ------ | ----- |
@@ -175,12 +192,11 @@ All the definitions are in the `pulsar.schema` package.
 
 ### Schema definition reference
 
-The schema definition is done through a class that inherits from
-`pulsar.schema.Record`.
+The schema definition is done through a class that inherits from `pulsar.schema.Record`.
 
-This class can have a number of fields which can be of either
-`pulsar.schema.Field` type or even another nested `Record`. All the
-fields are also specified in the `pulsar.schema` package. The fields
+This class has a number of fields which can be of either
+`pulsar.schema.Field` type or another nested `Record`. All the
+fields are specified in the `pulsar.schema` package. The fields
 are matching the AVRO fields types.
 
 | Field Type | Python Type | Notes |
@@ -192,20 +208,19 @@ are matching the AVRO fields types.
 | `Double`   | `float`     |       |
 | `Bytes`    | `bytes`     |       |
 | `String`   | `str`       |       |
-| `Array`    | `list`      | Need to specify record type for items |
-| `Map`      | `dict`      | Key is always `String`. Need to specify value type |
+| `Array`    | `list`      | Need to specify record type for items. |
+| `Map`      | `dict`      | Key is always `String`. Need to specify value type. |
 
-Additionally, any Python `Enum` type can be used as a valid field
-type
+Additionally, any Python `Enum` type can be used as a valid field type.
 
 #### Fields parameters
 
-When adding a field these parameters can be used in the constructor:
+When adding a field, you can use these parameters in the constructor.
 
 | Argument   | Default | Notes |
 | ---------- | --------| ----- |
 | `default`  | `None`  | Set a default value for the field. Eg: `a = Integer(default=5)` |
-| `required` | `False` | Mark the field as "required". This will set it in the schema accordingly. |
+| `required` | `False` | Mark the field as "required". It is set in the schema accordingly. |
 
 #### Schema definition examples
 
diff --git a/site2/docs/concepts-messaging.md b/site2/docs/concepts-messaging.md
index 0ab09e7984acf..4d2edcd75531d 100644
--- a/site2/docs/concepts-messaging.md
+++ b/site2/docs/concepts-messaging.md
@@ -49,12 +49,21 @@ Messages published by producers can be compressed during transportation in order
 
 ### Batching
 
-If batching is enabled, the producer will accumulate and send a batch of messages in a single request. Batching size is defined by the maximum number of messages and maximum publish latency.
+If batching is enabled, the producer will accumulate and send a batch of messages in a single request. Batch size is defined by the maximum number of messages and maximum publish latency.
+
+Batches are tracked and stored by Pulsar as batches rather than as individual messages. Under the hood the consumer unbundles these batches into individual messages. Since the messages are stored as batches, the backlog size will also represent the total number of batches rather than the total number of messages.
+
+Scheduled messages (using `deliverAt` or `deliverAfter`) are always sent as individual messages even when batching is enabled.
+
+> Note
+> Since batches are tracked as single units, a batch will only be considered acknowledged when all its messages are acknowledged by the consumer. This means unexpected failures, negative acknowledgements, and acknowledgement timeouts can result in redelivery of all messages in the batch, even if some of the messages have already been acknowledged.
 
 ## Consumers
 
 A consumer is a process that attaches to a topic via a subscription and then receives messages.
 
+A consumer sends a [flow permit request](developing-binary-protocol.md#flow-control) to a broker to get messages. There is a queue at the consumer side to receive messages pushed from the broker. The queue size is configurable by [`receiverQueueSize`](client-libraries-java.md#configure-consumer) (default: 1000). Each time `consumer.receive()` is called, a message is dequeued from the buffer.  
+
 ### Receive modes
 
 Messages can be received from [brokers](reference-terminology.md#broker) either synchronously (sync) or asynchronously (async).
@@ -70,7 +79,7 @@ Client libraries provide listener implementation for consumers. For example, the
 
 ### Acknowledgement
 
-When a consumer has consumed a message successfully, the consumer sends an acknowledgement request to the broker, so that the broker will discard the message. Otherwise, it [stores](concepts-architecture-overview.md#persistent-storage) the message.
+When a consumer has consumed a message successfully, the consumer sends an acknowledgement request to the broker. This message is permanently [stored](concepts-architecture-overview.md#persistent-storage) and then it is deleted only after all the subscriptions have acknowledged it. If you want to store the message that has been acknowledged by a consumer, you need to configure the [message retention policy](concepts-messaging.md#message-retention-and-expiry).
 
 Messages can be acknowledged either one by one or cumulatively. With cumulative acknowledgement, the consumer only needs to acknowledge the last message it received. All messages in the stream up to (and including) the provided message will not be re-delivered to that consumer.
 
@@ -89,12 +98,18 @@ In the exclusive and failover subscription modes, consumers only negatively ackn
 
 In the shared and Key_Shared subscription modes, you can negatively acknowledge messages individually.
 
+> Note
+> If batching is enabled, other messages in the same batch may be redelivered to the consumer as well as the negatively acknowledged messages.
+
 ### Acknowledgement timeout
 
 When a message is not consumed successfully, and you want to trigger the broker to redeliver the message automatically, you can adopt the unacknowledged message automatic re-delivery mechanism. Client will track the unacknowledged messages within the entire `acktimeout` time range, and send a `redeliver unacknowledged messages` request to the broker automatically when the acknowledgement timeout is specified.
 
+> Note
+> If batching is enabled, other messages in the same batch may be redelivered to the consumer as well as the unacknowledged messages.
+
 > Note    
-> Use negative acknowledgement prior to acknowledgement timeout. Negative acknowledgement controls re-delivery of individual messages with more precise, and avoids invalid redeliveries when the message processing time exceeds the acknowledgement timeout.
+> Prefer negative acknowledgements over acknowledgement timeout. Negative acknowledgement controls the re-delivery of individual messages with more precision, and avoids invalid redeliveries when the message processing time exceeds the acknowledgement timeout.
 
 ### Dead letter topic
 
@@ -161,12 +176,18 @@ Topic name component | Description
 
 A namespace is a logical nomenclature within a tenant. A tenant can create multiple namespaces via the [admin API](admin-api-namespaces.md#create). For instance, a tenant with different applications can create a separate namespace for each application. A namespace allows the application to create and manage a hierarchy of topics. The topic `my-tenant/app1` is a namespace for the application `app1` for `my-tenant`. You can create any number of [topics](#topics) under the namespace.
 
-## Subscription modes
+## Subscriptions
 
-A subscription is a named configuration rule that determines how messages are delivered to consumers. Four subscription modes are available in Pulsar: [exclusive](#exclusive), [shared](#shared), [failover](#failover) and [Key_Shared](#key_shared). These modes are illustrated in the figure below.
+A subscription is a named configuration rule that determines how messages are delivered to consumers. There are four available subscription modes in Pulsar: [exclusive](#exclusive), [shared](#shared), [failover](#failover), and [key_shared](#key_shared). These modes are illustrated in the figure below.
 
 ![Subscription modes](assets/pulsar-subscription-modes.png)
 
+> #### Pub-Sub, Queuing, or Both
+> There is a lot of flexibility in how to combine subscriptions:
+> * If you want to achieve traditional "fan-out pub-sub messaging" among consumers, you can make each consumer have a unique subscription name (exclusive)
+> * If you want to achieve "message queuing" among consumers, you can make multiple consumers have the same subscription name (shared, failover, key_shared)
+> * If you want to do both simultaneously, you can have some consumers with exclusive subscriptions while others do not
+
 ### Exclusive
 
 In *exclusive* mode, only a single consumer is allowed to attach to the subscription. If more than one consumer attempts to subscribe to a topic using the same subscription, the consumer receives an error.
@@ -224,8 +245,8 @@ When a consumer subscribes to a Pulsar topic, by default it subscribes to one sp
 
 When subscribing to multiple topics, the Pulsar client will automatically make a call to the Pulsar API to discover the topics that match the regex pattern/list and then subscribe to all of them. If any of the topics don't currently exist, the consumer will auto-subscribe to them once the topics are created.
 
-> #### No ordering guarantees
-> When a consumer subscribes to multiple topics, all ordering guarantees normally provided by Pulsar on single topics do not hold. If your use case for Pulsar involves any strict ordering requirements, we would strongly recommend against using this feature.
+> #### No ordering guarantees across multiple topics
+> When a producer sends messages to a single topic, all messages are guaranteed to be read from that topic in the same order. However, these guarantees do not hold across multiple topics. So when a producer sends message to multiple topics, the order in which messages are read from those topics is not guaranteed to be the same.
 
 Here are some multi-topic subscription examples for Java:
 
@@ -268,7 +289,7 @@ The diagram below illustrates this:
 
 Here, the topic **Topic1** has five partitions (**P0** through **P4**) split across three brokers. Because there are more partitions than brokers, two brokers handle two partitions a piece, while the third handles only one (again, Pulsar handles this distribution of partitions automatically).
 
-Messages for this topic are broadcast to two consumers. The [routing mode](#routing-modes) determines both which broker handles each partition, while the [subscription mode](#subscription-modes) determines which messages go to which consumers.
+Messages for this topic are broadcast to two consumers. The [routing mode](#routing-modes) determines each message should be published to which partition, while the [subscription mode](#subscription-modes) determines which messages go to which consumers.
 
 Decisions about routing and subscription modes can be made separately in most cases. In general, throughput concerns should guide partitioning/routing decisions while subscription decisions should be guided by application semantics.
 
@@ -439,4 +460,4 @@ The following is an example of delayed message delivery for a producer in Java:
 ```java
 // message to be delivered at the configured delay interval
 producer.newMessage().deliverAfter(3L, TimeUnit.Minute).value("Hello Pulsar!").send();
-```
\ No newline at end of file
+```
diff --git a/site2/docs/cookbooks-partitioned.md b/site2/docs/cookbooks-partitioned.md
index 76b6ed657b6a8..555d3c8824351 100644
--- a/site2/docs/cookbooks-partitioned.md
+++ b/site2/docs/cookbooks-partitioned.md
@@ -4,27 +4,25 @@ title: Partitioned topics
 sidebar_label: Partitioned Topics
 ---
 
-By default, Pulsar topics are served by a single broker. Using only a single broker, however, limits a topic's maximum throughput. *Partitioned topics* are a special type of topic that can span multiple brokers and thus allow for much higher throughput. For an explanation of how partitioned topics work, see the [Partitioned Topics](concepts-messaging.md#partitioned-topics) concepts.
+By default, Pulsar topics are served by a single broker. Using only a single broker limits a topic's maximum throughput. *Partitioned topics* are a special type of topic that can span multiple brokers and thus allow for much higher throughput. For an explanation of how partitioned topics work, see the [Partitioned Topics](concepts-messaging.md#partitioned-topics) concepts.
 
-You can [publish](#publishing-to-partitioned-topics) to partitioned topics using Pulsar's client libraries and you can [create and manage](#managing-partitioned-topics) partitioned topics using Pulsar's [admin API](admin-api-overview.md).
+You can publish to partitioned topics using Pulsar client libraries and you can [create and manage](#managing-partitioned-topics) partitioned topics using Pulsar [admin API](admin-api-overview.md).
 
-## Publishing to partitioned topics
+## Publish to partitioned topics
 
-When publishing to partitioned topics, the only difference from non-partitioned topics is that you need to specify a [routing mode](concepts-messaging.md#routing-modes) when you create a new [producer](reference-terminology.md#producer). Examples for [Java](#java) are below.
-
-### Java
+When publishing to partitioned topics, you do not need to explicitly specify a [routing mode](concepts-messaging.md#routing-modes) when you create a new producer. If you do not specify a routing mode, the round robin route mode is used. Take [Java](#java) as an example.
 
 Publishing messages to partitioned topics in the Java client works much like [publishing to normal topics](client-libraries-java.md#using-producers). The difference is that you need to specify either one of the currently available message routers or a custom router.
 
-#### Routing mode
+### Routing mode
 
-You can specify the routing mode in the ProducerConfiguration object that you use to configure your producer. You have three options:
+You can specify the routing mode in the ProducerConfiguration object that you use to configure your producer. Three options are available:
 
 * `SinglePartition`
 * `RoundRobinPartition`
 * `CustomPartition`
 
-Here's an example:
+The following is an example:
 
 ```java
 String pulsarBrokerRootUrl = "pulsar://localhost:6650";
@@ -38,7 +36,7 @@ Producer<byte[]> producer = pulsarClient.newProducer()
 producer.send("Partitioned topic message".getBytes());
 ```
 
-#### Custom message router
+### Custom message router
 
 To use a custom message router, you need to provide an implementation of the {@inject: javadoc:MessageRouter:/client/org/apache/pulsar/client/api/MessageRouter} interface, which has just one `choosePartition` method:
 
@@ -48,7 +46,7 @@ public interface MessageRouter extends Serializable {
 }
 ```
 
-Here's a (not very useful!) router that routes every message to partition 10:
+The following router routes every message to partition 10:
 
 ```java
 public class AlwaysTenRouter implements MessageRouter {
@@ -72,6 +70,23 @@ Producer<byte[]> producer = pulsarClient.newProducer()
 producer.send("Partitioned topic message".getBytes());
 ```
 
-## Managing partitioned topics
+### How to choose partitions when using a key
+If a message has a key, it supersedes the round robin routing policy. The following example illustrates how to choose partition when you use a key.
 
-You can use Pulsar's [admin API](admin-api-overview.md) to create and manage [partitioned topics](admin-api-partitioned-topics.md).
+```java
+// If the message has a key, it supersedes the round robin routing policy
+        if (msg.hasKey()) {
+            return signSafeMod(hash.makeHash(msg.getKey()), topicMetadata.numPartitions());
+        }
+
+        if (isBatchingEnabled) { // if batching is enabled, choose partition on `partitionSwitchMs` boundary.
+            long currentMs = clock.millis();
+            return signSafeMod(currentMs / partitionSwitchMs + startPtnIdx, topicMetadata.numPartitions());
+        } else {
+            return signSafeMod(PARTITION_INDEX_UPDATER.getAndIncrement(this), topicMetadata.numPartitions());
+        }
+```        
+
+## Manage partitioned topics
+
+You can use Pulsar [admin API](admin-api-overview.md) to create and manage [partitioned topics](admin-api-partitioned-topics.md).
\ No newline at end of file
diff --git a/site2/docs/developing-binary-protocol.md b/site2/docs/developing-binary-protocol.md
index e9e5252e45d31..6238be94e8497 100644
--- a/site2/docs/developing-binary-protocol.md
+++ b/site2/docs/developing-binary-protocol.md
@@ -288,8 +288,11 @@ A `Flow` command gives additional *permits* to send messages to the consumer.
 A typical consumer implementation will use a queue to accumulate these messages
 before the application is ready to consume them.
 
-After the application has dequeued a number of message, the consumer will
-send additional number of permits to allow the broker to push more messages.
+After the application has dequeued half of the messages in the queue, the consumer 
+sends permits to the broker to ask for more messages (equals to half of the messages in the queue).
+
+For example, if the queue size is 1000 and the consumer consumes 500 messages in the queue.
+Then the consumer sends permits to the broker to ask for 500 messages.
 
 ##### Command Subscribe
 
diff --git a/site2/docs/functions-debug.md b/site2/docs/functions-debug.md
index fc1c2be54bc82..931c73761659b 100644
--- a/site2/docs/functions-debug.md
+++ b/site2/docs/functions-debug.md
@@ -37,6 +37,9 @@ public class JavaNativeExclamationFunction implements Function<String, String> {
 
 You can write a simple unit test to test Pulsar Function.
 
+> #### Tip
+> Pulsar uses testng for testing.
+
 ```java
 @Test
 public void testJavaNativeExclamationFunction() {
@@ -62,6 +65,9 @@ public class ExclamationFunction implements Function<String, String> {
 
 In this situation, you can write a unit test for this function as well. Remember to mock the `Context` parameter. The following is an example.
 
+> #### Tip
+> Pulsar uses testng for testing.
+
 ```java
 @Test
 public void testExclamationFunction() {
diff --git a/site2/docs/functions-develop.md b/site2/docs/functions-develop.md
index 162010655632e..43f43a87fe710 100644
--- a/site2/docs/functions-develop.md
+++ b/site2/docs/functions-develop.md
@@ -468,7 +468,7 @@ For complete code, see [here](https://github.com/apache/pulsar/blob/master/pulsa
 <!--END_DOCUSAURUS_CODE_TABS-->
 
 ### User config
-When you run or update Pulsar Functions created using SDK, you can pass arbitrary key/values to them with the command line with the `--userConfig` flag. Key/values must be specified as JSON. The following function creation command passes a user configured key/value to a function.
+When you run or update Pulsar Functions created using SDK, you can pass arbitrary key/values to them with the command line with the `--user-config` flag. Key/values must be specified as JSON. The following function creation command passes a user configured key/value to a function.
 
 ```bash
 $ bin/pulsar-admin functions create \
diff --git a/site2/docs/functions-overview.md b/site2/docs/functions-overview.md
index 37869c0279ff5..dcdb97a1029cd 100644
--- a/site2/docs/functions-overview.md
+++ b/site2/docs/functions-overview.md
@@ -12,7 +12,7 @@ sidebar_label: Overview
 
 
 ## Goals
-With Pulsar Functions, you can create complex processing logic without deploying a separate neighboring system (such as [Apache Storm](http://storm.apache.org/), [Apache Heron](https://apache.github.io/incubator-heron), [Apache Flink](https://flink.apache.org/)). Pulsar Functions are computing infrastructure of Pulsar messaging system. The core goal is tied to a series of other goals:
+With Pulsar Functions, you can create complex processing logic without deploying a separate neighboring system (such as [Apache Storm](http://storm.apache.org/), [Apache Heron](https://heron.incubator.apache.org/), [Apache Flink](https://flink.apache.org/)). Pulsar Functions are computing infrastructure of Pulsar messaging system. The core goal is tied to a series of other goals:
 
 * Developer productivity (language-native vs Pulsar Functions SDK functions)
 * Easy troubleshooting
@@ -164,29 +164,21 @@ Delivery semantics | Description
 
 
 ### Apply processing guarantees to a function
-You can set the processing guarantees for a Pulsar Function when you create the Function. The [`pulsar-function create`](reference-pulsar-admin.md#create-1) command applies effectively-once guarantees to the Function.
+You can set the processing guarantees for a Pulsar Function when you create the Function. The following [`pulsar-function create`](reference-pulsar-admin.md#create-1) command creates a function with effectively-once guarantees applied.
 
 ```bash
 $ bin/pulsar-admin functions create \
+  --name my-effectively-once-function \
   --processing-guarantees EFFECTIVELY_ONCE \
   # Other function configs
 ```
 
-The available options are:
+The available options for `--processing-guarantees` are:
 
 * `ATMOST_ONCE`
 * `ATLEAST_ONCE`
 * `EFFECTIVELY_ONCE`
 
-The following command runs a function in the cluster mode with effectively-once guarantees applied.
-
-```bash
-$ bin/pulsar-admin functions create \
-  --name my-effectively-once-function \
-  --processing-guarantees EFFECTIVELY_ONCE \
-  # Other function configs
-```
-
 > By default, Pulsar Functions provide at-least-once delivery guarantees. So if you create a function without supplying a value for the `--processingGuarantees` flag, the function provides at-least-once guarantees.
 
 ### Update the processing guarantees of a function
@@ -196,4 +188,4 @@ You can change the processing guarantees applied to a function using the [`updat
 $ bin/pulsar-admin functions update \
   --processing-guarantees ATMOST_ONCE \
   # Other function configs
-```
\ No newline at end of file
+```
diff --git a/site2/docs/getting-started-clients.md b/site2/docs/getting-started-clients.md
index 3eb6fe5211186..b7c2d550315ce 100644
--- a/site2/docs/getting-started-clients.md
+++ b/site2/docs/getting-started-clients.md
@@ -6,46 +6,19 @@ sidebar_label: Use Pulsar with client libraries
 
 Pulsar supports the following client libraries:
 
-- [Java client](#java-client)
-- [Go client](#go-client)
-- [Python client](#python-client)
-- [C++ client](#c-client)
-
-## Java client
-
-For instructions on how to use the Pulsar Java client to produce and consume messages, see [Pulsar Java client](client-libraries-java.md).
-
-Two independent sets of Javadoc API docs are available.
-
-Library | Purpose
-:-------|:-------
-[`org.apache.pulsar.client.api`](/api/client) | The [Pulsar Java client](client-libraries-java.md) is used to produce and consume messages on Pulsar topics.
-[`org.apache.pulsar.client.admin`](/api/admin) | The Java client for the [Pulsar admin interface](admin-api-overview.md).
-
-
-## Go client
-
-For a tutorial on using the Pulsar Go client, see [Pulsar Go client](client-libraries-go.md).
-
-
-## Python client
-
-For a tutorial on using the Pulsar Python client, see [Pulsar Python client](client-libraries-python.md).
-
-There are also [pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python client [here](/api/python).
-
-## C++ client
-
-For a tutorial on using the Pulsar C++ clent, see [Pulsar C++ client](client-libraries-cpp.md).
-
-There are also [Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client [here](/api/cpp).
-
-## Feature Matrix
+- [Java client](client-libraries-java.md)
+- [Go client](client-libraries-go.md)
+- [Python client](client-libraries-python.md)
+- [C++ client](client-libraries-cpp.md)
+- [Node.js client](client-libraries-node.md)
+- [WebSocket client](client-libraries-websocket.md)
+
+## Feature matrix
 Pulsar client feature matrix for different languages is listed on [Client Features Matrix](https://github.com/apache/pulsar/wiki/Client-Features-Matrix) page.
 
-## Thirdparty Clients
+## Third-party clients
 
-Besides the official released clients, there are also multiple projects on developing a Pulsar client in different languages.
+Besides the official released clients, multiple projects on developing Pulsar clients are available in different languages.
 
 > If you have developed a new Pulsar client, feel free to submit a pull request and add your client to the list below.
 
@@ -55,4 +28,4 @@ Besides the official released clients, there are also multiple projects on devel
 | Go | [go-pulsar](https://github.com/t2y/go-pulsar) | [t2y](https://github.com/t2y) | [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) | |
 | Scala | [pulsar4s](https://github.com/sksamuel/pulsar4s) | [sksamuel](https://github.com/sksamuel) | [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) | Idomatic, typesafe, and reactive Scala client for Apache Pulsar |
 | Rust | [pulsar-rs](https://github.com/wyyerd/pulsar-rs) | [Wyyerd Group](https://github.com/wyyerd) | [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) | Future-based Rust bindings for Apache Pulsar |
-| .NET | [pulsar-client-dotnet](https://github.com/fsharplang-ru/pulsar-client-dotnet) | [Lanayx](https://github.com/Lanayx) | [![GitHub](https://img.shields.io/badge/license-MIT-green.svg)](https://opensource.org/licenses/MIT) | Native .NET client for C#/F#/VB |
+| .NET | [pulsar-client-dotnet](https://github.com/fsharplang-ru/pulsar-client-dotnet) | [Lanayx](https://github.com/Lanayx) | [![GitHub](https://img.shields.io/badge/license-MIT-green.svg)](https://opensource.org/licenses/MIT) | Native .NET client for C#/F#/VB |
\ No newline at end of file
diff --git a/site2/docs/io-connectors.md b/site2/docs/io-connectors.md
index c2e7f580d6a81..a34cf540d0759 100644
--- a/site2/docs/io-connectors.md
+++ b/site2/docs/io-connectors.md
@@ -37,6 +37,14 @@ Pulsar has various source connectors, which are sorted alphabetically as below.
 
 * [Java class](https://github.com/apache/pulsar/blob/master/pulsar-io/debezium/postgres/src/main/java/org/apache/pulsar/io/debezium/postgres/DebeziumPostgresSource.java)
 
+### Debezium MongoDB
+
+* [Configuration](io-debezium-source.md#configuration)
+
+* [Example](io-debezium-source.md#example-of-mongodb)
+
+* [Java class](https://github.com/apache/pulsar/blob/master/pulsar-io/debezium/mongodb/src/main/java/org/apache/pulsar/io/debezium/mongodb/DebeziumMongoDbSource.java)
+
 
 ### File
 
@@ -120,7 +128,7 @@ Pulsar has various sink connectors, which are sorted alphabetically as below.
 
 ### HBase
 
-* [Configuration](io-hbase.md)
+* [Configuration](io-hbase-sink.md#configuration)
   
 * [Java class](https://github.com/apache/pulsar/blob/master/pulsar-io/hbase/src/main/java/org/apache/pulsar/io/hbase/HbaseAbstractConfig.java)
   
diff --git a/site2/docs/io-debezium-source.md b/site2/docs/io-debezium-source.md
index 7bdb1e9dc90e7..29526e4e2ca7e 100644
--- a/site2/docs/io-debezium-source.md
+++ b/site2/docs/io-debezium-source.md
@@ -4,11 +4,12 @@ title: Debezium source onnector
 sidebar_label: Debezium source connector
 ---
 
-The Debezium source connector pulls messages from MySQL or PostgreSQL to Pulsar topics.
+The Debezium source connector pulls messages from MySQL or PostgreSQL 
+and persists the messages to Pulsar topics.
 
 ## Configuration 
 
-The configuration of the Debezium source connector has the following properties.
+The configuration of Debezium source connector has the following properties.
 
 | Name | Required | Default | Description |
 |------|----------|---------|-------------|
@@ -27,6 +28,16 @@ The configuration of the Debezium source connector has the following properties.
 | `database.history.pulsar.service.url` | true | null | Pulsar cluster service URL for history topic. |
 | `pulsar.service.url` | true | null | Pulsar cluster service URL. |
 | `offset.storage.topic` | true | null | Record the last committed offsets that the connector successfully completes. |
+### MongoDB Configuration
+| Name | Required | Default | Description |
+|------|----------|---------|-------------|
+| `mongodb.hosts` | true | null | The comma-separated list of hostname and port pairs (in the form 'host' or 'host:port') of the MongoDB servers in the replica set. The list contains a single hostname and a port pair. If mongodb.members.auto.discover is set to false, the host and port pair are prefixed with the replica set name (e.g., rs0/localhost:27017). |
+| `mongodb.name` | true | null | A unique name that identifies the connector and/or MongoDB replica set or shared cluster that this connector monitors. Each server should be monitored by at most one Debezium connector, since this server name prefixes all persisted Kafka topics emanating from the MongoDB replica set or cluster. |
+| `mongodb.user` | true | null | Name of the database user to be used when connecting to MongoDB. This is required only when MongoDB is configured to use authentication. |
+| `mongodb.password` | true | null | Password to be used when connecting to MongoDB. This is required only when MongoDB is configured to use authentication. |
+| `mongodb.task.id` | true | null | The taskId of the MongoDB connector that attempts to use a separate task for each replica set. |
+
+
 
 ## Example of MySQL
 
@@ -270,7 +281,7 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
     $ docker exec -it pulsar-postgresql /bin/bash
     ```
 
-6. A MySQL client pops out. 
+6. A PostgreSQL client pops out. 
    
    Use the following commands to change the data of the table _products_.
 
@@ -304,7 +315,124 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
     ----- got message -----
     {"schema":{"type":"struct","fields":[{"type":"int32","optional":false,"field":"id"}],"optional":false,"name":"dbserver1.inventory.products.Key"},"payload":{"id":107}}�{"schema":{"type":"struct","fields":[{"type":"struct","fields":[{"type":"int32","optional":false,"field":"id"},{"type":"string","optional":false,"field":"name"},{"type":"string","optional":true,"field":"description"},{"type":"double","optional":true,"field":"weight"}],"optional":true,"name":"dbserver1.inventory.products.Value","field":"before"},{"type":"struct","fields":[{"type":"int32","optional":false,"field":"id"},{"type":"string","optional":false,"field":"name"},{"type":"string","optional":true,"field":"description"},{"type":"double","optional":true,"field":"weight"}],"optional":true,"name":"dbserver1.inventory.products.Value","field":"after"},{"type":"struct","fields":[{"type":"string","optional":true,"field":"version"},{"type":"string","optional":true,"field":"connector"},{"type":"string","optional":false,"field":"name"},{"type":"string","optional":false,"field":"db"},{"type":"int64","optional":true,"field":"ts_usec"},{"type":"int64","optional":true,"field":"txId"},{"type":"int64","optional":true,"field":"lsn"},{"type":"string","optional":true,"field":"schema"},{"type":"string","optional":true,"field":"table"},{"type":"boolean","optional":true,"default":false,"field":"snapshot"},{"type":"boolean","optional":true,"field":"last_snapshot_record"}],"optional":false,"name":"io.debezium.connector.postgresql.Source","field":"source"},{"type":"string","optional":false,"field":"op"},{"type":"int64","optional":true,"field":"ts_ms"}],"optional":false,"name":"dbserver1.inventory.products.Envelope"},"payload":{"before":{"id":107,"name":"rocks","description":"box of assorted rocks","weight":5.3},"after":{"id":107,"name":"1111111111","description":"box of assorted rocks","weight":5.3},"source":{"version":"0.9.2.Final","connector":"postgresql","name":"dbserver1","db":"postgres","ts_usec":1559208957661080,"txId":577,"lsn":23862872,"schema":"inventory","table":"products","snapshot":false,"last_snapshot_record":null},"op":"u","ts_ms":1559208957692}}
     ```
+## Example of MongoDB
+
+You need to create a configuration file before using the Pulsar Debezium connector.
+
+* JSON 
+
+    ```json
+    {
+        "mongodb.hosts": "rs0/mongodb:27017",
+        "mongodb.name": "dbserver1",
+        "mongodb.user": "debezium",
+        "mongodb.password": "dbz",
+        "mongodb.task.id": "1",
+        "database.whitelist": "inventory",
+        "pulsar.service.url": "pulsar://127.0.0.1:6650"
+    }
+    ```
+
+* YAML 
+
+    You can create a `debezium-mongodb-source-config.yaml` file and copy the [contents](https://github.com/apache/pulsar/blob/master/pulsar-io/debezium/mongodb/src/main/resources/debezium-mongodb-source-config.yaml) below to the `debezium-mongodb-source-config.yaml` file.
+
+    ```yaml
+    tenant: "public"
+    namespace: "default"
+    name: "debezium-mongodb-source"
+    topicName: "debezium-mongodb-topic"
+    archive: "connectors/pulsar-io-debezium-mongodb-{{pulsar:version}}.nar"
+    parallelism: 1
+
+    configs:
+
+        ## config for pg, docker image: debezium/example-mongodb:0.10
+        mongodb.hosts: "rs0/mongodb:27017",
+        mongodb.name: "dbserver1",
+        mongodb.user: "debezium",
+        mongodb.password: "dbz",
+        mongodb.task.id: "1",
+        database.whitelist: "inventory",
+
+        ## PULSAR_SERVICE_URL_CONFIG
+        pulsar.service.url: "pulsar://127.0.0.1:6650"
+    ```
+
+### Usage
+
+This example shows how to change the data of a MongoDB table using the Pulsar Debezium connector.
+
+
+1. Start a MongoDB server with a database from which Debezium can capture changes.
+
+    ```bash
+    $ docker pull debezium/example-mongodb:0.10
+    $ docker run -d -it --rm --name pulsar-mongodb -e MONGODB_USER=mongodb -e MONGODB_PASSWORD=mongodb -p 27017:27017  debezium/example-mongodb:0.10
+    ```
+     Use the following commands to initialize the data.
+    
+     ``` bash
+     ./usr/local/bin/init-inventory.sh
+     ```
+     If the local host cannot access the container network, you can update the file ```/etc/hosts``` and add a rule ```127.0.0.1 6 f114527a95f```. f114527a95f is container id, you can try to get by ```docker ps -a```
+
+
+2. Start a Pulsar service locally in standalone mode.
+
+    ```bash
+    $ bin/pulsar standalone
+    ```
+
+3. Start the Pulsar Debezium connector in local run mode using one of the following methods.
+
+   * Use the **JSON** configuration file as shown previously. 
+     
+     Make sure the nar file is available at `connectors/pulsar-io-mongodb-{{pulsar:version}}.nar`.
+
+        ```bash
+        $ bin/pulsar-admin source localrun \
+        --archive connectors/pulsar-io-debezium-mongodb-{{pulsar:version}}.nar \
+        --name debezium-mongodb-source \
+        --destination-topic-name debezium-mongodb-topic \
+        --tenant public \
+        --namespace default \
+        --source-config '{"mongodb.hosts": "rs0/mongodb:27017","mongodb.name": "dbserver1","mongodb.user": "debezium","mongodb.password": "dbz","mongodb.task.id": "1","database.whitelist": "inventory","pulsar.service.url": "pulsar://127.0.0.1:6650"}'
+        ```
+   
+   * Use the **YAML** configuration file as shown previously.
+      
+        ```bash
+        $ bin/pulsar-admin source localrun  \
+        --source-config-file debezium-mongodb-source-config.yaml
+        ```
+
+4. Subscribe the topic _sub-products_ for the _inventory.products_ table.
+
+    ```
+    $ bin/pulsar-client consume -s "sub-products" public/default/dbserver1.inventory.products -n 0
+    ```
+
+5. Start a MongoDB client in docker.
+   
+    ```bash
+    $ docker exec -it pulsar-mongodb /bin/bash
+    ```
 
+6. A MongoDB client pops out. 
+   
+    ```bash
+    mongo -u debezium -p dbz --authenticationDatabase admin localhost:27017/inventory
+    db.products.update({"_id":NumberLong(104)},{$set:{weight:1.25}})
+    ```
+
+    In the terminal window of subscribing topic, you can receive the following messages.
+        
+    ```bash
+    ----- got message -----
+    {"schema":{"type":"struct","fields":[{"type":"string","optional":false,"field":"id"}],"optional":false,"name":"dbserver1.inventory.products.Key"},"payload":{"id":"104"}}, value = {"schema":{"type":"struct","fields":[{"type":"string","optional":true,"name":"io.debezium.data.Json","version":1,"field":"after"},{"type":"string","optional":true,"name":"io.debezium.data.Json","version":1,"field":"patch"},{"type":"struct","fields":[{"type":"string","optional":false,"field":"version"},{"type":"string","optional":false,"field":"connector"},{"type":"string","optional":false,"field":"name"},{"type":"int64","optional":false,"field":"ts_ms"},{"type":"string","optional":true,"name":"io.debezium.data.Enum","version":1,"parameters":{"allowed":"true,last,false"},"default":"false","field":"snapshot"},{"type":"string","optional":false,"field":"db"},{"type":"string","optional":false,"field":"rs"},{"type":"string","optional":false,"field":"collection"},{"type":"int32","optional":false,"field":"ord"},{"type":"int64","optional":true,"field":"h"}],"optional":false,"name":"io.debezium.connector.mongo.Source","field":"source"},{"type":"string","optional":true,"field":"op"},{"type":"int64","optional":true,"field":"ts_ms"}],"optional":false,"name":"dbserver1.inventory.products.Envelope"},"payload":{"after":"{\"_id\": {\"$numberLong\": \"104\"},\"name\": \"hammer\",\"description\": \"12oz carpenter's hammer\",\"weight\": 1.25,\"quantity\": 4}","patch":null,"source":{"version":"0.10.0.Final","connector":"mongodb","name":"dbserver1","ts_ms":1573541905000,"snapshot":"true","db":"inventory","rs":"rs0","collection":"products","ord":1,"h":4983083486544392763},"op":"r","ts_ms":1573541909761}}.
+    ```
+   
 ## FAQ
  
 ### Debezium postgres connector will hang when create snap
diff --git a/site2/docs/io-develop.md b/site2/docs/io-develop.md
index 27aa6770f0bf6..9c082d12f3c44 100644
--- a/site2/docs/io-develop.md
+++ b/site2/docs/io-develop.md
@@ -24,9 +24,9 @@ You can develop Pulsar source connectors and sink connectors.
 ### Source
 
 Developing a source connector is to implement the {@inject: github:`Source`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java}
-interface, which means you need to implement the {@inject: github:`open`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java#L33} method and the {@inject: github:`record`:/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java#L28} method.
+interface, which means you need to implement the {@inject: github:`open`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java} method and the {@inject: github:`read`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java} method.
 
-1. Implement the {@inject: github:`open`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java#L33} method. 
+1. Implement the {@inject: github:`open`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java} method. 
 
     ```java
     /**
@@ -48,7 +48,7 @@ interface, which means you need to implement the {@inject: github:`open`:/pulsar
     Besides, Pulsar runtime also provides a `SourceContext` for the 
     connector to access runtime resources for tasks like collecting metrics. The implementation can save the `SourceContext` for future use.
 
-2. Implement the {@inject: github:`read`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java#L41} method.
+2. Implement the {@inject: github:`read`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java} method.
 
     ```java
         /**
@@ -62,9 +62,9 @@ interface, which means you need to implement the {@inject: github:`open`:/pulsar
 
     If nothing to return, the implementation should be blocking rather than returning `null`. 
 
-    The returned {@inject: github:`Record`:/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java#L28} should encapsulate the following information, which is needed by Pulsar IO runtime. 
+    The returned {@inject: github:`Record`:/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java} should encapsulate the following information, which is needed by Pulsar IO runtime. 
 
-    * {@inject: github:`Record`:/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java#L28} should provide the following variables:
+    * {@inject: github:`Record`:/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java} should provide the following variables:
 
       |Variable|Required|Description
       |---|---|---
@@ -78,7 +78,7 @@ interface, which means you need to implement the {@inject: github:`open`:/pulsar
       `DestinationTopic`|No|Topic to which message should be written.
       `Message`|No|A class which carries data sent by users.<br/><br/>For more information, see [Message.java](https://github.com/apache/pulsar/blob/master/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Message.java).|
 
-     * {@inject: github:`Record`:/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java#L28} should provide the following methods:
+     * {@inject: github:`Record`:/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java} should provide the following methods:
 
         Method|Description
         |---|---
@@ -91,9 +91,9 @@ interface, which means you need to implement the {@inject: github:`open`:/pulsar
 
 ### Sink
 
-Developing a sink connector **is similar to** developing a source connector, that is, you need to implement the {@inject: github:`Sink`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} interface, which means implementing the {@inject: github:`open`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java#L36} method and the {@inject: github:`write`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java#L44} method.
+Developing a sink connector **is similar to** developing a source connector, that is, you need to implement the {@inject: github:`Sink`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} interface, which means implementing the {@inject: github:`open`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} method and the {@inject: github:`write`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} method.
 
-1. Implement the {@inject: github:`open`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java#L36} method.
+1. Implement the {@inject: github:`open`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} method.
 
     ```java
         /**
@@ -106,7 +106,7 @@ Developing a sink connector **is similar to** developing a source connector, tha
         void open(final Map<String, Object> config, SinkContext sinkContext) throws Exception;
     ```
 
-2. Implement the {@inject: github:`write`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java#L44} method.
+2. Implement the {@inject: github:`write`:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} method.
 
     ```java
         /**
@@ -196,7 +196,7 @@ All you need to do is to include this [nifi-nar-maven-plugin](https://mvnreposit
 
 > #### Tip
 > 
-> For more information about an **how to use NAR for Pulsar connectors**, see {@inject: github:`TwitterFirehose`:/pulsar-io/twitter/pom.xml#L79}.
+> For more information about an **how to use NAR for Pulsar connectors**, see {@inject: github:`TwitterFirehose`:/pulsar-io/twitter/pom.xml}.
 
 ### Uber JAR
 
diff --git a/site2/docs/io-elasticsearch-sink.md b/site2/docs/io-elasticsearch-sink.md
index d3312e5d82e47..a7c4d4cf762cc 100644
--- a/site2/docs/io-elasticsearch-sink.md
+++ b/site2/docs/io-elasticsearch-sink.md
@@ -16,21 +16,26 @@ The configuration of the ElasticSearch sink connector has the following properti
 |------|----------|----------|---------|-------------|
 | `elasticSearchUrl` | String| true |" " (empty string)| The URL of elastic search cluster to which the connector connects. |
 | `indexName` | String| true |" " (empty string)| The index name to which the connector writes messages. |
+| `typeName` | String | false | "_doc" | The type name to which the connector writes messages to. <br><br> The value should be set explicitly to a valid type name other than "_doc" for Elasticsearch version before 6.2, and left to default otherwise. |
 | `indexNumberOfShards` | int| false |1| The number of shards of the index. |
 | `indexNumberOfReplicas` | int| false |1 | The number of replicas of the index. |
 | `username` | String| false |" " (empty string)| The username used by the connector to connect to the elastic search cluster. <br><br>If `username` is set, then `password` should also be provided. |
 | `password` | String| false | " " (empty string)|The password used by the connector to connect to the elastic search cluster. <br><br>If `username` is set, then `password` should also be provided.  |
 
-### Example
+## Example
 
 Before using the ElasticSearch sink connector, you need to create a configuration file through one of the following methods.
 
+### Configuration
+
+#### For Elasticsearch After 6.2
+
 * JSON 
 
     ```json
     {
-        "elasticSearchUrl": "http://localhost:90902",
-        "indexName": "myIndex",
+        "elasticSearchUrl": "http://localhost:9200",
+        "indexName": "my_index",
         "username": "scooby",
         "password": "doobie"
     }
@@ -40,10 +45,95 @@ Before using the ElasticSearch sink connector, you need to create a configuratio
 
     ```yaml
     configs:
-        elasticSearchUrl: "http://localhost:90902"
-        indexName: "myIndex"
+        elasticSearchUrl: "http://localhost:9200"
+        indexName: "my_index"
         username: "scooby"
         password: "doobie"
     ```
 
+#### For Elasticsearch Before 6.2
+
+* JSON 
+
+    ```json
+    {
+        "elasticSearchUrl": "http://localhost:9200",
+        "indexName": "my_index",
+        "typeName": "doc",
+        "username": "scooby",
+        "password": "doobie"
+    }
+    ```
+
+* YAML
+
+    ```yaml
+    configs:
+        elasticSearchUrl: "http://localhost:9200"
+        indexName: "my_index"
+        typeName: "doc"
+        username: "scooby"
+        password: "doobie"
+    ```
+
+### Usage
+
+1. Start a single node Elasticsearch cluster.
+
+    ```bash
+    $ docker run -p 9200:9200 -p 9300:9300 \
+        -e "discovery.type=single-node" \
+        docker.elastic.co/elasticsearch/elasticsearch:7.5.1
+    ```
+
+2. Start a Pulsar service locally in standalone mode.
+    ```bash
+    $ bin/pulsar standalone
+    ```
+    Make sure the nar file is available at `connectors/pulsar-io-elastic-search-{{pulsar:version}}.nar`.
+
+3. Start the Pulsar Elasticsearch connector in local run mode using one of the following methods.
+    * Use the **JSON** configuration as shown previously. 
+        ```bash
+        $ bin/pulsar-admin sinks localrun \
+            --archive connectors/pulsar-io-elastic-search-{{pulsar:version}}.nar \
+            --tenant public \
+            --namespace default \
+            --name elasticsearch-test-sink \
+            --sink-type elastic_search \
+            --sink-config '{"elasticSearchUrl":"http://localhost:9200","indexName": "my_index","username": "scooby","password": "doobie"}' \
+            --inputs elasticsearch_test
+        ```
+    * Use the **YAML** configuration file as shown previously.
+    
+        ```bash
+        $ bin/pulsar-admin sinks localrun \
+            --archive connectors/pulsar-io-elastic-search-{{pulsar:version}}.nar \
+            --tenant public \
+            --namespace default \
+            --name elasticsearch-test-sink \
+            --sink-type elastic_search \
+            --sink-config-file elasticsearch-sink.yml \
+            --inputs elasticsearch_test
+        ```
+
+4. Publish records to the topic.
+
+    ```bash
+    $ bin/pulsar-client produce elasticsearch_test --messages "{\"a\":1}"
+    ```
 
+5. Check documents in Elasticsearch.
+    
+    * refresh the index
+        ```bash
+            $ curl -s http://localhost:9200/my_index/_refresh
+        ``` 
+    * search documents
+        ```bash
+            $ curl -s http://localhost:9200/my_index/_search
+        ```
+        You can see the record that published earlier has been successfully written into Elasticsearch.
+        ```json
+        {"took":2,"timed_out":false,"_shards":{"total":1,"successful":1,"skipped":0,"failed":0},"hits":{"total":{"value":1,"relation":"eq"},"max_score":1.0,"hits":[{"_index":"my_index","_type":"_doc","_id":"FSxemm8BLjG_iC0EeTYJ","_score":1.0,"_source":{"a":1}}]}}
+        ```
diff --git a/site2/docs/io-hbase-sink.md b/site2/docs/io-hbase-sink.md
index 4e30f0807b574..0e0a996971416 100644
--- a/site2/docs/io-hbase-sink.md
+++ b/site2/docs/io-hbase-sink.md
@@ -14,7 +14,7 @@ The configuration of the HBase sink connector has the following properties.
 ### Property
 
 | Name | Type|Default | Required | Description |
-|------|---------|----------|-------------|
+|------|---------|----------|-------------|---
 | `hbaseConfigResources` | String|None | false | HBase system configuration `hbase-site.xml` file. |
 | `zookeeperQuorum` | String|None | true | HBase system configuration about `hbase.zookeeper.quorum` value. |
 | `zookeeperClientPort` | String|2181 | false | HBase system configuration about `hbase.zookeeper.property.clientPort` value. |
diff --git a/site2/docs/io-kafka-sink.md b/site2/docs/io-kafka-sink.md
index c8838fe343687..d5f46c7cea399 100644
--- a/site2/docs/io-kafka-sink.md
+++ b/site2/docs/io-kafka-sink.md
@@ -18,7 +18,7 @@ The configuration of the Kafka sink connector has the following parameters.
 | Name | Type| Required | Default | Description 
 |------|----------|---------|-------------|-------------|
 |  `bootstrapServers` |String| true | " " (empty string) | A comma-separated list of host and port pairs for establishing the initial connection to the Kafka cluster. |
-|`ack`|String|true|" " (empty string) |The number of acknowledgments that the producer requires the leader to receive before a request completes. <br/>This controls the durability of the sent records.
+|`acks`|String|true|" " (empty string) |The number of acknowledgments that the producer requires the leader to receive before a request completes. <br/>This controls the durability of the sent records.
 |`batchsize`|long|false|16384L|The batch size that a Kafka producer attempts to batch records together before sending them to brokers.
 |`maxRequestSize`|long|false|1048576L|The maximum size of a Kafka request in bytes.
 |`topic`|String|true|" " (empty string) |The Kafka topic which receives messages from Pulsar.
diff --git a/site2/docs/io-quickstart.md b/site2/docs/io-quickstart.md
index 6fe87b03ed05d..f34a1374d436d 100644
--- a/site2/docs/io-quickstart.md
+++ b/site2/docs/io-quickstart.md
@@ -25,7 +25,7 @@ At the end of this tutorial, you are able to:
 
 Before connecting Pulsar to a database, you need to install Pulsar and the desired built-in connector.
 
-For more information about **how to install a standalone Pulsar and built-in connectors**, see [here](standalone/#installing-pulsar).
+For more information about **how to install a standalone Pulsar and built-in connectors**, see [here](getting-started-standalone.md/#installing-pulsar).
 
 ## Start Pulsar standalone 
 
@@ -52,7 +52,7 @@ For more information about **how to install a standalone Pulsar and built-in con
     ```
 
     **Example output**
-    ```shell
+    ```json
     [{"workerId":"c-standalone-fw-localhost-6750","workerHostname":"localhost","port":6750}]
     ```
 
@@ -62,8 +62,8 @@ For more information about **how to install a standalone Pulsar and built-in con
     curl -s http://localhost:8080/admin/v2/namespaces/public
     ```
 
-    **Example outoupt**
-    ```shell
+    **Example output**
+    ```json
     ["public/default","public/functions"]
     ```
 
@@ -184,7 +184,7 @@ You can create a configuration file through one of the following methods.
 
 * YAML
   
-    ```
+    ```yaml
     configs:
         roots: "localhost:9042"
         keyspace: "pulsar_test_keyspace"
@@ -233,7 +233,7 @@ to monitor a connector and perform other operations on it.
 
   **Example output**
 
-  ```bash
+  ```json
   {
     "tenant": "public",
     "namespace": "default",
@@ -270,7 +270,7 @@ to monitor a connector and perform other operations on it.
 
   **Example output**
 
-  ```shell
+  ```json
   {
     "numInstances" : 1,
     "numRunning" : 1,
@@ -314,7 +314,7 @@ to monitor a connector and perform other operations on it.
 
     **Example output**
 
-    ```shell
+    ```json
     {
       "numInstances" : 1,
       "numRunning" : 1,
@@ -482,7 +482,7 @@ In this section, you need to configure a JDBC sink connector.
 
     Create a _pulsar-mysql-jdbc-sink.yaml_ file, copy the following contents to this file, and place the file in the `pulsar/connectors` folder.
 
-    ```bash
+    ```yaml
     configs:
       userName: "root"
       password: "jdbc"
@@ -494,7 +494,7 @@ In this section, you need to configure a JDBC sink connector.
 
     Create a _avro-schema_ file, copy the following contents to this file, and place the file in the `pulsar/connectors` folder.
 
-    ```bash
+    ```json
     {
       "type": "AVRO",
       "schema": "{\"type\":\"record\",\"name\":\"Test\",\"fields\":[{\"name\":\"id\",\"type\":[\"null\",\"int\"]},{\"name\":\"name\",\"type\":[\"null\",\"string\"]}]}",
@@ -523,7 +523,7 @@ In this section, you need to configure a JDBC sink connector.
 
     The schema has been uploaded successfully if the following message appears.
 
-    ```bash
+    ```json
     {"name":"pulsar-mysql-jdbc-sink-topic","schema":"{\"type\":\"record\",\"name\":\"Test\",\"fields\":[{\"name\":\"id\",\"type\":[\"null\",\"int\"]},{\"name\":\"name\",\"type\":[\"null\",\"string\"]}]}","type":"AVRO","properties":{}}
     ```
 
@@ -586,7 +586,7 @@ to monitor a connector and perform other operations on it.
 
   The result shows that only the _mysql-jdbc-sink_ sink is running.
 
-  ```bash
+  ```json
   [
   "pulsar-mysql-jdbc-sink"
   ]
@@ -607,7 +607,7 @@ to monitor a connector and perform other operations on it.
 
   The result shows the information of the sink connector, including tenant, namespace, topic and so on.
 
-  ```bash
+  ```json
   {
     "tenant": "public",
     "namespace": "default",
@@ -646,7 +646,7 @@ to monitor a connector and perform other operations on it.
 
   The result shows the current status of sink connector, including the number of instance, running status, worker ID and so on.
 
-  ```bash
+  ```json
   {
     "numInstances" : 1,
     "numRunning" : 1,
@@ -757,7 +757,7 @@ $ bin/pulsar-admin sinks get \
 
 The result shows that the parallelism is 2.
 
-```text
+```json
 {
   "tenant": "public",
   "namespace": "default",
@@ -788,7 +788,7 @@ to delete a connector and perform other operations on it.
 
 This example deletes the _pulsar-mysql-jdbc-sink_ sink connector.
 
-```text
+```bash
 $ bin/pulsar-admin sinks delete \
 --tenant public \
 --namespace default \
@@ -807,7 +807,7 @@ The sink connector has been deleted successfully if the following message appear
 
 This example double-checks the status of the sink connector.
 
-```text
+```bash
 $ bin/pulsar-admin sinks get \
 --tenant public \
 --namespace default \
diff --git a/site2/docs/io-use.md b/site2/docs/io-use.md
index 4cbf69d61ba30..c623f337e691c 100644
--- a/site2/docs/io-use.md
+++ b/site2/docs/io-use.md
@@ -118,7 +118,7 @@ Use the `reload` subcommand.
 $ pulsar-admin sources reload
 ```
 
-For more information, see [`here`](reference-connector-admin/#reload).
+For more information, see [`here`](io-cli/#reload).
 
 #### Sink
 
@@ -128,7 +128,7 @@ Use the `reload` subcommand.
 $ pulsar-admin sinks reload
 ```
 
-For more information, see [`here`](reference-connector-admin/#reload-1).
+For more information, see [`here`](io-cli/#reload-1).
 
 ### `available`
 
@@ -178,7 +178,7 @@ Use the `create` subcommand.
 $ pulsar-admin sources create options
 ```
 
-For more information, see [here](reference-connector-admin.md#create).
+For more information, see [here](io-cli.md#create).
 
 <!--REST API-->
 
@@ -255,7 +255,7 @@ Use the `create` subcommand.
 $ pulsar-admin sinks create options
 ```
 
-For more information, see [here](reference-connector-admin.md#create-1).
+For more information, see [here](io-cli.md#create-1).
 
 <!--REST API-->
 
@@ -336,7 +336,7 @@ Use the `start` subcommand.
 $ pulsar-admin sources start options
 ```
 
-For more information, see [here](reference-connector-admin.md#start).
+For more information, see [here](io-cli.md#start).
 
 <!--REST API-->
 
@@ -364,7 +364,7 @@ Use the `start` subcommand.
 $ pulsar-admin sinks start options
 ```
 
-For more information, see [here](reference-connector-admin.md#start-1).
+For more information, see [here](io-cli.md#start-1).
 
 <!--REST API-->
 
@@ -396,7 +396,7 @@ Use the `localrun` subcommand.
 $ pulsar-admin sources localrun options
 ```
 
-For more information, see [here](reference-connector-admin.md#localrun).
+For more information, see [here](io-cli.md#localrun).
 
 <!--END_DOCUSAURUS_CODE_TABS-->
 
@@ -414,7 +414,7 @@ Use the `localrun` subcommand.
 $ pulsar-admin sinks localrun options
 ```
 
-For more information, see [here](reference-connector-admin.md#localrun-1).
+For more information, see [here](io-cli.md#localrun-1).
 
 <!--END_DOCUSAURUS_CODE_TABS-->
 
@@ -446,7 +446,7 @@ Use the `get` subcommand.
 $ pulsar-admin sources get options
 ```
 
-For more information, see [here](reference-connector-admin.md#get).
+For more information, see [here](io-cli.md#get).
 
 <!--REST API-->
 
@@ -543,7 +543,7 @@ Use the `get` subcommand.
 $ pulsar-admin sinks get options
 ```
 
-For more information, see [here](reference-connector-admin.md#get-1).
+For more information, see [here](io-cli.md#get-1).
 
 <!--REST API-->
 
@@ -637,7 +637,7 @@ Use the `list` subcommand.
 $ pulsar-admin sources list options
 ```
 
-For more information, see [here](reference-connector-admin.md#list).
+For more information, see [here](io-cli.md#list).
 
 <!--REST API-->
 
@@ -682,7 +682,7 @@ Use the `list` subcommand.
 $ pulsar-admin sinks list options
 ```
 
-For more information, see [here](reference-connector-admin.md#list-1).
+For more information, see [here](io-cli.md#list-1).
 
 <!--REST API-->
 
@@ -731,7 +731,7 @@ Use the `status` subcommand.
 $ pulsar-admin sources status options
 ```
 
-For more information, see [here](reference-connector-admin.md#status).
+For more information, see [here](io-cli.md#status).
 
 <!--REST API-->
 
@@ -813,7 +813,7 @@ Use the `status` subcommand.
 $ pulsar-admin sinks status options
 ```
 
-For more information, see [here](reference-connector-admin.md#status-1).
+For more information, see [here](io-cli.md#status-1).
 
 <!--REST API-->
 
@@ -901,7 +901,7 @@ Use the `update` subcommand.
 $ pulsar-admin sources update options
 ```
 
-For more information, see [here](reference-connector-admin.md#update).
+For more information, see [here](io-cli.md#update).
 
 <!--REST API-->
 
@@ -982,7 +982,7 @@ Use the `update` subcommand.
 $ pulsar-admin sinks update options
 ```
 
-For more information, see [here](reference-connector-admin.md#update-1).
+For more information, see [here](io-cli.md#update-1).
 
 <!--REST API-->
 
@@ -1069,7 +1069,7 @@ Use the `stop` subcommand.
 $ pulsar-admin sources stop options
 ```
 
-For more information, see [here](reference-connector-admin.md#stop).
+For more information, see [here](io-cli.md#stop).
 
 <!--REST API-->
 
@@ -1151,7 +1151,7 @@ Use the `stop` subcommand.
 $ pulsar-admin sinks stop options
 ```
 
-For more information, see [here](reference-connector-admin.md#stop-1).
+For more information, see [here](io-cli.md#stop-1).
 
 <!--REST API-->
 
@@ -1239,7 +1239,7 @@ Use the `restart` subcommand.
 $ pulsar-admin sources restart options
 ```
 
-For more information, see [here](reference-connector-admin.md#restart).
+For more information, see [here](io-cli.md#restart).
 
 <!--REST API-->
 
@@ -1321,7 +1321,7 @@ Use the `restart` subcommand.
 $ pulsar-admin sinks restart options
 ```
 
-For more information, see [here](reference-connector-admin.md#restart-1).
+For more information, see [here](io-cli.md#restart-1).
 
 <!--REST API-->
 
@@ -1409,7 +1409,7 @@ Use the `delete` subcommand.
 $ pulsar-admin sources delete options
 ```
 
-For more information, see [here](reference-connector-admin.md#delete).
+For more information, see [here](io-cli.md#delete).
 
 <!--REST API-->
 
@@ -1463,7 +1463,7 @@ Use the `delete` subcommand.
 $ pulsar-admin sinks delete options
 ```
 
-For more information, see [here](reference-connector-admin.md#delete-1).
+For more information, see [here](io-cli.md#delete-1).
 
 <!--REST API-->
 
diff --git a/site2/docs/reference-configuration.md b/site2/docs/reference-configuration.md
index 3f31893284d45..cdfe0d419a70d 100644
--- a/site2/docs/reference-configuration.md
+++ b/site2/docs/reference-configuration.md
@@ -11,7 +11,7 @@ sidebar_label: Pulsar configuration
 </style>
 
 
-Pulsar configuration can be managed either via a series of configuration files contained in the [`conf`](https://github.com/apache/pulsar/tree/master/conf) directory of a Pulsar [installation](getting-started-standalone.md)
+Pulsar configuration can be managed via a series of configuration files contained in the [`conf`](https://github.com/apache/pulsar/tree/master/conf) directory of a Pulsar [installation](getting-started-standalone.md)
 
 - [BookKeeper](#bookkeeper)
 - [Broker](#broker)
@@ -165,6 +165,7 @@ Pulsar brokers are responsible for handling incoming messages from producers, di
 |brokerClientAuthenticationPlugin|  Authentication settings of the broker itself. Used when the broker connects to other brokers, either in same or other clusters  ||
 |brokerClientAuthenticationParameters|||
 |athenzDomainNames| Supported Athenz provider domain names(comma separated) for authentication  ||
+|exposePreciseBacklogInPrometheus| Enable expose the precise backlog stats, set false to use published counter and consumed counter to calculate, this would be more efficient but may be inaccurate. |false|
 |bookkeeperClientAuthenticationPlugin|  Authentication plugin to use when connecting to bookies ||
 |bookkeeperClientAuthenticationParametersName|  BookKeeper auth plugin implementatation specifics parameters name and values  ||
 |bookkeeperClientAuthenticationParameters|||
@@ -225,6 +226,8 @@ Pulsar brokers are responsible for handling incoming messages from producers, di
 |defaultRetentionSizeInMB|  Default retention size  |0|
 |keepAliveIntervalSeconds|  How often to check whether the connections are still alive  |30|
 |loadManagerClassName|  Name of load manager to use |org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl|
+|supportedNamespaceBundleSplitAlgorithms| Supported algorithms name for namespace bundle split |[range_equally_divide,topic_count_equally_divide]|
+|defaultNamespaceBundleSplitAlgorithm| Default algorithm name for namespace bundle split |range_equally_divide|
 |managedLedgerOffloadDriver|  Driver to use to offload old data to long term storage (Possible values: S3)  ||
 |managedLedgerOffloadMaxThreads|  Maximum number of thread pool threads for ledger offloading |2|
 |managedLedgerUnackedRangesOpenCacheSetEnabled|  Use Open Range-Set to cache unacknowledged messages |true|
@@ -351,6 +354,7 @@ The [`pulsar-client`](reference-cli-tools.md#pulsar-client) CLI tool can be used
 |brokerClientAuthenticationPlugin|  The authentication settings of the broker itself. Used when the broker connects to other brokers either in the same cluster or from other clusters. ||
 |brokerClientAuthenticationParameters|  The parameters that go along with the plugin specified using brokerClientAuthenticationPlugin.  ||
 |athenzDomainNames| Supported Athenz authentication provider domain names as a comma-separated list.  ||
+|exposePreciseBacklogInPrometheus| Enable expose the precise backlog stats, set false to use published counter and consumed counter to calculate, this would be more efficient but may be inaccurate. |false|
 |bookkeeperClientAuthenticationPlugin|  Authentication plugin to be used when connecting to bookies (BookKeeper servers). ||
 |bookkeeperClientAuthenticationParametersName|  BookKeeper authentication plugin implementation parameters and values.  ||
 |bookkeeperClientAuthenticationParameters|  Parameters associated with the bookkeeperClientAuthenticationParametersName ||
diff --git a/site2/docs/reference-pulsar-admin.md b/site2/docs/reference-pulsar-admin.md
index af8c88b50ad69..c52f87bad31f3 100644
--- a/site2/docs/reference-pulsar-admin.md
+++ b/site2/docs/reference-pulsar-admin.md
@@ -860,6 +860,8 @@ Subcommands
 * `clear-backlog`
 * `unsubscribe`
 * `set-encryption-required`
+* `set-delayed-delivery`
+* `get-delayed-delivery`
 * `set-subscription-auth-mode`
 * `get-max-producers-per-topic`
 * `set-max-producers-per-topic`
@@ -867,6 +869,10 @@ Subcommands
 * `set-max-consumers-per-topic`
 * `get-max-consumers-per-subscription`
 * `set-max-consumers-per-subscription`
+* `get-max-unacked-messages-per-subscription`
+* `set-max-unacked-messages-per-subscription`
+* `get-max-unacked-messages-per-consumer`
+* `set-max-unacked-messages-per-consumer`
 * `get-compaction-threshold`
 * `set-compaction-threshold`
 * `get-offload-threshold`
@@ -876,6 +882,8 @@ Subcommands
 * `clear-offload-deletion-lag`
 * `get-schema-autoupdate-strategy`
 * `set-schema-autoupdate-strategy`
+* `set-offload-policies`
+* `get-offload-policies`
 
 
 ### `list`
@@ -1338,6 +1346,38 @@ Options
 |`-d`, `--disable`|Disable message encryption required|false|
 |`-e`, `--enable`|Enable message encryption required|false|
 
+### `set-delayed-delivery`
+Set the delayed delivery policy on a namespace
+
+Usage
+```bash
+$ pulsar-admin namespaces set-delayed-delivery tenant/namespace options
+```
+
+Options
+
+|Flag|Description|Default|
+|----|---|---|
+|`-d`, `--disable`|Disable delayed delivery messages|false|
+|`-e`, `--enable`|Enable delayed delivery messages|false|
+|`-t`, `--time`|The tick time for when retrying on delayed delivery messages|1s|
+
+
+### `get-delayed-delivery`
+Get the delayed delivery policy on a namespace
+
+Usage
+```bash
+$ pulsar-admin namespaces get-delayed-delivery-time tenant/namespace
+```
+
+Options
+
+|Flag|Description|Default|
+|----|---|---|
+|`-t`, `--time`|The tick time for when retrying on delayed delivery messages|1s|
+
+
 ### `set-subscription-auth-mode`
 Set subscription auth mode on a namespace
 
@@ -1414,6 +1454,50 @@ Options
 |----|---|---|
 |`-c`, `--max-consumers-per-subscription`|maxConsumersPerSubscription for a namespace|0|
 
+### `get-max-unacked-messages-per-subscription`
+Get maxUnackedMessagesPerSubscription for a namespace
+
+Usage
+```bash
+$ pulsar-admin namespaces get-max-unacked-messages-per-subscription tenant/namespace
+```
+
+### `set-max-unacked-messages-per-subscription`
+Set maxUnackedMessagesPerSubscription for a namespace
+
+Usage
+```bash
+$ pulsar-admin namespaces set-max-unacked-messages-per-subscription tenant/namespace options
+```
+
+Options
+
+|Flag|Description|Default|
+|----|---|---|
+|`-c`, `--max-unacked-messages-per-subscription`|maxUnackedMessagesPerSubscription for a namespace|-1|
+
+### `get-max-unacked-messages-per-consumer`
+Get maxUnackedMessagesPerConsumer for a namespace
+
+Usage
+```bash
+$ pulsar-admin namespaces get-max-unacked-messages-per-consumer tenant/namespace
+```
+
+### `set-max-unacked-messages-per-consumer`
+Set maxUnackedMessagesPerConsumer for a namespace
+
+Usage
+```bash
+$ pulsar-admin namespaces set-max-unacked-messages-per-consumer tenant/namespace options
+```
+
+Options
+
+|Flag|Description|Default|
+|----|---|---|
+|`-c`, `--max-unacked-messages-per-consumer`|maxUnackedMessagesPerConsumer for a namespace|-1|
+
 
 ### `get-compaction-threshold`
 Get compactionThreshold for a namespace
@@ -2210,3 +2294,28 @@ Options
 |`-t`, `--type`|The type of the schema (avro or json)||
 
 
+### `get-offload-policies`
+Get the offload policy for a namespace
+
+Usage
+```bash
+$ pulsar-admin namespaces get-offload-policies tenant/namespace
+```
+
+### `set-offload-policies`
+Set the offload policy for a namespace
+
+Usage
+```bash
+$ pulsar-admin namespaces set-offload-policies tenant/namespace
+```
+
+Options
+|Flag|Description|Default|
+|----|---|---|
+|`-d`, `--driver`|Driver to use to offload old data to long term storage,(Possible values: S3, aws-s3, google-cloud-storage)||
+|`-r`, `--region`|The long term storage region||
+|`-b`, `--bucket`|Bucket to place offloaded ledger into||
+|`-e`, `--endpoint`|Alternative endpoint to connect to||
+|`-mbs`, `--maxBlockSize`|Max block size|64MB|
+|`-rbs`, `--readBufferSize`|Read buffer size|1MB|
diff --git a/site2/docs/schema-get-started.md b/site2/docs/schema-get-started.md
index 68b7b6bfb3559..c94cd4aa0e534 100644
--- a/site2/docs/schema-get-started.md
+++ b/site2/docs/schema-get-started.md
@@ -82,7 +82,7 @@ Producer<User> producer = client.newProducer(JSONSchema.of(User.class))
         .topic(topic)
         .create();
 User user = new User(“Tom”, 28);
-producer.send(User);
+producer.send(user);
 ```
 
 ### Summary
diff --git a/site2/docs/schema-understand.md b/site2/docs/schema-understand.md
index d0859b8578589..86bacc9e3aca8 100644
--- a/site2/docs/schema-understand.md
+++ b/site2/docs/schema-understand.md
@@ -110,7 +110,7 @@ Possible properties might be the Git hash associated with the schema, an environ
 
 This is the `SchemaInfo` of a string.
 
-```text
+```json
 {
     "name": "test-string-schema",
     "type": "STRING",
@@ -171,15 +171,15 @@ This example demonstrates how to use a string schema.
 
 1. Create a producer with a string schema and send messages.
 
-    ```text
+    ```java
     Producer<String> producer = client.newProducer(Schema.STRING).create();
     producer.newMessage().value("Hello Pulsar!").send();
     ```
 
 2. Create a consumer with a string schema and receive messages.  
 
-    ```text
-    Consumer<String> consumer = client.newConsumer(Schema.STRING).create();
+    ```java
+    Consumer<String> consumer = client.newConsumer(Schema.STRING).subscribe();
     consumer.receive();
     ```
 
@@ -305,7 +305,7 @@ Pulsar gets the schema definition from the predefined `struct` using an Avro lib
 
 1. Create the _User_ class to define the messages sent to Pulsar topics.
 
-    ```text
+    ```java
     public class User {
         String name;
         int age;
@@ -314,15 +314,15 @@ Pulsar gets the schema definition from the predefined `struct` using an Avro lib
 
 2. Create a producer with a `struct` schema and send messages.
 
-    ```text
+    ```java
     Producer<User> producer = client.newProducer(Schema.AVRO(User.class)).create();
     producer.newMessage().value(User.builder().userName("pulsar-user").userId(1L).build()).send();
     ```
 
 3. Create a consumer with a `struct` schema and receive messages
 
-    ```text
-    Consumer<User> consumer = client.newConsumer(Schema.AVRO(User.class)).create();
+    ```java
+    Consumer<User> consumer = client.newConsumer(Schema.AVRO(User.class)).subscribe();
     User user = consumer.receive();
     ```
 
@@ -336,7 +336,7 @@ You can define the `struct` schema using the `GenericSchemaBuilder`, generate a
 
 1. Use `RecordSchemaBuilder` to build a schema.
 
-    ```text
+    ```java
     RecordSchemaBuilder recordSchemaBuilder = SchemaBuilder.record("schemaName");
     recordSchemaBuilder.field("intField").type(SchemaType.INT32);
     SchemaInfo schemaInfo = recordSchemaBuilder.build(SchemaType.AVRO);
@@ -346,7 +346,7 @@ You can define the `struct` schema using the `GenericSchemaBuilder`, generate a
 
 2. Use `RecordBuilder` to build the struct records.
 
-    ```text
+    ```java
     producer.newMessage().value(schema.newRecordBuilder()
                 .set("intField", 32)
                 .build()).send();
@@ -377,7 +377,7 @@ Suppose that:
    
 In this case, you can use `AUTO_PRODUCE` to verify whether the bytes produced by _K_ can be sent to _P_ or not.
 
-```text
+```java
 Produce<byte[]> pulsarProducer = client.newProducer(Schema.AUTO_PRODUCE())
     …
     .create();
@@ -405,14 +405,13 @@ Suppose that:
    
 In this case, you can use `AUTO_CONSUME` to verify whether the bytes produced by _P_ can be sent to MySQL or not.
 
-```text
+```java
 Consumer<GenericRecord> pulsarConsumer = client.newConsumer(Schema.AUTO_CONSUME())
     …
     .subscribe();
 
 Message<GenericRecord> msg = consumer.receive() ; 
 GenericRecord record = msg.getValue();
-…
 ```
 
 ## Schema version
@@ -431,7 +430,7 @@ The following example illustrates how the schema version works.
 
 Suppose that a Pulsar [Java client](client-libraries-java.md) created using the code below attempts to connect to Pulsar and begins to send messages:
 
-```text
+```java
 PulsarClient client = PulsarClient.builder()
         .serviceUrl("pulsar://localhost:6650")
         .build();
diff --git a/site2/tools/build-site.sh b/site2/tools/build-site.sh
index 3fe1f42f20240..cd09d2cc882ba 100755
--- a/site2/tools/build-site.sh
+++ b/site2/tools/build-site.sh
@@ -41,6 +41,9 @@ cp versioned_docs/version-2.5.0/io-overview.md translated_docs/ja/version-2.5.0/
 cp versioned_docs/version-2.4.2/functions-develop.md translated_docs/fr/version-2.4.2/functions-develop.md
 cp versioned_docs/version-2.5.0/functions-develop.md translated_docs/fr/version-2.5.0/functions-develop.md
 cp versioned_docs/version-2.5.0/io-overview.md translated_docs/fr/version-2.5.0/io-overview.md
+cp versioned_docs/version-2.4.2/functions-develop.md translated_docs/zh-TW/version-2.4.2/functions-develop.md
+cp versioned_docs/version-2.5.0/functions-develop.md translated_docs/zh-TW/version-2.5.0/functions-develop.md
+cp versioned_docs/version-2.5.0/io-overview.md translated_docs/zh-TW/version-2.5.0/io-overview.md
 
 yarn build
 
@@ -54,3 +57,4 @@ rm -rf ${ROOT_DIR}/generated-site/content
 mkdir -p ${ROOT_DIR}/generated-site/content
 cp -R ${ROOT_DIR}/generated-site/api ${ROOT_DIR}/generated-site/content
 cp -R ./build/pulsar/* ${ROOT_DIR}/generated-site/content
+cp -R ${ROOT_DIR}/generated-site/tools ${ROOT_DIR}/generated-site/content
diff --git a/site2/website/languages.js b/site2/website/languages.js
index 8629453f2cb6b..a5686f9b74e83 100644
--- a/site2/website/languages.js
+++ b/site2/website/languages.js
@@ -176,6 +176,14 @@ const languages = [
     name: '中文',
     tag: 'zh-CN',
   },
-  {enabled: false, name: '繁體中文', tag: 'zh-TW'},
+  {
+    enabled: true, 
+    name: '繁體中文', 
+    tag: 'zh-TW'
+  },
+  {
+    enabled: true, 
+    name: '한국어', 
+    tag: 'ko-KR'},
 ];
 module.exports = languages;
diff --git a/site2/website/pages/en/download.js b/site2/website/pages/en/download.js
index 42b7842746a49..003f7e849f8d8 100644
--- a/site2/website/pages/en/download.js
+++ b/site2/website/pages/en/download.js
@@ -251,12 +251,12 @@ class Download extends React.Component {
                             <tr key={info.version}>
                         <th>{info.version}</th>
                         <td>
-                        <a href={info.binArchiveUrl}>apache-pulsar-{info.version}-bin-tar.gz</a> &nbsp;
+                        <a href={info.binArchiveUrl}>apache-pulsar-{info.version}-bin.tar.gz</a> &nbsp;
                           (<a href={`${info.binArchiveUrl}.asc`}>asc</a>,&nbsp;
                           <a href={`${info.binArchiveUrl}.${sha}`}>{`${sha}`}</a>)
                           </td>
                           <td>
-                          <a href={info.srcArchiveUrl}>apache-pulsar-{info.version}-src-tar.gz</a>
+                          <a href={info.srcArchiveUrl}>apache-pulsar-{info.version}-src.tar.gz</a>
                               &nbsp;
                           (<a href={`${info.srcArchiveUrl}.asc`}>asc</a>,&nbsp;
                           <a href={`${info.srcArchiveUrl}.${sha}`}>{`${sha}`}</a>)
diff --git a/site2/website/pages/en/pulsar-admin-cli.js b/site2/website/pages/en/pulsar-admin-cli.js
new file mode 100644
index 0000000000000..42108c1f645d7
--- /dev/null
+++ b/site2/website/pages/en/pulsar-admin-cli.js
@@ -0,0 +1,23 @@
+const React = require('react');
+const CompLibrary = require('../../core/CompLibrary.js');
+
+const Container = CompLibrary.Container;
+const CWD = process.cwd();
+const releases = require(`${CWD}/releases.json`);
+
+class PulsarAdminCli extends React.Component {
+    render() {
+        const latestVersion = releases[0];
+        const url = "../js/getCliByVersion.js?latestVersion=" + latestVersion;
+        return (
+            <div className="pageContainer">
+            <Container className="mainContainer documentContainer postContainer" >
+            <span id="latestVersion" style={{display:'none'}}>{latestVersion}</span>
+            <script src={url}></script>
+            </Container>
+            </div>
+    );
+    }
+}
+
+module.exports = PulsarAdminCli;
diff --git a/site2/website/release-notes.md b/site2/website/release-notes.md
index 0143abca79fda..89cf365c73826 100644
--- a/site2/website/release-notes.md
+++ b/site2/website/release-notes.md
@@ -46,6 +46,7 @@
 - [CLI] Add a broker tool for operations of a specific broker [#5768](https://github.com/apache/pulsar/pull/5768)
 - [CLI] Validate topic name before creating partition/non partition topic via admin cli [#5148](https://github.com/apache/pulsar/pull/5148)
 - [CLI] Make PulsarClusterMetadataSetup idempotent [#5879](https://github.com/apache/pulsar/pull/5879)
+- [CLI] Allow for topic deletions with regex consumers [#5230](https://github.com/apache/pulsar/pull/5230)
 
 #### Stats & Monitoring 
 
@@ -207,7 +208,6 @@ https://github.com/apache/pulsar/releases/tag/v2.5.0
 * Close previous dispatcher when subscription type changes [#5288](https://github.com/apache/pulsar/pull/5288)
 * Improve error handling logic for effectively once [#5271](https://github.com/apache/pulsar/pull/5271)
 * Upgrade dependencies for security fixes [#5232](https://github.com/apache/pulsar/pull/5232)
-* Allow for topic deletions with regex consumers [#5230](https://github.com/apache/pulsar/pull/5230)
 * Ensure consumer background tasks are cancelled after subscribe failures [#5204](https://github.com/apache/pulsar/pull/5204)
 * Added missing enum value KeyShared on the python wrapper [#5196](https://github.com/apache/pulsar/pull/5196)
 * Make some member variables of Dispatcher volatile [#5193](https://github.com/apache/pulsar/pull/5193)
diff --git a/site2/website/scripts/replace.js b/site2/website/scripts/replace.js
index a701af7acf395..ac1a23b9b3b2f 100644
--- a/site2/website/scripts/replace.js
+++ b/site2/website/scripts/replace.js
@@ -85,6 +85,17 @@ function debDistUrl(version, type) {
   }
 }
 
+function clientVersionUrl(version, type) {
+  var versions = version.split('.')
+  var majorVersion = parseInt(versions[0])
+  var minorVersion = parseInt(versions[1])
+  if (majorVersion === 2 && minorVersion < 5) {
+    return `/api/` + type + `/` + version;
+  } else if (majorVersion === 2 && minorVersion >= 5) {
+    return `/api/` + type + `/` + version + `-SNAPSHOT`
+  }
+}
+
 function doReplace(options) {
   replace(options)
     .then(changes => {
@@ -122,7 +133,13 @@ const from = [
   /{{pulsar:dist_rpm:client-debuginfo}}/g,
   /{{pulsar:dist_rpm:client-devel}}/g,
   /{{pulsar:dist_deb:client}}/g,
-  /{{pulsar:dist_deb:client-devel}}/g
+  /{{pulsar:dist_deb:client-devel}}/g,
+
+  /\/api\/python/g,
+  /\/api\/cpp/g,
+  /\/api\/pulsar-functions/g,
+  /\/api\/client/g,
+  /\/api\/admin/g,
 ];
 
 const options = {
@@ -151,7 +168,13 @@ const options = {
     rpmDistUrl(`${latestVersion}`, "-debuginfo"),
     rpmDistUrl(`${latestVersion}`, "-devel"),
     debDistUrl(`${latestVersion}`, ""),
-    debDistUrl(`${latestVersion}`, "-dev")
+    debDistUrl(`${latestVersion}`, "-dev"),
+
+    clientVersionUrl(`${latestVersion}`, "python"),
+    clientVersionUrl(`${latestVersion}`, "cpp"),
+    clientVersionUrl(`${latestVersion}`, "pulsar-functions"),
+    clientVersionUrl(`${latestVersion}`, "client"),
+    clientVersionUrl(`${latestVersion}`, "admin")
   ],
   dry: false
 };
@@ -190,7 +213,12 @@ for (v of versions) {
       rpmDistUrl(`${v}`, "-debuginfo"),
       rpmDistUrl(`${v}`, "-devel"),
       debDistUrl(`${v}`, ""),
-      debDistUrl(`${v}`, "-dev")
+      debDistUrl(`${v}`, "-dev"),
+      clientVersionUrl(`${v}`, "python"),
+      clientVersionUrl(`${v}`, "cpp"),
+      clientVersionUrl(`${v}`, "pulsar-functions"),
+      clientVersionUrl(`${v}`, "client"),
+      clientVersionUrl(`${v}`, "admin")
     ],
     dry: false
   };
diff --git a/site2/website/sidebars.json b/site2/website/sidebars.json
index 6206ff1af7716..828f5ea155ab5 100644
--- a/site2/website/sidebars.json
+++ b/site2/website/sidebars.json
@@ -15,8 +15,7 @@
       "concepts-multi-tenancy",
       "concepts-authentication",
       "concepts-topic-compaction",
-      "concepts-tiered-storage",
-      "concepts-schema-registry"
+      "concepts-tiered-storage"
     ],
     "Pulsar Schema": [
       "schema-get-started",
@@ -64,7 +63,6 @@
     "Administration": [
       "administration-zk-bk",
       "administration-geo",
-      "administration-dashboard",
       "administration-pulsar-manager",
       "administration-stats",
       "administration-load-balance",
@@ -130,8 +128,6 @@
     "Reference": [
       "reference-terminology",
       "reference-cli-tools",
-      "pulsar-admin",
-      "reference-connector-admin",
       "reference-configuration",
       "reference-metrics"
     ]
diff --git a/site2/website/siteConfig.js b/site2/website/siteConfig.js
index f31394645b38f..1a646d52b311c 100644
--- a/site2/website/siteConfig.js
+++ b/site2/website/siteConfig.js
@@ -28,7 +28,7 @@ const createVariableInjectionPlugin = variables => {
       } else if (keyparts[0] == 'source') {
           return renderUrl(initializedPlugin, sourceApiUrl + "#", keyparts);
       } else if (keyparts[0] == 'sink') {
-          return renderUrl(initializedPlugin, sinkApiUrl + "#", keyparts);
+        return renderUrl(initializedPlugin, sinkApiUrl + "#", keyparts);
       } else {
         keyparts = key.split("|");
         // endpoint api: endpoint|<op>
@@ -105,6 +105,7 @@ const siteConfig = {
     {page: 'download', label: 'Download'},
     {doc: 'client-libraries', label: 'Clients'},
     {href: '#restapis', label: 'REST APIs'},
+    {href: '#cli', label: 'Cli'},
     {blog: true, label: 'Blog'},
     {href: '#community', label: 'Community'},
     {href: '#apache', label: 'Apache'},
diff --git a/site2/website/static/css/custom.css b/site2/website/static/css/custom.css
index 791a24ab1cab0..fe0bed9eda23b 100644
--- a/site2/website/static/css/custom.css
+++ b/site2/website/static/css/custom.css
@@ -64,6 +64,7 @@
 #community-dropdown.hide,
 #apache-dropdown.hide,
 #restapis-dropdown.hide,
+#cli-dropdown.hide,
 #languages-dropdown.hide {
   display: none;
 }
@@ -72,6 +73,7 @@
 #community-dropdown.visible,
 #apache-dropdown.visible,
 #restapis-dropdown.visible,
+#cli-dropdown.visible,
 #languages-dropdown.visible {
   display: flex;
 }
@@ -79,6 +81,7 @@
 #community-dropdown,
 #apache-dropdown,
 #restapis-dropdown,
+#cli-dropdown,
 #languages-dropdown {
   pointer-events: none;
   position: absolute;
@@ -88,6 +91,7 @@
 #community-dropdown-items,
 #apache-dropdown-items,
 #restapis-dropdown-items,
+#cli-dropdown-items,
 #languages-dropdown-items {
   background-color: white;
   display: flex;
diff --git a/site2/website/static/js/custom.js b/site2/website/static/js/custom.js
index 6b4ac94df0964..9ef83e5d55b9c 100644
--- a/site2/website/static/js/custom.js
+++ b/site2/website/static/js/custom.js
@@ -100,6 +100,31 @@ window.addEventListener('load', function() {
     }
   });
 
+  // setup cli menu items in nav bar
+  const cli = document.querySelector("a[href='#cli']").parentNode;
+  const cliMenu =
+      '<li>' +
+      '<a id="cli-menu" href="#">Cli <span style="font-size: 0.75em">&nbsp;▼</span></a>' +
+      '<div id="cli-dropdown" class="hide">' +
+      '<ul id="cli-dropdown-items">' +
+      '<li><a href="/pulsar-admin-cli?version=' + version + '">Pulsar Admin</a></li>' +
+      '</ul>' +
+      '</div>' +
+      '</li>';
+
+  cli.innerHTML = cliMenu;
+
+  const cliMenuItem = document.getElementById("cli-menu");
+  const cliDropDown = document.getElementById("cli-dropdown");
+  cliMenuItem.addEventListener("click", function(event) {
+    event.preventDefault();
+
+    if (cliDropDown.className == 'hide') {
+      cliDropDown.className = 'visible';
+    } else {
+      cliDropDown.className = 'hide';
+    }
+  });
 
   function button(label, ariaLabel, icon, className) {
     const btn = document.createElement('button');
diff --git a/site2/website/static/js/getCliByVersion.js b/site2/website/static/js/getCliByVersion.js
new file mode 100644
index 0000000000000..f817a91ba2580
--- /dev/null
+++ b/site2/website/static/js/getCliByVersion.js
@@ -0,0 +1,34 @@
+function getCliByVersion(){
+    var params = window.location.search
+    var latestVersion = document.getElementById("latestVersion").textContent
+    params = params.replace('?', '')
+    const paramsList = params.split('&')
+    var version = 'master'
+    for (var i in paramsList) {
+        var param = paramsList[i].split('=')
+        if (param[0] === 'version') {
+            version = param[1]
+        }
+    }
+
+    if (version === "master") {
+        var latestVersionSplit = latestVersion.split('.')
+        version = parseInt(latestVersionSplit[0]) + "." + (parseInt(latestVersionSplit[1]) + 1) + ".0"
+    }
+    var versions = version.split('.')
+    var majorVersion = parseInt(versions[0])
+    var minorVersion = parseInt(versions[1])
+    if ((majorVersion == 2 && minorVersion <= 5) || majorVersion === 1) {
+        if (version === latestVersion) {
+            window.location.href = "/docs/en/pulsar-admin"
+            return
+        } else {
+            window.location.href = "/docs/en/" + version + "/pulsar-admin"
+            return
+        }
+    } else {
+        window.location.href = "http://pulsar.apache.org/tools/pulsar-admin/" + version + "-SNAPSHOT"
+        return
+    }
+}
+window.onload=getCliByVersion
diff --git a/site2/website/static/swagger/2.5.0/swagger.json b/site2/website/static/swagger/2.5.0/swagger.json
new file mode 100644
index 0000000000000..e5269497b3783
--- /dev/null
+++ b/site2/website/static/swagger/2.5.0/swagger.json
@@ -0,0 +1,10285 @@
+{
+  "swagger" : "2.0",
+  "info" : {
+    "description" : "This provides the REST API for admin operations",
+    "version" : "v2",
+    "title" : "Pulsar Admin REST API",
+    "license" : {
+      "name" : "Apache 2.0",
+      "url" : "http://www.apache.org/licenses/LICENSE-2.0.html"
+    }
+  },
+  "basePath" : "/admin/v2",
+  "tags" : [ {
+    "name" : "bookies"
+  }, {
+    "name" : "broker-stats"
+  }, {
+    "name" : "brokers"
+  }, {
+    "name" : "clusters"
+  }, {
+    "name" : "namespaces"
+  }, {
+    "name" : "non-persistent topic"
+  }, {
+    "name" : "persistent topic"
+  }, {
+    "name" : "resource-quotas"
+  }, {
+    "name" : "schemas"
+  }, {
+    "name" : "tenants"
+  } ],
+  "schemes" : [ "http", "https" ],
+  "paths" : {
+    "/bookies/racks-info" : {
+      "get" : {
+        "tags" : [ "bookies" ],
+        "summary" : "Gets the rack placement information for all the bookies in the cluster",
+        "description" : "",
+        "operationId" : "getBookiesRackInfo",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "type" : "object",
+                "additionalProperties" : {
+                  "$ref" : "#/definitions/BookieInfo"
+                }
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/bookies/racks-info/{bookie}" : {
+      "get" : {
+        "tags" : [ "bookies" ],
+        "summary" : "Gets the rack placement information for a specific bookie in the cluster",
+        "description" : "",
+        "operationId" : "getBookieRackInfo",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "bookie",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/BookieInfo"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "bookies" ],
+        "summary" : "Updates the rack placement information for a specific bookie in the cluster",
+        "description" : "",
+        "operationId" : "updateBookieRackInfo",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "bookie",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "group",
+          "in" : "query",
+          "required" : false,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "bookies" ],
+        "summary" : "Removed the rack placement information for a specific bookie in the cluster",
+        "description" : "",
+        "operationId" : "deleteBookieRackInfo",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "bookie",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/broker-stats/allocator-stats/{allocator}" : {
+      "get" : {
+        "tags" : [ "broker-stats" ],
+        "summary" : "Get the stats for the Netty allocator. Available allocators are 'default' and 'ml-cache'",
+        "description" : "",
+        "operationId" : "getAllocatorStats",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "allocator",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/AllocatorStats"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/broker-stats/bookieops" : {
+      "get" : {
+        "tags" : [ "broker-stats" ],
+        "summary" : "Get pending bookie client op stats by namesapce",
+        "description" : "",
+        "operationId" : "getPendingBookieOpsStats",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "$ref" : "#/definitions/PendingBookieOpsStats"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/broker-stats/broker-resource-availability/{tenant}/{namespace}" : {
+      "get" : {
+        "tags" : [ "broker-stats" ],
+        "summary" : "Broker availability report",
+        "description" : "This API gives the current broker availability in percent, each resource percentage usage is calculated and thensum of all of the resource usage percent is called broker-resource-availability<br/><br/>THIS API IS ONLY FOR USE BY TESTING FOR CONFIRMING NAMESPACE ALLOCATION ALGORITHM",
+        "operationId" : "getBrokerResourceAvailability",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "$ref" : "#/definitions/ResourceUnit"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "409" : {
+            "description" : "Load-manager doesn't support operation"
+          }
+        }
+      }
+    },
+    "/broker-stats/load-report" : {
+      "get" : {
+        "tags" : [ "broker-stats" ],
+        "summary" : "Get Load for this broker",
+        "description" : "consists of topics stats & systemResourceUsage",
+        "operationId" : "getLoadReport",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/LoadReport"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/broker-stats/mbeans" : {
+      "get" : {
+        "tags" : [ "broker-stats" ],
+        "summary" : "Get all the mbean details of this broker JVM",
+        "description" : "",
+        "operationId" : "getMBeans",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/definitions/Metrics"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/broker-stats/metrics" : {
+      "get" : {
+        "tags" : [ "broker-stats" ],
+        "summary" : "Gets the metrics for Monitoring",
+        "description" : "Requested should be executed by Monitoring agent on each broker to fetch the metrics",
+        "operationId" : "getMetrics",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/definitions/Metrics"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/broker-stats/topics" : {
+      "get" : {
+        "tags" : [ "broker-stats" ],
+        "summary" : "Get all the topic stats by namespace",
+        "description" : "",
+        "operationId" : "getTopics2",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/OutputStream"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/brokers/configuration" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Get all updatable dynamic configurations's name",
+        "description" : "",
+        "operationId" : "getDynamicConfigurationName",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "object"
+              }
+            }
+          }
+        }
+      }
+    },
+    "/brokers/configuration/runtime" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Get all runtime configurations. This operation requires Pulsar super-user privileges.",
+        "description" : "",
+        "operationId" : "getRuntimeConfiguration",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "type" : "object"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/brokers/configuration/values" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Get value of all dynamic configurations' value overridden on local config",
+        "description" : "",
+        "operationId" : "getAllDynamicConfigurations",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "type" : "object"
+              }
+            }
+          },
+          "404" : {
+            "description" : "Configuration not found"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/brokers/configuration/{configName}" : {
+      "delete" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Delete dynamic serviceconfiguration into zk only. This operation requires Pulsar super-user privileges.",
+        "description" : "",
+        "operationId" : "deleteDynamicConfiguration",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "configName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "204" : {
+            "description" : "Service configuration updated successfully"
+          },
+          "403" : {
+            "description" : "You don't have admin permission to update service-configuration"
+          },
+          "412" : {
+            "description" : "Invalid dynamic-config value"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/brokers/configuration/{configName}/{configValue}" : {
+      "post" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Update dynamic serviceconfiguration into zk only. This operation requires Pulsar super-user privileges.",
+        "description" : "",
+        "operationId" : "updateDynamicConfiguration",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "configName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "configValue",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "204" : {
+            "description" : "Service configuration updated successfully"
+          },
+          "403" : {
+            "description" : "You don't have admin permission to update service-configuration"
+          },
+          "404" : {
+            "description" : "Configuration not found"
+          },
+          "412" : {
+            "description" : "Invalid dynamic-config value"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/brokers/health" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Run a healthcheck against the broker",
+        "description" : "",
+        "operationId" : "healthcheck",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Everything is OK"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/brokers/internal-configuration" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Get the internal configuration data",
+        "description" : "",
+        "operationId" : "getInternalConfigurationData",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/InternalConfigurationData"
+            }
+          }
+        }
+      }
+    },
+    "/brokers/{clusterName}/{broker-webserviceurl}/ownedNamespaces" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Get the list of namespaces served by the specific broker",
+        "description" : "",
+        "operationId" : "getOwnedNamespaces",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "clusterName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "broker-webserviceurl",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "$ref" : "#/definitions/NamespaceOwnershipStatus"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist"
+          }
+        }
+      }
+    },
+    "/brokers/{cluster}" : {
+      "get" : {
+        "tags" : [ "brokers" ],
+        "summary" : "Get the list of active brokers (web service addresses) in the cluster.If authorization is not enabled, any cluster name is valid.",
+        "description" : "",
+        "operationId" : "getActiveBrokers",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "401" : {
+            "description" : "Authentication required"
+          },
+          "403" : {
+            "description" : "This operation requires super-user access"
+          },
+          "404" : {
+            "description" : "Cluster does not exist: cluster={clustername}"
+          }
+        }
+      }
+    },
+    "/clusters" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get the list of all the Pulsar clusters.",
+        "description" : "",
+        "operationId" : "getClusters",
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Return a list of clusters.",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get the configuration for the specified cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getCluster",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Return the cluster data.",
+            "schema" : {
+              "$ref" : "#/definitions/ClusterData"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission."
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Update the configuration for a cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "updateCluster",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The cluster data",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/ClusterData"
+          },
+          "x-examples" : {
+            "application/json" : "{\n   'serviceUrl': 'http://pulsar.example.com:8080',\n   'brokerServiceUrl': 'pulsar://pulsar.example.com:6651'\n}"
+          }
+        } ],
+        "responses" : {
+          "204" : {
+            "description" : "Cluster has been updated."
+          },
+          "403" : {
+            "description" : "Don't have admin permission or policies are read-only."
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Create a new cluster.",
+        "description" : "This operation requires Pulsar superuser privileges, and the name cannot contain the '/' characters.",
+        "operationId" : "createCluster",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The cluster data",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/ClusterData"
+          },
+          "x-examples" : {
+            "application/json" : "{\n   'serviceUrl': 'http://pulsar.example.com:8080',\n   'brokerServiceUrl': 'pulsar://pulsar.example.com:6651',\n}"
+          }
+        } ],
+        "responses" : {
+          "204" : {
+            "description" : "Cluster has been created."
+          },
+          "403" : {
+            "description" : "You don't have admin permission to create the cluster."
+          },
+          "409" : {
+            "description" : "Cluster already exists."
+          },
+          "412" : {
+            "description" : "Cluster name is not valid."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Delete an existing cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "deleteCluster",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "204" : {
+            "description" : "Cluster has been deleted."
+          },
+          "403" : {
+            "description" : "Don't have admin permission or policies are read-only."
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "412" : {
+            "description" : "Cluster is not empty."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}/failureDomains" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get the cluster failure domains.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getFailureDomains",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "$ref" : "#/definitions/FailureDomain"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}/failureDomains/{domainName}" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get a domain in a cluster",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getDomain",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "domainName",
+          "in" : "path",
+          "description" : "The failure domain name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/FailureDomain"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "FailureDomain doesn't exist"
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Set the failure domain of the cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "setFailureDomain",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "domainName",
+          "in" : "path",
+          "description" : "The failure domain name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The configuration data of a failure domain",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/FailureDomain"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission."
+          },
+          "404" : {
+            "description" : "Failure domain doesn't exist."
+          },
+          "409" : {
+            "description" : "Broker already exists in another domain."
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Delete the failure domain of the cluster",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "deleteFailureDomain",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "domainName",
+          "in" : "path",
+          "description" : "The failure domain name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission or policy is read only"
+          },
+          "404" : {
+            "description" : "FailureDomain doesn't exist"
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}/namespaceIsolationPolicies" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get the namespace isolation policies assigned to the cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getNamespaceIsolationPolicies",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "$ref" : "#/definitions/NamespaceIsolationData"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission."
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}/namespaceIsolationPolicies/brokers" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get list of brokers with namespace-isolation policies attached to them.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getBrokersWithNamespaceIsolationPolicy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "$ref" : "#/definitions/BrokerNamespaceIsolationData"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission."
+          },
+          "404" : {
+            "description" : "Namespace-isolation policies not found."
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}/namespaceIsolationPolicies/brokers/{broker}" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get a broker with namespace-isolation policies attached to it.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getBrokerWithNamespaceIsolationPolicy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "broker",
+          "in" : "path",
+          "description" : "The broker name (<broker-hostname>:<web-service-port>)",
+          "required" : true,
+          "type" : "string",
+          "x-example" : "broker1:8080"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/BrokerNamespaceIsolationData"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission."
+          },
+          "404" : {
+            "description" : "Namespace-isolation policies/ Broker not found."
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}/namespaceIsolationPolicies/{policyName}" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get the single namespace isolation policy assigned to the cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getNamespaceIsolationPolicy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "policyName",
+          "in" : "path",
+          "description" : "The name of the namespace isolation policy",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/NamespaceIsolationData"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission."
+          },
+          "404" : {
+            "description" : "Policy doesn't exist."
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Set namespace isolation policy.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "setNamespaceIsolationPolicy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "policyName",
+          "in" : "path",
+          "description" : "The namespace isolation policy name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The namespace isolation policy data",
+          "required" : true,
+          "schema" : {
+            "$ref" : "#/definitions/NamespaceIsolationData"
+          }
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Namespace isolation policy data is invalid."
+          },
+          "403" : {
+            "description" : "Don't have admin permission or policies are read-only."
+          },
+          "404" : {
+            "description" : "Namespace isolation policy doesn't exist."
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Delete namespace isolation policy.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "deleteNamespaceIsolationPolicy",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "policyName",
+          "in" : "path",
+          "description" : "The namespace isolation policy name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission or policies are read only."
+          },
+          "404" : {
+            "description" : "Namespace isolation policy doesn't exist."
+          },
+          "412" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      }
+    },
+    "/clusters/{cluster}/peers" : {
+      "get" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Get the peer-cluster data for the specified cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "getPeerCluster",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission."
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "clusters" ],
+        "summary" : "Update peer-cluster-list for a cluster.",
+        "description" : "This operation requires Pulsar superuser privileges.",
+        "operationId" : "setPeerClusterNames",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "description" : "The cluster name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The list of peer cluster names",
+          "required" : true,
+          "schema" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string"
+            }
+          },
+          "x-examples" : {
+            "application/json" : "[\n   'cluster-a',\n   'cluster-b'\n]"
+          }
+        } ],
+        "responses" : {
+          "204" : {
+            "description" : "Cluster has been updated."
+          },
+          "403" : {
+            "description" : "Don't have admin permission or policies are read-only."
+          },
+          "404" : {
+            "description" : "Cluster doesn't exist."
+          },
+          "412" : {
+            "description" : "Peer cluster doesn't exist."
+          },
+          "500" : {
+            "description" : "Internal server error."
+          }
+        }
+      }
+    },
+    "/namespaces/{cluster}/antiAffinity/{group}" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get all namespaces that are grouped by given anti-affinity group in a given cluster. api can be only accessed by admin of any of the existing tenant",
+        "description" : "",
+        "operationId" : "getAntiAffinityNamespaces",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "cluster",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "group",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "tenant",
+          "in" : "query",
+          "required" : false,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "object"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "412" : {
+            "description" : "Cluster not exist/Anti-affinity group can't be empty."
+          }
+        }
+      }
+    },
+    "/namespaces/{property}/{namespace}/persistence/bookieAffinity" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the bookie-affinity-group from namespace-local policy.",
+        "description" : "",
+        "operationId" : "getBookieAffinityGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "property",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/BookieAffinityGroupData"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Delete the bookie-affinity-group from namespace-local policy.",
+        "description" : "",
+        "operationId" : "deleteBookieAffinityGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "property",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the list of all the namespaces for a certain tenant.",
+        "description" : "",
+        "operationId" : "getTenantNamespaces",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the dump all the policies specified for a namespace.",
+        "description" : "",
+        "operationId" : "getPolicies",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/Policies"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Creates a new namespace with the specified policies",
+        "description" : "",
+        "operationId" : "createNamespace",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster doesn't exist"
+          },
+          "409" : {
+            "description" : "Namespace already exists"
+          },
+          "412" : {
+            "description" : "Namespace name is not valid"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Delete a namespace and all the topics under it.",
+        "description" : "",
+        "operationId" : "deleteNamespace",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Namespace is not empty"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/antiAffinity" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get anti-affinity group of a namespace.",
+        "description" : "",
+        "operationId" : "getNamespaceAntiAffinityGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "string"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set anti-affinity group for a namespace",
+        "description" : "",
+        "operationId" : "setNamespaceAntiAffinityGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Invalid antiAffinityGroup"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Remove anti-affinity group of a namespace.",
+        "description" : "",
+        "operationId" : "removeNamespaceAntiAffinityGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/backlogQuota" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set a backlog quota for all the topics on a namespace.",
+        "description" : "",
+        "operationId" : "setBacklogQuota",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "backlogQuotaType",
+          "in" : "query",
+          "required" : false,
+          "type" : "string",
+          "enum" : [ "destination_storage" ]
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Specified backlog quota exceeds retention quota. Increase retention quota and retry request"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Remove a backlog quota policy from a namespace.",
+        "description" : "",
+        "operationId" : "removeBacklogQuota",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "backlogQuotaType",
+          "in" : "query",
+          "required" : false,
+          "type" : "string",
+          "enum" : [ "destination_storage" ]
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/backlogQuotaMap" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get backlog quota map on a namespace.",
+        "description" : "",
+        "operationId" : "getBacklogQuotaMap",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "type" : "object"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/bundles" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the bundles split data.",
+        "description" : "",
+        "operationId" : "getBundlesData",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/BundlesData"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Namespace is not setup to split in bundles"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/clearBacklog" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Clear backlog for all topics on a namespace.",
+        "description" : "",
+        "operationId" : "clearNamespaceBacklog",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/clearBacklog/{subscription}" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Clear backlog for a given subscription on all topics on a namespace.",
+        "description" : "",
+        "operationId" : "clearNamespaceBacklogForSubscription",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subscription",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/compactionThreshold" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Maximum number of uncompacted bytes in topics before compaction is triggered.",
+        "description" : "The backlog size is compared to the threshold periodically. A threshold of 0 disabled automatic compaction",
+        "operationId" : "getCompactionThreshold",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int64"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set maximum number of uncompacted bytes in a topic before compaction is triggered.",
+        "description" : "The backlog size is compared to the threshold periodically. A threshold of 0 disabled automatic compaction",
+        "operationId" : "setCompactionThreshold",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "compactionThreshold value is not valid"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/deduplication" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Enable or disable broker side deduplication for all topics in a namespace",
+        "description" : "",
+        "operationId" : "modifyDeduplication",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/dispatchRate" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get dispatch-rate configured for the namespace, -1 represents not configured yet",
+        "description" : "",
+        "operationId" : "getDispatchRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/DispatchRate"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set dispatch-rate throttling for all topics of the namespace",
+        "description" : "",
+        "operationId" : "setDispatchRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/encryptionRequired" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Message encryption is required or not for all topics in a namespace",
+        "description" : "",
+        "operationId" : "modifyEncryptionRequired",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/isAllowAutoUpdateSchema" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "The flag of whether allow auto update schema",
+        "description" : "",
+        "operationId" : "getIsAllowAutoUpdateSchema",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "boolean"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Update flag of whether allow auto update schema",
+        "description" : "",
+        "operationId" : "setIsAllowAutoUpdateSchema",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/maxConsumersPerSubscription" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get maxConsumersPerSubscription config on a namespace.",
+        "description" : "",
+        "operationId" : "getMaxConsumersPerSubscription",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int32"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set maxConsumersPerSubscription configuration on a namespace.",
+        "description" : "",
+        "operationId" : "setMaxConsumersPerSubscription",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "maxConsumersPerSubscription value is not valid"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/maxConsumersPerTopic" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get maxConsumersPerTopic config on a namespace.",
+        "description" : "",
+        "operationId" : "getMaxConsumersPerTopic",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int32"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set maxConsumersPerTopic configuration on a namespace.",
+        "description" : "",
+        "operationId" : "setMaxConsumersPerTopic",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "maxConsumersPerTopic value is not valid"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/maxProducersPerTopic" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get maxProducersPerTopic config on a namespace.",
+        "description" : "",
+        "operationId" : "getMaxProducersPerTopic",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int32"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set maxProducersPerTopic configuration on a namespace.",
+        "description" : "",
+        "operationId" : "setMaxProducersPerTopic",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "maxProducersPerTopic value is not valid"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/messageTTL" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the message TTL for the namespace",
+        "description" : "",
+        "operationId" : "getNamespaceMessageTTL",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int32"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set message TTL in seconds for namespace",
+        "description" : "",
+        "operationId" : "setNamespaceMessageTTL",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Invalid TTL"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/offloadDeletionLagMs" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Number of milliseconds to wait before deleting a ledger segment which has been offloaded from the Pulsar cluster's local storage (i.e. BookKeeper)",
+        "description" : "A negative value denotes that deletion has been completely disabled. 'null' denotes that the topics in the namespace will fall back to the broker default for deletion lag.",
+        "operationId" : "getOffloadDeletionLag",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int64"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set number of milliseconds to wait before deleting a ledger segment which has been offloaded from the Pulsar cluster's local storage (i.e. BookKeeper)",
+        "description" : "A negative value disables the deletion completely.",
+        "operationId" : "setOffloadDeletionLag",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "offloadDeletionLagMs value is not valid"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Clear the namespace configured offload deletion lag. The topics in the namespace will fallback to using the default configured deletion lag for the broker",
+        "description" : "",
+        "operationId" : "clearOffloadDeletionLag",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/offloadThreshold" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Maximum number of bytes stored on the pulsar cluster for a topic, before the broker will start offloading to longterm storage",
+        "description" : "A negative value disables automatic offloading",
+        "operationId" : "getOffloadThreshold",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "integer",
+              "format" : "int64"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set maximum number of bytes stored on the pulsar cluster for a topic, before the broker will start offloading to longterm storage",
+        "description" : "-1 will revert to using the cluster default. A negative value disables automatic offloading. ",
+        "operationId" : "setOffloadThreshold",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "offloadThreshold value is not valid"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/permissions" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Retrieve the permissions for a namespace.",
+        "description" : "",
+        "operationId" : "getPermissions",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "cluster",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "type" : "object"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Namespace is not empty"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/permissions/{role}" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Grant a new permission to a role on a namespace.",
+        "description" : "",
+        "operationId" : "grantPermissionOnNamespace",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "role",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "501" : {
+            "description" : "Authorization is not enabled"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Revoke all permissions to a role on a namespace.",
+        "description" : "",
+        "operationId" : "revokePermissionsOnNamespace",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "role",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/persistence" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the persistence configuration for a namespace.",
+        "description" : "",
+        "operationId" : "getPersistence",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PersistencePolicies"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set the persistence configuration for all the topics on a namespace.",
+        "description" : "",
+        "operationId" : "setPersistence",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid persistence policies"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/persistence/bookieAffinity" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set the bookie-affinity-group to namespace-persistent policy.",
+        "description" : "",
+        "operationId" : "setBookieAffinityGroup",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/replication" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the replication clusters for a namespace.",
+        "description" : "",
+        "operationId" : "getNamespaceReplicationClusters",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Namespace is not global"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set the replication clusters for a namespace.",
+        "description" : "",
+        "operationId" : "setNamespaceReplicationClusters",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Peer-cluster can't be part of replication-cluster"
+          },
+          "412" : {
+            "description" : "Namespace is not global or invalid cluster ids"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/replicatorDispatchRate" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get replicator dispatch-rate configured for the namespace, -1 represents not configured yet",
+        "description" : "",
+        "operationId" : "getReplicatorDispatchRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/DispatchRate"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set replicator dispatch-rate throttling for all topics of the namespace",
+        "description" : "",
+        "operationId" : "setReplicatorDispatchRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/retention" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get retention config on a namespace.",
+        "description" : "",
+        "operationId" : "getRetention",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/RetentionPolicies"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set retention configuration on a namespace.",
+        "description" : "",
+        "operationId" : "setRetention",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Retention Quota must exceed backlog quota"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/schemaAutoUpdateCompatibilityStrategy" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "The strategy used to check the compatibility of new schemas, provided by producers, before automatically updating the schema",
+        "description" : "The value AutoUpdateDisabled prevents producers from updating the schema.  If set to AutoUpdateDisabled, schemas must be updated through the REST api",
+        "operationId" : "getSchemaAutoUpdateCompatibilityStrategy",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "string",
+              "enum" : [ "AutoUpdateDisabled", "Backward", "Forward", "Full", "AlwaysCompatible", "BackwardTransitive", "ForwardTransitive", "FullTransitive" ]
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Update the strategy used to check the compatibility of new schemas, provided by producers, before automatically updating the schema",
+        "description" : "The value AutoUpdateDisabled prevents producers from updating the schema.  If set to AutoUpdateDisabled, schemas must be updated through the REST api",
+        "operationId" : "setSchemaAutoUpdateCompatibilityStrategy",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/schemaCompatibilityStrategy" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "The strategy of the namespace schema compatibility ",
+        "description" : "",
+        "operationId" : "getSchemaCompatibilityStrategy",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "string",
+              "enum" : [ "UNDEFINED", "ALWAYS_INCOMPATIBLE", "ALWAYS_COMPATIBLE", "BACKWARD", "FORWARD", "FULL", "BACKWARD_TRANSITIVE", "FORWARD_TRANSITIVE", "FULL_TRANSITIVE" ]
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Update the strategy used to check the compatibility of new schema",
+        "description" : "",
+        "operationId" : "setSchemaCompatibilityStrategy",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/schemaValidationEnforced" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get schema validation enforced flag for namespace.",
+        "description" : "If the flag is set to true, when a producer without a schema attempts to produce to a topic with schema in this namespace, the producer will be failed to connect. PLEASE be carefully on using this, since non-java clients don't support schema.if you enable this setting, it will cause non-java clients failed to produce.",
+        "operationId" : "getSchemaValidtionEnforced",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "boolean"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenants or Namespace doesn't exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set schema validation enforced flag on namespace.",
+        "description" : "If the flag is set to true, when a producer without a schema attempts to produce to a topic with schema in this namespace, the producer will be failed to connect. PLEASE be carefully on using this, since non-java clients don't support schema.if you enable this setting, it will cause non-java clients failed to produce.",
+        "operationId" : "setSchemaValidtionEnforced",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "schemaValidationEnforced value is not valid"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/subscribeRate" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get subscribe-rate configured for the namespace",
+        "description" : "",
+        "operationId" : "getSubscribeRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/SubscribeRate"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set subscribe-rate throttling for all topics of the namespace",
+        "description" : "",
+        "operationId" : "setSubscribeRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/subscriptionAuthMode" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : " Set a subscription auth mode for all the topics on a namespace.",
+        "description" : "",
+        "operationId" : "setSubscriptionAuthMode",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/subscriptionDispatchRate" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get Subscription dispatch-rate configured for the namespace, -1 represents not configured yet",
+        "description" : "",
+        "operationId" : "getSubscriptionDispatchRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/DispatchRate"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Set Subscription dispatch-rate throttling for all topics of the namespace",
+        "description" : "",
+        "operationId" : "setSubscriptionDispatchRate",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/topics" : {
+      "get" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Get the list of all the topics under a certain namespace.",
+        "description" : "",
+        "operationId" : "getTopics",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "mode",
+          "in" : "query",
+          "required" : false,
+          "type" : "string",
+          "default" : "PERSISTENT",
+          "enum" : [ "PERSISTENT", "NON_PERSISTENT", "ALL" ]
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/unload" : {
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Unload namespace",
+        "description" : "Unload an active namespace from the current broker serving it. Performing this operation will let the brokerremoves all producers, consumers, and connections using this namespace, and close all topics (includingtheir persistent store). During that operation, the namespace is marked as tentatively unavailable until thebroker completes the unloading action. This operation requires strictly super user privileges, since it wouldresult in non-persistent message loss and unexpected connection closure to the clients.",
+        "operationId" : "unloadNamespace",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Namespace is already unloaded or Namespace has bundles activated"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/unsubscribe/{subscription}" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Unsubscribes the given subscription on all topics on a namespace.",
+        "description" : "",
+        "operationId" : "unsubscribeNamespace",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "cluster",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subscription",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/{bundle}" : {
+      "delete" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Delete a namespace bundle and all the topics under it.",
+        "description" : "",
+        "operationId" : "deleteNamespaceBundle",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant or cluster or namespace doesn't exist"
+          },
+          "409" : {
+            "description" : "Namespace bundle is not empty"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/{bundle}/clearBacklog" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Clear backlog for all topics on a namespace bundle.",
+        "description" : "",
+        "operationId" : "clearNamespaceBundleBacklog",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/{bundle}/clearBacklog/{subscription}" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Clear backlog for a given subscription on all topics on a namespace bundle.",
+        "description" : "",
+        "operationId" : "clearNamespaceBundleBacklogForSubscription",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subscription",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/{bundle}/split" : {
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Split a namespace bundle",
+        "description" : "",
+        "operationId" : "splitNamespaceBundle",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "unload",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/{bundle}/unload" : {
+      "put" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Unload a namespace bundle",
+        "description" : "",
+        "operationId" : "unloadNamespaceBundle",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/namespaces/{tenant}/{namespace}/{bundle}/unsubscribe/{subscription}" : {
+      "post" : {
+        "tags" : [ "namespaces" ],
+        "summary" : "Unsubscribes the given subscription on all topics on a namespace bundle.",
+        "description" : "",
+        "operationId" : "unsubscribeNamespaceBundle",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subscription",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the list of non-persistent topics under a namespace.",
+        "description" : "",
+        "operationId" : "getList",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to manage resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "The tenant/namespace does not exist"
+          },
+          "412" : {
+            "description" : "Namespace name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/partitioned" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the list of partitioned topics under a namespace.",
+        "description" : "",
+        "operationId" : "getPartitionedTopicList",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "412" : {
+            "description" : "Namespace name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{bundle}" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the list of non-persistent topics under a namespace bundle.",
+        "description" : "",
+        "operationId" : "getListFromBundle",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "description" : "Bundle range of a topic",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to manage resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace doesn't exist"
+          },
+          "412" : {
+            "description" : "Namespace name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}" : {
+      "put" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Create a non-partitioned topic.",
+        "description" : "This is the only REST endpoint from which non-partitioned topics could be created.",
+        "operationId" : "createNonPartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "409" : {
+            "description" : "Partitioned topic already exist"
+          },
+          "412" : {
+            "description" : "Failed Reason : Name is invalid or Namespace does not have any clusters configured"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Delete a topic.",
+        "description" : "The topic cannot be deleted if delete is not forcefully and there's any active subscription or producer connected to the it. Force delete ignores connected clients and deletes topic by explicitly closing them.",
+        "operationId" : "deleteTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "force",
+          "in" : "query",
+          "description" : "Stop all producer/consumer/replicator and delete topic forcefully",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic has active producers/subscriptions"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/all_subscription/expireMessages/{expireTimeInSeconds}" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Expiry messages on all subscriptions of topic.",
+        "description" : "",
+        "operationId" : "expireMessagesForAllSubscriptions",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "expireTimeInSeconds",
+          "in" : "path",
+          "description" : "Expires beyond the specified number of seconds",
+          "required" : true,
+          "type" : "integer",
+          "default" : 0,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Expiry messages on a non-persistent topic is not allowed"
+          },
+          "412" : {
+            "description" : "Can't find owner for topic"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/backlog" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get estimated backlog for offline topic.",
+        "description" : "",
+        "operationId" : "getBacklog",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PersistentOfflineTopicStats"
+            }
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/compaction" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the status of a compaction operation for a topic.",
+        "description" : "",
+        "operationId" : "compactionStatus",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/LongRunningProcessStatus"
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist, or compaction hasn't run"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Trigger a compaction operation on a topic.",
+        "description" : "",
+        "operationId" : "compact",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "409" : {
+            "description" : "Compaction already running"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/internal-info" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the internal stats for the topic.",
+        "description" : "",
+        "operationId" : "getManagedLedgerInfo",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/internalStats" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the internal stats for the topic.",
+        "description" : "",
+        "operationId" : "getInternalStats",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PersistentTopicInternalStats"
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to manage resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "The tenant/namespace/topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/lastMessageId" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Return the last commit message id of topic",
+        "description" : "",
+        "operationId" : "getLastMessageId",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/MessageId"
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/offload" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Offload a prefix of a topic to long term storage",
+        "description" : "",
+        "operationId" : "offloadStatus",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/OffloadProcessStatus"
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Offload a prefix of a topic to long term storage",
+        "description" : "",
+        "operationId" : "triggerOffload",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "409" : {
+            "description" : "Offload already running"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/partitioned-stats" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the stats for the partitioned topic.",
+        "description" : "",
+        "operationId" : "getPartitionedStats",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "perPartition",
+          "in" : "query",
+          "description" : "Get per partition stats",
+          "required" : false,
+          "type" : "boolean",
+          "default" : true
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/partitions" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get partitioned topic metadata.",
+        "description" : "",
+        "operationId" : "getPartitionedMetadata",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "checkAllowAutoCreation",
+          "in" : "query",
+          "description" : "Is check configuration required to automatically create topic",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PartitionedTopicMetadata"
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to manage resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "The tenant/namespace/topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate cluster configuration"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Increment partitons of an existing partitioned topic.",
+        "description" : "It only increments partitions of existing non-global partitioned-topic",
+        "operationId" : "updatePartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "updateLocalTopicOnly",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The number of partitions for the topic",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32",
+            "default" : 0
+          }
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to adminisActions to be grantedtrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          },
+          "406" : {
+            "description" : "The number of partitions should be more than 0"
+          },
+          "409" : {
+            "description" : "Partitioned topic does not exist"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Create a partitioned topic.",
+        "description" : "It needs to be called before creating a producer on a partitioned topic.",
+        "operationId" : "createPartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The number of partitions for the topic",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32",
+            "default" : 0
+          }
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to manage resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "The tenant/namespace does not exist"
+          },
+          "409" : {
+            "description" : "Partitioned topic already exists"
+          },
+          "412" : {
+            "description" : "Failed Reason : Name is invalid or Namespace does not have any clusters configured"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Delete a partitioned topic.",
+        "description" : "It will also delete all the partitions of the topic if it exists.",
+        "operationId" : "deletePartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "force",
+          "in" : "query",
+          "description" : "Stop all producer/consumer/replicator and delete topic forcefully",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Partitioned topic does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/permissions" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get permissions on a topic.",
+        "description" : "Retrieve the effective permissions for a topic. These permissions are defined by the permissions set at thenamespace level combined (union) with any eventual specific permission set on the topic.",
+        "operationId" : "getPermissionsOnTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "type" : "object"
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/permissions/{role}" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Grant a new permission to a role on a single topic.",
+        "description" : "",
+        "operationId" : "grantPermissionsOnTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "role",
+          "in" : "path",
+          "description" : "Client role to which grant permissions",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Actions to be granted (produce,functions,consume)",
+          "required" : false,
+          "schema" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string",
+              "enum" : [ "produce", "consume", "functions" ]
+            }
+          }
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Revoke permissions on a topic.",
+        "description" : "Revoke permissions to a role on a single topic. If the permission was not set at the topiclevel, but rather at the namespace level, this operation will return an error (HTTP status code 412).",
+        "operationId" : "revokePermissionsOnTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "role",
+          "in" : "path",
+          "description" : "Client role to which grant permissions",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "412" : {
+            "description" : "Permissions are not set at the topic level"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/stats" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the stats for the topic.",
+        "description" : "",
+        "operationId" : "getStats",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/TopicStats"
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to manage resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "The tenant/namespace/topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}" : {
+      "delete" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Delete a subscription.",
+        "description" : "There should not be any active consumers on the subscription.",
+        "operationId" : "deleteSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to be deleted",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Subscription has active consumers"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/expireMessages/{expireTimeInSeconds}" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Expiry messages on a topic subscription.",
+        "description" : "",
+        "operationId" : "expireTopicMessages",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to be Expiry messages on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "expireTimeInSeconds",
+          "in" : "path",
+          "description" : "Expires beyond the specified number of seconds",
+          "required" : true,
+          "type" : "integer",
+          "default" : 0,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Expiry messages on a non-persistent topic is not allowed"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/position/{messagePosition}" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Peek nth message on a topic subscription.",
+        "description" : "",
+        "operationId" : "peekNthMessage",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscribed message expired",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "messagePosition",
+          "in" : "path",
+          "description" : "The number of messages (default 1)",
+          "required" : true,
+          "type" : "integer",
+          "default" : 1,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic, subscription or the message position does not exist"
+          },
+          "405" : {
+            "description" : "Skipping messages on a non-persistent topic is not allowed"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/resetcursor" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Reset subscription to message position closest to given position.",
+        "description" : "It fence cursor and disconnects all active consumers before reseting cursor.",
+        "operationId" : "resetCursorOnPosition",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to reset position on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "messageId",
+          "description" : "messageId to reset back to (ledgerId:entryId)",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/MessageIdImpl"
+          }
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic/Subscription does not exist"
+          },
+          "405" : {
+            "description" : "Not supported for partitioned topics"
+          },
+          "412" : {
+            "description" : "Unable to find position for position specified"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/resetcursor/{timestamp}" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Reset subscription to message position closest to absolute timestamp (in ms).",
+        "description" : "It fence cursor and disconnects all active consumers before reseting cursor.",
+        "operationId" : "resetCursor",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to reset position on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "timestamp",
+          "in" : "path",
+          "description" : "time in minutes to reset back to (or minutes, hours,days,weeks eg:100m, 3h, 2d, 5w)",
+          "required" : true,
+          "type" : "integer",
+          "format" : "int64"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic/Subscription does not exist"
+          },
+          "405" : {
+            "description" : "Method Not Allowed"
+          },
+          "412" : {
+            "description" : "Failed to reset cursor on subscription or Unable to find position for timestamp specified"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/skip/{numMessages}" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Skipping messages on a topic subscription.",
+        "description" : "",
+        "operationId" : "skipMessages",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Name of subscription",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "numMessages",
+          "in" : "path",
+          "description" : "The number of messages to skip",
+          "required" : true,
+          "type" : "integer",
+          "default" : 0,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Skipping messages on a partitioned topic is not allowed"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/skip_all" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Skip all messages on a topic subscription.",
+        "description" : "Completely clears the backlog on the subscription.",
+        "operationId" : "skipAllMessages",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Name of subscription",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Operation not allowed on non-persistent topic"
+          },
+          "412" : {
+            "description" : "Can't find owner for topic"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscription/{subscriptionName}" : {
+      "put" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Reset subscription to message position closest to given position.",
+        "description" : "Creates a subscription on the topic at the specified message id",
+        "operationId" : "createSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subscriptionName",
+          "in" : "path",
+          "description" : "Subscription to create position on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "messageId where to create the subscription. It can be 'latest', 'earliest' or (ledgerId:entryId)",
+          "required" : false,
+          "type" : "boolean",
+          "default" : "latest",
+          "enum" : [ "latest", "earliest", "ledgerId:entryId" ]
+        }, {
+          "name" : "replicated",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean"
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic/Subscription does not exist"
+          },
+          "405" : {
+            "description" : "Not supported for partitioned topics"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/subscriptions" : {
+      "get" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Get the list of persistent subscriptions for a given topic.",
+        "description" : "",
+        "operationId" : "getSubscriptions",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/terminate" : {
+      "post" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Terminate a topic. A topic that is terminated will not accept any more messages to be published and will let consumer to drain existing messages in backlog",
+        "description" : "",
+        "operationId" : "terminate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/MessageId"
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Termination of a partitioned topic is not allowed"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/non-persistent/{tenant}/{namespace}/{topic}/unload" : {
+      "put" : {
+        "tags" : [ "non-persistent topic" ],
+        "summary" : "Unload a topic",
+        "description" : "",
+        "operationId" : "unloadTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "This operation requires super-user access"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "The tenant/namespace/topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the list of topics under a namespace.",
+        "description" : "",
+        "operationId" : "getList",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "412" : {
+            "description" : "Namespace name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/partitioned" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the list of partitioned topics under a namespace.",
+        "description" : "",
+        "operationId" : "getPartitionedTopicList",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "412" : {
+            "description" : "Namespace name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}" : {
+      "put" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Create a non-partitioned topic.",
+        "description" : "This is the only REST endpoint from which non-partitioned topics could be created.",
+        "operationId" : "createNonPartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "409" : {
+            "description" : "Partitioned topic already exist"
+          },
+          "412" : {
+            "description" : "Failed Reason : Name is invalid or Namespace does not have any clusters configured"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Delete a topic.",
+        "description" : "The topic cannot be deleted if delete is not forcefully and there's any active subscription or producer connected to the it. Force delete ignores connected clients and deletes topic by explicitly closing them.",
+        "operationId" : "deleteTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "force",
+          "in" : "query",
+          "description" : "Stop all producer/consumer/replicator and delete topic forcefully",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic has active producers/subscriptions"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/all_subscription/expireMessages/{expireTimeInSeconds}" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Expiry messages on all subscriptions of topic.",
+        "description" : "",
+        "operationId" : "expireMessagesForAllSubscriptions",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "expireTimeInSeconds",
+          "in" : "path",
+          "description" : "Expires beyond the specified number of seconds",
+          "required" : true,
+          "type" : "integer",
+          "default" : 0,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Expiry messages on a non-persistent topic is not allowed"
+          },
+          "412" : {
+            "description" : "Can't find owner for topic"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/backlog" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get estimated backlog for offline topic.",
+        "description" : "",
+        "operationId" : "getBacklog",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PersistentOfflineTopicStats"
+            }
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/compaction" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the status of a compaction operation for a topic.",
+        "description" : "",
+        "operationId" : "compactionStatus",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/LongRunningProcessStatus"
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist, or compaction hasn't run"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Trigger a compaction operation on a topic.",
+        "description" : "",
+        "operationId" : "compact",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "409" : {
+            "description" : "Compaction already running"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/internal-info" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the internal stats for the topic.",
+        "description" : "",
+        "operationId" : "getManagedLedgerInfo",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/internalStats" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the internal stats for the topic.",
+        "description" : "",
+        "operationId" : "getInternalStats",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PersistentTopicInternalStats"
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/lastMessageId" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Return the last commit message id of topic",
+        "description" : "",
+        "operationId" : "getLastMessageId",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/MessageId"
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/offload" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Offload a prefix of a topic to long term storage",
+        "description" : "",
+        "operationId" : "offloadStatus",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/OffloadProcessStatus"
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Offload a prefix of a topic to long term storage",
+        "description" : "",
+        "operationId" : "triggerOffload",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Operation is not allowed on the persistent topic"
+          },
+          "409" : {
+            "description" : "Offload already running"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/partitioned-stats" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the stats for the partitioned topic.",
+        "description" : "",
+        "operationId" : "getPartitionedStats",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "perPartition",
+          "in" : "query",
+          "description" : "Get per partition stats",
+          "required" : false,
+          "type" : "boolean",
+          "default" : true
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/partitions" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get partitioned topic metadata.",
+        "description" : "",
+        "operationId" : "getPartitionedMetadata",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "checkAllowAutoCreation",
+          "in" : "query",
+          "description" : "Is check configuration required to automatically create topic",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PartitionedTopicMetadata"
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Increment partitons of an existing partitioned topic.",
+        "description" : "It only increments partitions of existing non-global partitioned-topic",
+        "operationId" : "updatePartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "updateLocalTopicOnly",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The number of partitions for the topic",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32",
+            "default" : 0
+          }
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to adminisActions to be grantedtrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          },
+          "406" : {
+            "description" : "The number of partitions should be more than 0"
+          },
+          "409" : {
+            "description" : "Partitioned topic does not exist"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Create a partitioned topic.",
+        "description" : "It needs to be called before creating a producer on a partitioned topic.",
+        "operationId" : "createPartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The number of partitions for the topic",
+          "required" : true,
+          "schema" : {
+            "type" : "integer",
+            "format" : "int32",
+            "default" : 0
+          }
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          },
+          "409" : {
+            "description" : "Partitioned topic already exist"
+          },
+          "412" : {
+            "description" : "Failed Reason : Name is invalid or Namespace does not have any clusters configured"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Delete a partitioned topic.",
+        "description" : "It will also delete all the partitions of the topic if it exists.",
+        "operationId" : "deletePartitionedTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "force",
+          "in" : "query",
+          "description" : "Stop all producer/consumer/replicator and delete topic forcefully",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Partitioned topic does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Partitioned topic name is invalid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/permissions" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get permissions on a topic.",
+        "description" : "Retrieve the effective permissions for a topic. These permissions are defined by the permissions set at thenamespace level combined (union) with any eventual specific permission set on the topic.",
+        "operationId" : "getPermissionsOnTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "object",
+              "additionalProperties" : {
+                "type" : "object"
+              }
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/permissions/{role}" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Grant a new permission to a role on a single topic.",
+        "description" : "",
+        "operationId" : "grantPermissionsOnTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "role",
+          "in" : "path",
+          "description" : "Client role to which grant permissions",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Actions to be granted (produce,functions,consume)",
+          "required" : false,
+          "schema" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string",
+              "enum" : [ "produce", "consume", "functions" ]
+            }
+          }
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Revoke permissions on a topic.",
+        "description" : "Revoke permissions to a role on a single topic. If the permission was not set at the topiclevel, but rather at the namespace level, this operation will return an error (HTTP status code 412).",
+        "operationId" : "revokePermissionsOnTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "role",
+          "in" : "path",
+          "description" : "Client role to which grant permissions",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "tenant/namespace/topic doesn't exit"
+          },
+          "412" : {
+            "description" : "Permissions are not set at the topic level"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/stats" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the stats for the topic.",
+        "description" : "",
+        "operationId" : "getStats",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/TopicStats"
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}" : {
+      "delete" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Delete a subscription.",
+        "description" : "There should not be any active consumers on the subscription.",
+        "operationId" : "deleteSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to be deleted",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Subscription has active consumers"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/expireMessages/{expireTimeInSeconds}" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Expiry messages on a topic subscription.",
+        "description" : "",
+        "operationId" : "expireTopicMessages",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to be Expiry messages on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "expireTimeInSeconds",
+          "in" : "path",
+          "description" : "Expires beyond the specified number of seconds",
+          "required" : true,
+          "type" : "integer",
+          "default" : 0,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Expiry messages on a non-persistent topic is not allowed"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/position/{messagePosition}" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Peek nth message on a topic subscription.",
+        "description" : "",
+        "operationId" : "peekNthMessage",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscribed message expired",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "messagePosition",
+          "in" : "path",
+          "description" : "The number of messages (default 1)",
+          "required" : true,
+          "type" : "integer",
+          "default" : 1,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic, subscription or the message position does not exist"
+          },
+          "405" : {
+            "description" : "Skipping messages on a non-persistent topic is not allowed"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/resetcursor" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Reset subscription to message position closest to given position.",
+        "description" : "It fence cursor and disconnects all active consumers before reseting cursor.",
+        "operationId" : "resetCursorOnPosition",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to reset position on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        }, {
+          "in" : "body",
+          "name" : "messageId",
+          "description" : "messageId to reset back to (ledgerId:entryId)",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/MessageIdImpl"
+          }
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic/Subscription does not exist"
+          },
+          "405" : {
+            "description" : "Not supported for partitioned topics"
+          },
+          "412" : {
+            "description" : "Unable to find position for position specified"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/resetcursor/{timestamp}" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Reset subscription to message position closest to absolute timestamp (in ms).",
+        "description" : "It fence cursor and disconnects all active consumers before reseting cursor.",
+        "operationId" : "resetCursor",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Subscription to reset position on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "timestamp",
+          "in" : "path",
+          "description" : "time in minutes to reset back to (or minutes, hours,days,weeks eg:100m, 3h, 2d, 5w)",
+          "required" : true,
+          "type" : "integer",
+          "format" : "int64"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic/Subscription does not exist"
+          },
+          "405" : {
+            "description" : "Method Not Allowed"
+          },
+          "412" : {
+            "description" : "Failed to reset cursor on subscription or Unable to find position for timestamp specified"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/skip/{numMessages}" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Skipping messages on a topic subscription.",
+        "description" : "",
+        "operationId" : "skipMessages",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Name of subscription",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "numMessages",
+          "in" : "path",
+          "description" : "The number of messages to skip",
+          "required" : true,
+          "type" : "integer",
+          "default" : 0,
+          "format" : "int32"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Skipping messages on a partitioned topic is not allowed"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subName}/skip_all" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Skip all messages on a topic subscription.",
+        "description" : "Completely clears the backlog on the subscription.",
+        "operationId" : "skipAllMessages",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subName",
+          "in" : "path",
+          "description" : "Name of subscription",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic or subscription does not exist"
+          },
+          "405" : {
+            "description" : "Operation not allowed on non-persistent topic"
+          },
+          "412" : {
+            "description" : "Can't find owner for topic"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscription/{subscriptionName}" : {
+      "put" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Reset subscription to message position closest to given position.",
+        "description" : "Creates a subscription on the topic at the specified message id",
+        "operationId" : "createSubscription",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "subscriptionName",
+          "in" : "path",
+          "description" : "Subscription to create position on",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "messageId where to create the subscription. It can be 'latest', 'earliest' or (ledgerId:entryId)",
+          "required" : false,
+          "type" : "boolean",
+          "default" : "latest",
+          "enum" : [ "latest", "earliest", "ledgerId:entryId" ]
+        }, {
+          "name" : "replicated",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean"
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic/Subscription does not exist"
+          },
+          "405" : {
+            "description" : "Not supported for partitioned topics"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/subscriptions" : {
+      "get" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Get the list of persistent subscriptions for a given topic.",
+        "description" : "",
+        "operationId" : "getSubscriptions",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/terminate" : {
+      "post" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Terminate a topic. A topic that is terminated will not accept any more messages to be published and will let consumer to drain existing messages in backlog",
+        "description" : "",
+        "operationId" : "terminate",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/MessageId"
+            }
+          },
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant orsubscriber is not authorized to access this operation"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "405" : {
+            "description" : "Termination of a partitioned topic is not allowed"
+          },
+          "412" : {
+            "description" : "Topic name is not valid"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/persistent/{tenant}/{namespace}/{topic}/unload" : {
+      "put" : {
+        "tags" : [ "persistent topic" ],
+        "summary" : "Unload a topic",
+        "description" : "",
+        "operationId" : "unloadTopic",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "Specify the tenant",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "Specify the namespace",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "description" : "Specify topic name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "description" : "Is authentication required to perform this operation",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "401" : {
+            "description" : "Don't have permission to administrate resources on this tenant"
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Topic does not exist"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          },
+          "412" : {
+            "description" : "Topic name is not valid or can't find owner for topic"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Failed to validate global cluster configuration"
+          }
+        }
+      }
+    },
+    "/resource-quotas" : {
+      "get" : {
+        "tags" : [ "resource-quotas" ],
+        "summary" : "Get the default quota",
+        "description" : "",
+        "operationId" : "getDefaultResourceQuota",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "resource-quotas" ],
+        "summary" : "Set the default quota",
+        "description" : "",
+        "operationId" : "setDefaultResourceQuota",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          }
+        }
+      }
+    },
+    "/resource-quotas/{tenant}/{namespace}/{bundle}" : {
+      "get" : {
+        "tags" : [ "resource-quotas" ],
+        "summary" : "Get resource quota of a namespace bundle.",
+        "description" : "",
+        "operationId" : "getNamespaceBundleResourceQuota",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/ResourceQuota"
+            }
+          },
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "404" : {
+            "description" : "Namespace does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "resource-quotas" ],
+        "summary" : "Set resource quota on a namespace.",
+        "description" : "",
+        "operationId" : "setNamespaceBundleResourceQuota",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "resource-quotas" ],
+        "summary" : "Remove resource quota for a namespace.",
+        "description" : "",
+        "operationId" : "removeNamespaceBundleResourceQuota",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "bundle",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "Don't have admin permission"
+          },
+          "409" : {
+            "description" : "Concurrent modification"
+          }
+        }
+      }
+    },
+    "/schemas/{tenant}/{namespace}/{topic}/compatibility" : {
+      "post" : {
+        "tags" : [ "schemas" ],
+        "summary" : "test the schema compatibility",
+        "description" : "",
+        "operationId" : "testCompatibility",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "A JSON value presenting a schema playload. An example of the expected schema can be found down here.",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/PostSchemaPayload"
+          },
+          "x-examples" : {
+            "application/json" : "{\"type\": \"STRING\", \"schema\": \"\", \"properties\": { \"key1\" : \"value1\" + } }"
+          }
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/IsCompatibilityResponse"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Client is not authorized or Don't have admin permission"
+          },
+          "403" : {
+            "description" : "Client is not authenticated"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace or Topic doesn't exist"
+          },
+          "412" : {
+            "description" : "Failed to find the ownership for the topic"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          }
+        }
+      }
+    },
+    "/schemas/{tenant}/{namespace}/{topic}/schema" : {
+      "get" : {
+        "tags" : [ "schemas" ],
+        "summary" : "Get the schema of a topic",
+        "description" : "",
+        "operationId" : "getSchema",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/GetSchemaResponse"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Client is not authorized or Don't have admin permission"
+          },
+          "403" : {
+            "description" : "Client is not authenticated"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace or Topic doesn't exist; or Schema is not found for this topic"
+          },
+          "412" : {
+            "description" : "Failed to find the ownership for the topic"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "schemas" ],
+        "summary" : "Update the schema of a topic",
+        "description" : "",
+        "operationId" : "postSchema",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "A JSON value presenting a schema playload. An example of the expected schema can be found down here.",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/PostSchemaPayload"
+          },
+          "x-examples" : {
+            "application/json" : "{\"type\": \"STRING\", \"schema\": \"\", \"properties\": { \"key1\" : \"value1\" + } }"
+          }
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/PostSchemaResponse"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Client is not authorized or Don't have admin permission"
+          },
+          "403" : {
+            "description" : "Client is not authenticated"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace or Topic doesn't exist"
+          },
+          "409" : {
+            "description" : "Incompatible schema"
+          },
+          "412" : {
+            "description" : "Failed to find the ownership for the topic"
+          },
+          "422" : {
+            "description" : "Invalid schema data"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "schemas" ],
+        "summary" : "Delete the schema of a topic",
+        "description" : "",
+        "operationId" : "deleteSchema",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/DeleteSchemaResponse"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Client is not authorized or Don't have admin permission"
+          },
+          "403" : {
+            "description" : "Client is not authenticated"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace or Topic doesn't exist"
+          },
+          "412" : {
+            "description" : "Failed to find the ownership for the topic"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          }
+        }
+      }
+    },
+    "/schemas/{tenant}/{namespace}/{topic}/schema/{version}" : {
+      "get" : {
+        "tags" : [ "schemas" ],
+        "summary" : "Get the schema of a topic at a given version",
+        "description" : "",
+        "operationId" : "getSchema",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "version",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/GetSchemaResponse"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Client is not authorized or Don't have admin permission"
+          },
+          "403" : {
+            "description" : "Client is not authenticated"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace or Topic doesn't exist; or Schema is not found for this topic"
+          },
+          "412" : {
+            "description" : "Failed to find the ownership for the topic"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          }
+        }
+      }
+    },
+    "/schemas/{tenant}/{namespace}/{topic}/schemas" : {
+      "get" : {
+        "tags" : [ "schemas" ],
+        "summary" : "Get the all schemas of a topic",
+        "description" : "",
+        "operationId" : "getAllSchemas",
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/GetAllVersionsSchemaResponse"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Client is not authorized or Don't have admin permission"
+          },
+          "403" : {
+            "description" : "Client is not authenticated"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace or Topic doesn't exist; or Schema is not found for this topic"
+          },
+          "412" : {
+            "description" : "Failed to find the ownership for the topic"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          }
+        }
+      }
+    },
+    "/schemas/{tenant}/{namespace}/{topic}/version" : {
+      "post" : {
+        "tags" : [ "schemas" ],
+        "summary" : "get the version of the schema",
+        "description" : "",
+        "operationId" : "getVersionBySchema",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "topic",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "A JSON value presenting a schema playload. An example of the expected schema can be found down here.",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/PostSchemaPayload"
+          },
+          "x-examples" : {
+            "application/json" : "{\"type\": \"STRING\", \"schema\": \"\", \"properties\": { \"key1\" : \"value1\" + } }"
+          }
+        }, {
+          "name" : "authoritative",
+          "in" : "query",
+          "required" : false,
+          "type" : "boolean",
+          "default" : false
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/LongSchemaVersion"
+            }
+          },
+          "307" : {
+            "description" : "Current broker doesn't serve the namespace of this topic"
+          },
+          "401" : {
+            "description" : "Client is not authorized or Don't have admin permission"
+          },
+          "403" : {
+            "description" : "Client is not authenticated"
+          },
+          "404" : {
+            "description" : "Tenant or Namespace or Topic doesn't exist"
+          },
+          "412" : {
+            "description" : "Failed to find the ownership for the topic"
+          },
+          "422" : {
+            "description" : "Invalid schema data"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          }
+        }
+      }
+    },
+    "/tenants" : {
+      "get" : {
+        "tags" : [ "tenants" ],
+        "summary" : "Get the list of existing tenants.",
+        "description" : "",
+        "operationId" : "getTenants",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            }
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "Tenant doesn't exist"
+          }
+        }
+      }
+    },
+    "/tenants/{tenant}" : {
+      "get" : {
+        "tags" : [ "tenants" ],
+        "summary" : "Get the admin configuration for a given tenant.",
+        "description" : "",
+        "operationId" : "getTenantAdmin",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/TenantInfo"
+            }
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "tenants" ],
+        "summary" : "Update the admins for a tenant.",
+        "description" : "This operation requires Pulsar super-user privileges.",
+        "operationId" : "updateTenant",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "TenantInfo",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/TenantInfo"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          },
+          "409" : {
+            "description" : "Tenant already exists"
+          },
+          "412" : {
+            "description" : "Clusters do not exist"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "tenants" ],
+        "summary" : "Create a new tenant.",
+        "description" : "This operation requires Pulsar super-user privileges.",
+        "operationId" : "createTenant",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant name",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "TenantInfo",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/TenantInfo"
+          }
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "409" : {
+            "description" : "Tenant already exists"
+          },
+          "412" : {
+            "description" : "Clusters do not exist"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "tenants" ],
+        "summary" : "Delete a tenant and all namespaces and topics under it.",
+        "description" : "",
+        "operationId" : "deleteTenant",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant name",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "Tenant does not exist"
+          },
+          "409" : {
+            "description" : "The tenant still has active namespaces"
+          }
+        }
+      }
+    }
+  },
+  "definitions" : {
+    "AllocatorStats" : {
+      "type" : "object",
+      "properties" : {
+        "numDirectArenas" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numHeapArenas" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numThreadLocalCaches" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "normalCacheSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "smallCacheSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "tinyCacheSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "directArenas" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/PoolArenaStats"
+          }
+        },
+        "heapArenas" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/PoolArenaStats"
+          }
+        }
+      }
+    },
+    "AuthPolicies" : {
+      "type" : "object",
+      "properties" : {
+        "namespace_auth" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "array",
+            "uniqueItems" : true,
+            "items" : {
+              "type" : "string",
+              "enum" : [ "produce", "consume", "functions" ]
+            }
+          }
+        },
+        "destination_auth" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object",
+            "additionalProperties" : {
+              "type" : "array",
+              "uniqueItems" : true,
+              "items" : {
+                "type" : "string",
+                "enum" : [ "produce", "consume", "functions" ]
+              }
+            }
+          }
+        },
+        "subscription_auth_roles" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "array",
+            "uniqueItems" : true,
+            "items" : {
+              "type" : "string"
+            }
+          }
+        }
+      }
+    },
+    "AutoFailoverPolicyData" : {
+      "type" : "object",
+      "properties" : {
+        "policy_type" : {
+          "type" : "string",
+          "description" : "The auto failover policy type",
+          "enum" : [ "min_available" ]
+        },
+        "parameters" : {
+          "type" : "object",
+          "example" : "{\n  \"min_limit\": 3,\n  \"usage_threshold\": 80\n}\n",
+          "description" : "The parameters applied to the auto failover policy specified by `policy_type`.\nThe parameters for 'min_available' are :\n  - 'min_limit': the limit of minimal number of available brokers in primary group before auto failover\n  - 'usage_threshold': the resource usage threshold. If the usage of a broker is beyond this value, it would be marked as unavailable\n",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        }
+      },
+      "description" : "The auto failover policy configuration data"
+    },
+    "BacklogQuota" : {
+      "type" : "object",
+      "properties" : {
+        "limit" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "policy" : {
+          "type" : "string",
+          "enum" : [ "producer_request_hold", "producer_exception", "consumer_backlog_eviction" ]
+        }
+      }
+    },
+    "BookieAffinityGroupData" : {
+      "type" : "object",
+      "properties" : {
+        "bookkeeperAffinityGroupPrimary" : {
+          "type" : "string"
+        },
+        "bookkeeperAffinityGroupSecondary" : {
+          "type" : "string"
+        }
+      }
+    },
+    "BookieInfo" : {
+      "type" : "object",
+      "properties" : {
+        "rack" : {
+          "type" : "string"
+        },
+        "hostname" : {
+          "type" : "string"
+        }
+      }
+    },
+    "BrokerNamespaceIsolationData" : {
+      "type" : "object",
+      "properties" : {
+        "brokerName" : {
+          "type" : "string",
+          "example" : "broker1:8080",
+          "description" : "The broker name"
+        },
+        "policyName" : {
+          "type" : "string",
+          "example" : "my-policy",
+          "description" : "Policy name"
+        },
+        "isPrimary" : {
+          "type" : "boolean",
+          "example" : false,
+          "description" : "Is Primary broker"
+        },
+        "namespaceRegex" : {
+          "type" : "array",
+          "description" : "The namespace-isolation policies attached to this broker",
+          "items" : {
+            "type" : "string"
+          }
+        }
+      },
+      "description" : "The namespace isolation data for a given broker"
+    },
+    "BundlesData" : {
+      "type" : "object",
+      "properties" : {
+        "boundaries" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "numBundles" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "ClusterData" : {
+      "type" : "object",
+      "properties" : {
+        "serviceUrl" : {
+          "type" : "string",
+          "example" : "http://pulsar.example.com:8080",
+          "description" : "The HTTP rest service URL (for admin operations)"
+        },
+        "serviceUrlTls" : {
+          "type" : "string",
+          "example" : "https://pulsar.example.com:8443",
+          "description" : "The HTTPS rest service URL (for admin operations)"
+        },
+        "brokerServiceUrl" : {
+          "type" : "string",
+          "example" : "pulsar://pulsar.example.com:6650",
+          "description" : "The broker service url (for produce and consume operations)"
+        },
+        "brokerServiceUrlTls" : {
+          "type" : "string",
+          "example" : "pulsar+ssl://pulsar.example.com:6651",
+          "description" : "The secured broker service url (for produce and consume operations)"
+        },
+        "peerClusterNames" : {
+          "type" : "array",
+          "description" : "A set of peer cluster names",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        }
+      },
+      "description" : "The configuration data for a cluster"
+    },
+    "ConsumerStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateRedeliver" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "consumerName" : {
+          "type" : "string"
+        },
+        "availablePermits" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "unackedMessages" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "blockedConsumerOnUnackedMsgs" : {
+          "type" : "boolean"
+        },
+        "metadata" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "address" : {
+          "type" : "string"
+        },
+        "connectedSince" : {
+          "type" : "string"
+        },
+        "clientVersion" : {
+          "type" : "string"
+        }
+      }
+    },
+    "CursorDetails" : {
+      "type" : "object",
+      "properties" : {
+        "cursorBacklog" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cursorLedgerId" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "CursorStats" : {
+      "type" : "object",
+      "properties" : {
+        "markDeletePosition" : {
+          "type" : "string"
+        },
+        "readPosition" : {
+          "type" : "string"
+        },
+        "waitingReadOp" : {
+          "type" : "boolean"
+        },
+        "pendingReadOps" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "messagesConsumedCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cursorLedger" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cursorLedgerLastEntry" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "individuallyDeletedMessages" : {
+          "type" : "string"
+        },
+        "lastLedgerSwitchTimestamp" : {
+          "type" : "string"
+        },
+        "state" : {
+          "type" : "string"
+        },
+        "numberOfEntriesSinceFirstNotAckedMessage" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "totalNonContiguousDeletedMessagesRange" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "integer",
+            "format" : "int64"
+          }
+        }
+      }
+    },
+    "DeleteSchemaResponse" : {
+      "type" : "object",
+      "properties" : {
+        "version" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "DispatchRate" : {
+      "type" : "object",
+      "properties" : {
+        "dispatchThrottlingRateInMsg" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "dispatchThrottlingRateInByte" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "relativeToPublishRate" : {
+          "type" : "boolean"
+        },
+        "ratePeriodInSecond" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "FailureDomain" : {
+      "type" : "object",
+      "properties" : {
+        "brokers" : {
+          "type" : "array",
+          "example" : "[ 'broker-1', 'broker-2' ]",
+          "description" : "The collection of brokers in the same failure domain",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        }
+      },
+      "description" : "The data of a failure domain configuration in a cluster"
+    },
+    "GetAllVersionsSchemaResponse" : {
+      "type" : "object",
+      "properties" : {
+        "getSchemaResponses" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/GetSchemaResponse"
+          }
+        }
+      }
+    },
+    "GetSchemaResponse" : {
+      "type" : "object",
+      "properties" : {
+        "version" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "type" : {
+          "type" : "string",
+          "enum" : [ "NONE", "STRING", "JSON", "PROTOBUF", "AVRO", "BOOLEAN", "INT8", "INT16", "INT32", "INT64", "FLOAT", "DOUBLE", "DATE", "TIME", "TIMESTAMP", "KEY_VALUE", "BYTES", "AUTO", "AUTO_CONSUME", "AUTO_PUBLISH" ]
+        },
+        "timestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "data" : {
+          "type" : "string"
+        },
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "InternalConfigurationData" : {
+      "type" : "object",
+      "properties" : {
+        "zookeeperServers" : {
+          "type" : "string"
+        },
+        "configurationStoreServers" : {
+          "type" : "string"
+        },
+        "ledgersRootPath" : {
+          "type" : "string"
+        },
+        "stateStorageServiceUrl" : {
+          "type" : "string"
+        }
+      }
+    },
+    "IsCompatibilityResponse" : {
+      "type" : "object",
+      "properties" : {
+        "schemaCompatibilityStrategy" : {
+          "type" : "string"
+        },
+        "compatibility" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "LedgerDetails" : {
+      "type" : "object",
+      "properties" : {
+        "entries" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "timestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "size" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "ledgerId" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "LedgerInfo" : {
+      "type" : "object",
+      "properties" : {
+        "ledgerId" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "entries" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "size" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "offloaded" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "LoadReport" : {
+      "type" : "object",
+      "properties" : {
+        "name" : {
+          "type" : "string"
+        },
+        "brokerVersionString" : {
+          "type" : "string"
+        },
+        "webServiceUrl" : {
+          "type" : "string"
+        },
+        "webServiceUrlTls" : {
+          "type" : "string"
+        },
+        "pulsarServiceUrl" : {
+          "type" : "string"
+        },
+        "pulsarServiceUrlTls" : {
+          "type" : "string"
+        },
+        "persistentTopicsEnabled" : {
+          "type" : "boolean"
+        },
+        "nonPersistentTopicsEnabled" : {
+          "type" : "boolean"
+        },
+        "timestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "numTopics" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numConsumers" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numProducers" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numBundles" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "protocols" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "systemResourceUsage" : {
+          "$ref" : "#/definitions/SystemResourceUsage"
+        },
+        "bundleStats" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/NamespaceBundleStats"
+          }
+        },
+        "bundleGains" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "bundleLosses" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "allocatedCPU" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "allocatedMemory" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "allocatedBandwidthIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "allocatedBandwidthOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "allocatedMsgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "allocatedMsgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "preAllocatedCPU" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "preAllocatedMemory" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "preAllocatedBandwidthIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "preAllocatedBandwidthOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "preAllocatedMsgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "preAllocatedMsgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "cpu" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "memory" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "directMemory" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "bandwidthIn" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "bandwidthOut" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "lastUpdate" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "underLoaded" : {
+          "type" : "boolean"
+        },
+        "overLoaded" : {
+          "type" : "boolean"
+        },
+        "loadReportType" : {
+          "type" : "string"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        }
+      }
+    },
+    "LongRunningProcessStatus" : {
+      "type" : "object",
+      "properties" : {
+        "status" : {
+          "type" : "string",
+          "enum" : [ "NOT_RUN", "RUNNING", "SUCCESS", "ERROR" ]
+        },
+        "lastError" : {
+          "type" : "string"
+        }
+      }
+    },
+    "LongSchemaVersion" : {
+      "type" : "object",
+      "properties" : {
+        "version" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "MessageId" : {
+      "type" : "object"
+    },
+    "MessageIdImpl" : {
+      "type" : "object",
+      "properties" : {
+        "ledgerId" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "entryId" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "partitionIndex" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "Metrics" : {
+      "type" : "object",
+      "properties" : {
+        "metrics" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "dimensions" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "NamespaceBundleStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "consumerCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "producerCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "topics" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cacheSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "NamespaceIsolationData" : {
+      "type" : "object",
+      "properties" : {
+        "namespaces" : {
+          "type" : "array",
+          "description" : "The list of namespaces to apply this namespace isolation data",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "primary" : {
+          "type" : "array",
+          "description" : "The list of secondary brokers for serving the list of namespaces in this isolation policy",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "auto_failover_policy" : {
+          "example" : "{  \"policy_type\": \"min_available\"  \"parameters\": {    \"\": \"\"  }}",
+          "description" : "The data of auto-failover policy configuration",
+          "$ref" : "#/definitions/AutoFailoverPolicyData"
+        }
+      },
+      "description" : "The data of namespace isolation configuration"
+    },
+    "NamespaceOwnershipStatus" : {
+      "type" : "object",
+      "properties" : {
+        "broker_assignment" : {
+          "type" : "string",
+          "enum" : [ "primary", "secondary", "shared" ]
+        },
+        "is_controlled" : {
+          "type" : "boolean"
+        },
+        "is_active" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "NonPersistentPublisherStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "averageMsgSize" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "producerId" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "metadata" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "msgDropRate" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "address" : {
+          "type" : "string"
+        },
+        "producerName" : {
+          "type" : "string"
+        },
+        "connectedSince" : {
+          "type" : "string"
+        },
+        "clientVersion" : {
+          "type" : "string"
+        }
+      }
+    },
+    "NonPersistentReplicatorStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateExpired" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "replicationBacklog" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "connected" : {
+          "type" : "boolean"
+        },
+        "replicationDelayInSeconds" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "inboundConnection" : {
+          "type" : "string"
+        },
+        "inboundConnectedSince" : {
+          "type" : "string"
+        },
+        "outboundConnection" : {
+          "type" : "string"
+        },
+        "outboundConnectedSince" : {
+          "type" : "string"
+        },
+        "msgDropRate" : {
+          "type" : "number",
+          "format" : "double"
+        }
+      }
+    },
+    "NonPersistentSubscriptionStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateRedeliver" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgBacklog" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "blockedSubscriptionOnUnackedMsgs" : {
+          "type" : "boolean"
+        },
+        "msgDelayed" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "unackedMessages" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "type" : {
+          "type" : "string",
+          "enum" : [ "Exclusive", "Shared", "Failover", "Key_Shared" ]
+        },
+        "activeConsumerName" : {
+          "type" : "string"
+        },
+        "msgRateExpired" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "lastExpireTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "consumers" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConsumerStats"
+          }
+        },
+        "isReplicated" : {
+          "type" : "boolean"
+        },
+        "msgDropRate" : {
+          "type" : "number",
+          "format" : "double"
+        }
+      }
+    },
+    "NonPersistentTopicStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "averageMsgSize" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "storageSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "backlogSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "publishers" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/NonPersistentPublisherStats"
+          }
+        },
+        "subscriptions" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/NonPersistentSubscriptionStats"
+          }
+        },
+        "replication" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/NonPersistentReplicatorStats"
+          }
+        },
+        "deduplicationStatus" : {
+          "type" : "string"
+        },
+        "bytesInCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgInCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgDropRate" : {
+          "type" : "number",
+          "format" : "double"
+        }
+      }
+    },
+    "OffloadProcessStatus" : {
+      "type" : "object",
+      "properties" : {
+        "status" : {
+          "type" : "string",
+          "enum" : [ "NOT_RUN", "RUNNING", "SUCCESS", "ERROR" ]
+        },
+        "lastError" : {
+          "type" : "string"
+        },
+        "firstUnoffloadedMessage" : {
+          "$ref" : "#/definitions/MessageIdImpl"
+        }
+      }
+    },
+    "OutputStream" : {
+      "type" : "object"
+    },
+    "PartitionedTopicMetadata" : {
+      "type" : "object",
+      "properties" : {
+        "partitions" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "PendingBookieOpsStats" : {
+      "type" : "object",
+      "properties" : {
+        "dataLedgerOpenOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "dataLedgerCloseOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "dataLedgerCreateOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "dataLedgerDeleteOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cursorLedgerOpenOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cursorLedgerCloseOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cursorLedgerCreateOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "cursorLedgerDeleteOp" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "PersistencePolicies" : {
+      "type" : "object",
+      "properties" : {
+        "bookkeeperEnsemble" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "bookkeeperWriteQuorum" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "bookkeeperAckQuorum" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "managedLedgerMaxMarkDeleteRate" : {
+          "type" : "number",
+          "format" : "double"
+        }
+      }
+    },
+    "PersistentOfflineTopicStats" : {
+      "type" : "object",
+      "properties" : {
+        "storageSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "totalMessages" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "messageBacklog" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "brokerName" : {
+          "type" : "string"
+        },
+        "topicName" : {
+          "type" : "string"
+        },
+        "dataLedgerDetails" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/LedgerDetails"
+          }
+        },
+        "cursorDetails" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/CursorDetails"
+          }
+        },
+        "statGeneratedAt" : {
+          "type" : "string",
+          "format" : "date-time"
+        }
+      }
+    },
+    "PersistentTopicInternalStats" : {
+      "type" : "object",
+      "properties" : {
+        "entriesAddedCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numberOfEntries" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "totalSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "currentLedgerEntries" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "currentLedgerSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastLedgerCreatedTimestamp" : {
+          "type" : "string"
+        },
+        "lastLedgerCreationFailureTimestamp" : {
+          "type" : "string"
+        },
+        "waitingCursorsCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "pendingAddEntriesCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "lastConfirmedEntry" : {
+          "type" : "string"
+        },
+        "state" : {
+          "type" : "string"
+        },
+        "ledgers" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/LedgerInfo"
+          }
+        },
+        "cursors" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/CursorStats"
+          }
+        }
+      }
+    },
+    "Policies" : {
+      "type" : "object",
+      "properties" : {
+        "auth_policies" : {
+          "$ref" : "#/definitions/AuthPolicies"
+        },
+        "replication_clusters" : {
+          "type" : "array",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "bundles" : {
+          "$ref" : "#/definitions/BundlesData"
+        },
+        "backlog_quota_map" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/BacklogQuota"
+          }
+        },
+        "topicDispatchRate" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/DispatchRate"
+          }
+        },
+        "subscriptionDispatchRate" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/DispatchRate"
+          }
+        },
+        "replicatorDispatchRate" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/DispatchRate"
+          }
+        },
+        "clusterSubscribeRate" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/SubscribeRate"
+          }
+        },
+        "persistence" : {
+          "$ref" : "#/definitions/PersistencePolicies"
+        },
+        "deduplicationEnabled" : {
+          "type" : "boolean"
+        },
+        "publishMaxMessageRate" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/PublishRate"
+          }
+        },
+        "latency_stats_sample_rate" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "integer",
+            "format" : "int32"
+          }
+        },
+        "message_ttl_in_seconds" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "retention_policies" : {
+          "$ref" : "#/definitions/RetentionPolicies"
+        },
+        "deleted" : {
+          "type" : "boolean"
+        },
+        "antiAffinityGroup" : {
+          "type" : "string"
+        },
+        "encryption_required" : {
+          "type" : "boolean"
+        },
+        "subscription_auth_mode" : {
+          "type" : "string",
+          "enum" : [ "None", "Prefix" ]
+        },
+        "max_producers_per_topic" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "max_consumers_per_topic" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "max_consumers_per_subscription" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "compaction_threshold" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "offload_threshold" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "offload_deletion_lag_ms" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "schema_auto_update_compatibility_strategy" : {
+          "type" : "string",
+          "enum" : [ "AutoUpdateDisabled", "Backward", "Forward", "Full", "AlwaysCompatible", "BackwardTransitive", "ForwardTransitive", "FullTransitive" ]
+        },
+        "schema_compatibility_strategy" : {
+          "type" : "string",
+          "enum" : [ "UNDEFINED", "ALWAYS_INCOMPATIBLE", "ALWAYS_COMPATIBLE", "BACKWARD", "FORWARD", "FULL", "BACKWARD_TRANSITIVE", "FORWARD_TRANSITIVE", "FULL_TRANSITIVE" ]
+        },
+        "is_allow_auto_update_schema" : {
+          "type" : "boolean"
+        },
+        "schema_validation_enforced" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "PoolArenaStats" : {
+      "type" : "object",
+      "properties" : {
+        "numTinySubpages" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numSmallSubpages" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numChunkLists" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "tinySubpages" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/PoolSubpageStats"
+          }
+        },
+        "smallSubpages" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/PoolSubpageStats"
+          }
+        },
+        "chunkLists" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/PoolChunkListStats"
+          }
+        },
+        "numAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numTinyAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numSmallAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numNormalAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numHugeAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numDeallocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numTinyDeallocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numSmallDeallocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numNormalDeallocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numHugeDeallocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numActiveAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numActiveTinyAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numActiveSmallAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numActiveNormalAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numActiveHugeAllocations" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "PoolChunkListStats" : {
+      "type" : "object",
+      "properties" : {
+        "minUsage" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "maxUsage" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "chunks" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/PoolChunkStats"
+          }
+        }
+      }
+    },
+    "PoolChunkStats" : {
+      "type" : "object",
+      "properties" : {
+        "usage" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "chunkSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "freeBytes" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "PoolSubpageStats" : {
+      "type" : "object",
+      "properties" : {
+        "maxNumElements" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numAvailable" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "elementSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "pageSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "PostSchemaPayload" : {
+      "type" : "object",
+      "properties" : {
+        "type" : {
+          "type" : "string"
+        },
+        "schema" : {
+          "type" : "string"
+        },
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "PostSchemaResponse" : {
+      "type" : "object",
+      "properties" : {
+        "version" : {
+          "$ref" : "#/definitions/SchemaVersion"
+        }
+      }
+    },
+    "PublishRate" : {
+      "type" : "object",
+      "properties" : {
+        "publishThrottlingRateInMsg" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "publishThrottlingRateInByte" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "PublisherStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "averageMsgSize" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "producerId" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "metadata" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "address" : {
+          "type" : "string"
+        },
+        "producerName" : {
+          "type" : "string"
+        },
+        "connectedSince" : {
+          "type" : "string"
+        },
+        "clientVersion" : {
+          "type" : "string"
+        }
+      }
+    },
+    "ReplicatorStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateExpired" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "replicationBacklog" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "connected" : {
+          "type" : "boolean"
+        },
+        "replicationDelayInSeconds" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "inboundConnection" : {
+          "type" : "string"
+        },
+        "inboundConnectedSince" : {
+          "type" : "string"
+        },
+        "outboundConnection" : {
+          "type" : "string"
+        },
+        "outboundConnectedSince" : {
+          "type" : "string"
+        }
+      }
+    },
+    "ResourceDescription" : {
+      "type" : "object",
+      "properties" : {
+        "usagePct" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "resourceUsage" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/ResourceUsage"
+          }
+        }
+      }
+    },
+    "ResourceQuota" : {
+      "type" : "object",
+      "properties" : {
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "bandwidthIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "bandwidthOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "memory" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "dynamic" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ResourceUnit" : {
+      "type" : "object",
+      "properties" : {
+        "resourceId" : {
+          "type" : "string"
+        },
+        "availableResource" : {
+          "$ref" : "#/definitions/ResourceDescription"
+        }
+      }
+    },
+    "ResourceUsage" : {
+      "type" : "object",
+      "properties" : {
+        "usage" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "limit" : {
+          "type" : "number",
+          "format" : "double"
+        }
+      }
+    },
+    "RetentionPolicies" : {
+      "type" : "object",
+      "properties" : {
+        "retentionTimeInMinutes" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "retentionSizeInMB" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "SchemaVersion" : {
+      "type" : "object"
+    },
+    "SubscribeRate" : {
+      "type" : "object",
+      "properties" : {
+        "subscribeThrottlingRatePerConsumer" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "ratePeriodInSecond" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "SubscriptionStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateRedeliver" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgBacklog" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "blockedSubscriptionOnUnackedMsgs" : {
+          "type" : "boolean"
+        },
+        "msgDelayed" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "unackedMessages" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "type" : {
+          "type" : "string",
+          "enum" : [ "Exclusive", "Shared", "Failover", "Key_Shared" ]
+        },
+        "activeConsumerName" : {
+          "type" : "string"
+        },
+        "msgRateExpired" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "lastExpireTimestamp" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "consumers" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ConsumerStats"
+          }
+        },
+        "isReplicated" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "SystemResourceUsage" : {
+      "type" : "object",
+      "properties" : {
+        "bandwidthIn" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "bandwidthOut" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "cpu" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "memory" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        },
+        "directMemory" : {
+          "$ref" : "#/definitions/ResourceUsage"
+        }
+      }
+    },
+    "TenantInfo" : {
+      "type" : "object",
+      "properties" : {
+        "adminRoles" : {
+          "type" : "array",
+          "description" : "Comma separated list of auth principal allowed to administrate the tenant.",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "allowedClusters" : {
+          "type" : "array",
+          "description" : "Comma separated allowed clusters.",
+          "uniqueItems" : true,
+          "items" : {
+            "type" : "string"
+          }
+        }
+      },
+      "description" : "Information of adminRoles and allowedClusters for tenant"
+    },
+    "TopicStats" : {
+      "type" : "object",
+      "properties" : {
+        "msgRateIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgRateOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "averageMsgSize" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "storageSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "backlogSize" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "publishers" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/PublisherStats"
+          }
+        },
+        "subscriptions" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/SubscriptionStats"
+          }
+        },
+        "replication" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/ReplicatorStats"
+          }
+        },
+        "deduplicationStatus" : {
+          "type" : "string"
+        },
+        "bytesInCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "msgInCounter" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/site2/website/static/swagger/2.5.0/swaggerfunctions.json b/site2/website/static/swagger/2.5.0/swaggerfunctions.json
new file mode 100644
index 0000000000000..8db0dc97fdf3d
--- /dev/null
+++ b/site2/website/static/swagger/2.5.0/swaggerfunctions.json
@@ -0,0 +1,1499 @@
+{
+  "swagger" : "2.0",
+  "info" : {
+    "description" : "This provides the REST API for Pulsar Functions operations",
+    "version" : "v3",
+    "title" : "Pulsar Functions REST API",
+    "license" : {
+      "name" : "Apache 2.0",
+      "url" : "http://www.apache.org/licenses/LICENSE-2.0.html"
+    }
+  },
+  "basePath" : "/admin/v3",
+  "tags" : [ {
+    "name" : "functions"
+  } ],
+  "schemes" : [ "http", "https" ],
+  "paths" : {
+    "/functions/connectors" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Fetches a list of supported Pulsar IO connectors currently running in cluster mode",
+        "description" : "",
+        "operationId" : "getConnectorsList",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "object"
+              }
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          }
+        },
+        "deprecated" : true
+      }
+    },
+    "/functions/{tenant}/{namespace}" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Lists all Pulsar Functions currently deployed in a given namespace",
+        "description" : "",
+        "operationId" : "listFunctions",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "string"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Fetches information about a Pulsar Function currently running in cluster mode",
+        "description" : "",
+        "operationId" : "getFunctionInfo",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/FunctionConfig"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The Pulsar Function doesn't exist"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Creates a new Pulsar Function in cluster mode",
+        "description" : "",
+        "operationId" : "registerFunction",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "A JSON value presenting configuration payload of a Pulsar Function. An example of the expected Pulsar Function can be found here.  \n- **autoAck**  \n  Whether or not the framework acknowledges messages automatically.  \n- **runtime**  \n  What is the runtime of the Pulsar Function. Possible Values: [JAVA, PYTHON, GO]  \n- **resources**  \n  The size of the system resources allowed by the Pulsar Function runtime. The resources include: cpu, ram, disk.  \n- **className**  \n  The class name of a Pulsar Function.  \n- **customSchemaInputs**  \n  The map of input topics to Schema class names (specified as a JSON object).  \n- **customSerdeInputs**  \n  The map of input topics to SerDe class names (specified as a JSON object).  \n- **deadLetterTopic**  \n  Messages that are not processed successfully are sent to `deadLetterTopic`.  \n- **runtimeFlags**  \n  Any flags that you want to pass to the runtime. Note that in thread mode, these flags have no impact.  \n- **fqfn**  \n  The Fully Qualified Function Name (FQFN) for the Pulsar Function.  \n- **inputSpecs**  \n   The map of input topics to its consumer configuration, each configuration has schema of    {\"schemaType\": \"type-x\", \"serdeClassName\": \"name-x\", \"isRegexPattern\": true, \"receiverQueueSize\": 5}  \n- **inputs**  \n  The input topic or topics (multiple topics can be specified as a comma-separated list) of a Pulsar Function.  \n- **jar**  \n  Path to the JAR file for the Pulsar Function (if the Pulsar Function is written in Java).   It also supports URL path [http/https/file (file protocol assumes that file   already exists on worker host)] from which worker can download the package.  \n- **py**  \n  Path to the main Python file or Python wheel file for the Pulsar Function (if the Pulsar Function is written in Python).  \n- **go**  \n  Path to the main Go executable binary for the Pulsar Function (if the Pulsar Function is written in Go).  \n- **logTopic**  \n  The topic to which the logs of a Pulsar Function are produced.  \n- **maxMessageRetries**  \n  How many times should we try to process a message before giving up.  \n- **output**  \n  The output topic of a Pulsar Function (If none is specified, no output is written).  \n- **outputSerdeClassName**  \n  The SerDe class to be used for messages output by the Pulsar Function.  \n- **parallelism**  \n  The parallelism factor of a Pulsar Function (i.e. the number of a Pulsar Function instances to run).  \n- **processingGuarantees**  \n  The processing guarantees (that is, delivery semantics) applied to the Pulsar Function.  Possible Values: [ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE]  \n- **retainOrdering**  \n  Function consumes and processes messages in order.  \n- **outputSchemaType**  \n   Represents either a builtin schema type (for example: 'avro', 'json', ect) or the class name for a Schema implementation.- **subName**  \n  Pulsar source subscription name. User can specify a subscription-name for the input-topic consumer.  \n- **windowConfig**  \n  The window configuration of a Pulsar Function.  \n- **timeoutMs**  \n  The message timeout in milliseconds.  \n- **topicsPattern**  \n  The topic pattern to consume from a list of topics under a namespace that match the pattern.  [input] and [topic-pattern] are mutually exclusive. Add SerDe class name for a   pattern in customSerdeInputs (supported for java fun only)  \n- **userConfig**  \n  A map of user-defined configurations (specified as a JSON object).  \n- **secrets**  \n  This is a map of secretName(that is how the secret is going to be accessed in the Pulsar Function via context) to an object that  encapsulates how the secret is fetched by the underlying secrets provider. The type of an value here can be found by the  SecretProviderConfigurator.getSecretObjectType() method. \n- **cleanupSubscription**  \n  Whether the subscriptions of a Pulsar Function created or used should be deleted when the Pulsar Function is deleted.  \n",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/FunctionConfig"
+          },
+          "x-examples" : {
+            "application/json" : "{\n  \"inputs\": persistent://public/default/input-topic,\n  \"parallelism\": 4\n  \"output\": persistent://public/default/output-topic\n  \"log-topic\": persistent://public/default/log-topic\n  \"classname\": org.example.test.ExclamationFunction\n  \"jar\": java-function-1.0-SNAPSHOT.jar\n}"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Pulsar Function successfully created"
+          },
+          "400" : {
+            "description" : "Invalid request (The Pulsar Function already exists, etc.)"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "functions" ],
+        "summary" : "Updates a Pulsar Function currently running in cluster mode",
+        "description" : "",
+        "operationId" : "updateFunction",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "A JSON value presenting configuration payload of a Pulsar Function. An example of the expected Pulsar Function can be found here.  \n- **autoAck**  \n  Whether or not the framework acknowledges messages automatically.  \n- **runtime**  \n  What is the runtime of the Pulsar Function. Possible Values: [JAVA, PYTHON, GO]  \n- **resources**  \n  The size of the system resources allowed by the Pulsar Function runtime. The resources include: cpu, ram, disk.  \n- **className**  \n  The class name of a Pulsar Function.  \n- **customSchemaInputs**  \n  The map of input topics to Schema class names (specified as a JSON object).  \n- **customSerdeInputs**  \n  The map of input topics to SerDe class names (specified as a JSON object).  \n- **deadLetterTopic**  \n  Messages that are not processed successfully are sent to `deadLetterTopic`.  \n- **runtimeFlags**  \n  Any flags that you want to pass to the runtime. Note that in thread mode, these flags have no impact.  \n- **fqfn**  \n  The Fully Qualified Function Name (FQFN) for the Pulsar Function.  \n- **inputSpecs**  \n   The map of input topics to its consumer configuration, each configuration has schema of    {\"schemaType\": \"type-x\", \"serdeClassName\": \"name-x\", \"isRegexPattern\": true, \"receiverQueueSize\": 5}  \n- **inputs**  \n  The input topic or topics (multiple topics can be specified as a comma-separated list) of a Pulsar Function.  \n- **jar**  \n  Path to the JAR file for the Pulsar Function (if the Pulsar Function is written in Java).   It also supports URL path [http/https/file (file protocol assumes that file   already exists on worker host)] from which worker can download the package.  \n- **py**  \n  Path to the main Python file or Python wheel file for the Pulsar Function (if the Pulsar Function is written in Python).  \n- **go**  \n  Path to the main Go executable binary for the Pulsar Function (if the Pulsar Function is written in Go).  \n- **logTopic**  \n  The topic to which the logs of a Pulsar Function are produced.  \n- **maxMessageRetries**  \n  How many times should we try to process a message before giving up.  \n- **output**  \n  The output topic of a Pulsar Function (If none is specified, no output is written).  \n- **outputSerdeClassName**  \n  The SerDe class to be used for messages output by the Pulsar Function.  \n- **parallelism**  \n  The parallelism factor of a Pulsar Function (i.e. the number of a Pulsar Function instances to run).  \n- **processingGuarantees**  \n  The processing guarantees (that is, delivery semantics) applied to the Pulsar Function.  Possible Values: [ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE]  \n- **retainOrdering**  \n  Function consumes and processes messages in order.  \n- **outputSchemaType**  \n   Represents either a builtin schema type (for example: 'avro', 'json', ect) or the class name for a Schema implementation.- **subName**  \n  Pulsar source subscription name. User can specify a subscription-name for the input-topic consumer.  \n- **windowConfig**  \n  The window configuration of a Pulsar Function.  \n- **timeoutMs**  \n  The message timeout in milliseconds.  \n- **topicsPattern**  \n  The topic pattern to consume from a list of topics under a namespace that match the pattern.  [input] and [topic-pattern] are mutually exclusive. Add SerDe class name for a   pattern in customSerdeInputs (supported for java fun only)  \n- **userConfig**  \n  A map of user-defined configurations (specified as a JSON object).  \n- **secrets**  \n  This is a map of secretName(that is how the secret is going to be accessed in the Pulsar Function via context) to an object that  encapsulates how the secret is fetched by the underlying secrets provider. The type of an value here can be found by the  SecretProviderConfigurator.getSecretObjectType() method. \n- **cleanupSubscription**  \n  Whether the subscriptions of a Pulsar Function created or used should be deleted when the Pulsar Function is deleted.  \n",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/FunctionConfig"
+          },
+          "x-examples" : {
+            "application/json" : "{\n  \"inputs\": persistent://public/default/input-topic,\n  \"parallelism\": 4\n  \"output\": persistent://public/default/output-topic\n  \"log-topic\": persistent://public/default/log-topic\n  \"classname\": org.example.test.ExclamationFunction\n  \"jar\": java-function-1.0-SNAPSHOT.jar\n}"
+          }
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The update options is for the Pulsar Function that needs to be updated.",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/UpdateOptions"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Pulsar Function successfully updated"
+          },
+          "400" : {
+            "description" : "Invalid request (The Pulsar Function doesn't exist, etc.)"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "functions" ],
+        "summary" : "Deletes a Pulsar Function currently running in cluster mode",
+        "description" : "",
+        "operationId" : "deregisterFunction",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "The Pulsar Function was successfully deleted"
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The Pulsar Function doesn't exist"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/restart" : {
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Restart all instances of a Pulsar Function",
+        "description" : "",
+        "operationId" : "restartFunction",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/start" : {
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Start all instances of a Pulsar Function",
+        "description" : "",
+        "operationId" : "startFunction",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/state/{key}" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Fetch the current state associated with a Pulsar Function",
+        "description" : "",
+        "operationId" : "getFunctionState",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "key",
+          "in" : "path",
+          "description" : "The stats key",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/FunctionState"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The key does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Put the state associated with a Pulsar Function",
+        "description" : "",
+        "operationId" : "putFunctionState",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "key",
+          "in" : "path",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/stats" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Displays the stats of a Pulsar Function",
+        "description" : "",
+        "operationId" : "getFunctionStats",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/FunctionStats"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The Pulsar Function doesn't exist"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/status" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Displays the status of a Pulsar Function",
+        "description" : "",
+        "operationId" : "getFunctionStatus",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/FunctionStatus"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The Pulsar Function doesn't exist"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/stop" : {
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Stop all instances of a Pulsar Function",
+        "description" : "",
+        "operationId" : "stopFunction",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/trigger" : {
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Triggers a Pulsar Function with a user-specified value or file data",
+        "description" : "",
+        "operationId" : "triggerFunction",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The value with which you want to trigger the Pulsar Function",
+          "required" : false,
+          "schema" : {
+            "type" : "string"
+          }
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The path to the file that contains the data with which you'd like to trigger the Pulsar Function",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/InputStream"
+          }
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "The specific topic name that the Pulsar Function consumes from which you want to inject the data to",
+          "required" : false,
+          "schema" : {
+            "type" : "string"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/Message"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/{instanceId}/restart" : {
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Restart an instance of a Pulsar Function",
+        "description" : "",
+        "operationId" : "restartFunction",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Function (if instance-id is not provided, all instances are restarted",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/{instanceId}/start" : {
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Start an instance of a Pulsar Function",
+        "description" : "",
+        "operationId" : "startFunction",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Function (if instance-id is not provided, all instances sre started. ",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/{instanceId}/stats" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Displays the stats of a Pulsar Function instance",
+        "description" : "",
+        "operationId" : "getFunctionInstanceStats",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Function (if instance-id is not provided, the stats of all instances is returned",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/FunctionInstanceStatsData"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The Pulsar Function doesn't exist"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/{instanceId}/status" : {
+      "get" : {
+        "tags" : [ "functions" ],
+        "summary" : "Displays the status of a Pulsar Function instance",
+        "description" : "",
+        "operationId" : "getFunctionInstanceStatus",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Function (if instance-id is not provided, the stats of all instances is returned",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/FunctionInstanceStatusData"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "The Pulsar Function doesn't exist"
+          }
+        }
+      }
+    },
+    "/functions/{tenant}/{namespace}/{functionName}/{instanceId}/stop" : {
+      "post" : {
+        "tags" : [ "functions" ],
+        "summary" : "Stop an instance of a Pulsar Function",
+        "description" : "",
+        "operationId" : "stopFunction",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "functionName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Function",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Function (if instance-id is not provided, all instances are stopped. ",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Function does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          }
+        }
+      }
+    }
+  },
+  "definitions" : {
+    "ConsumerConfig" : {
+      "type" : "object",
+      "properties" : {
+        "schemaType" : {
+          "type" : "string"
+        },
+        "serdeClassName" : {
+          "type" : "string"
+        },
+        "receiverQueueSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "regexPattern" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "EncryptionContext" : {
+      "type" : "object",
+      "properties" : {
+        "keys" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/EncryptionKey"
+          }
+        },
+        "param" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "algorithm" : {
+          "type" : "string"
+        },
+        "compressionType" : {
+          "type" : "string",
+          "enum" : [ "NONE", "LZ4", "ZLIB", "ZSTD", "SNAPPY" ]
+        },
+        "uncompressedMessageSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "batchSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        }
+      }
+    },
+    "EncryptionKey" : {
+      "type" : "object",
+      "properties" : {
+        "keyValue" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "metadata" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "ExceptionInformation" : {
+      "type" : "object",
+      "properties" : {
+        "exceptionString" : {
+          "type" : "string"
+        },
+        "timestampMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "FunctionConfig" : {
+      "type" : "object",
+      "properties" : {
+        "runtimeFlags" : {
+          "type" : "string"
+        },
+        "tenant" : {
+          "type" : "string"
+        },
+        "namespace" : {
+          "type" : "string"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "className" : {
+          "type" : "string"
+        },
+        "inputs" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "customSerdeInputs" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "topicsPattern" : {
+          "type" : "string"
+        },
+        "customSchemaInputs" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "inputSpecs" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/ConsumerConfig"
+          }
+        },
+        "output" : {
+          "type" : "string"
+        },
+        "outputSchemaType" : {
+          "type" : "string"
+        },
+        "outputSerdeClassName" : {
+          "type" : "string"
+        },
+        "logTopic" : {
+          "type" : "string"
+        },
+        "processingGuarantees" : {
+          "type" : "string",
+          "enum" : [ "ATLEAST_ONCE", "ATMOST_ONCE", "EFFECTIVELY_ONCE" ]
+        },
+        "retainOrdering" : {
+          "type" : "boolean"
+        },
+        "userConfig" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "secrets" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "runtime" : {
+          "type" : "string",
+          "enum" : [ "JAVA", "PYTHON", "GO" ]
+        },
+        "autoAck" : {
+          "type" : "boolean"
+        },
+        "maxMessageRetries" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "deadLetterTopic" : {
+          "type" : "string"
+        },
+        "subName" : {
+          "type" : "string"
+        },
+        "parallelism" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "resources" : {
+          "$ref" : "#/definitions/Resources"
+        },
+        "fqfn" : {
+          "type" : "string"
+        },
+        "windowConfig" : {
+          "$ref" : "#/definitions/WindowConfig"
+        },
+        "timeoutMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "jar" : {
+          "type" : "string"
+        },
+        "py" : {
+          "type" : "string"
+        },
+        "go" : {
+          "type" : "string"
+        },
+        "cleanupSubscription" : {
+          "type" : "boolean"
+        },
+        "customRuntimeOptions" : {
+          "type" : "string"
+        }
+      }
+    },
+    "FunctionInstanceStats" : {
+      "type" : "object",
+      "properties" : {
+        "instanceId" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "metrics" : {
+          "$ref" : "#/definitions/FunctionInstanceStatsData"
+        }
+      }
+    },
+    "FunctionInstanceStatsData" : {
+      "type" : "object",
+      "properties" : {
+        "receivedTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "processedSuccessfullyTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "systemExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "userExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "avgProcessLatency" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "1min" : {
+          "$ref" : "#/definitions/FunctionInstanceStatsDataBase"
+        },
+        "lastInvocation" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "userMetrics" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "number",
+            "format" : "double"
+          }
+        }
+      }
+    },
+    "FunctionInstanceStatsDataBase" : {
+      "type" : "object",
+      "properties" : {
+        "receivedTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "processedSuccessfullyTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "systemExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "userExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "avgProcessLatency" : {
+          "type" : "number",
+          "format" : "double"
+        }
+      }
+    },
+    "FunctionInstanceStatus" : {
+      "type" : "object",
+      "properties" : {
+        "instanceId" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "status" : {
+          "$ref" : "#/definitions/FunctionInstanceStatusData"
+        }
+      }
+    },
+    "FunctionInstanceStatusData" : {
+      "type" : "object",
+      "properties" : {
+        "running" : {
+          "type" : "boolean"
+        },
+        "error" : {
+          "type" : "string"
+        },
+        "numRestarts" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numReceived" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numSuccessfullyProcessed" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numUserExceptions" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "latestUserExceptions" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ExceptionInformation"
+          }
+        },
+        "numSystemExceptions" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "latestSystemExceptions" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ExceptionInformation"
+          }
+        },
+        "averageLatency" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "lastInvocationTime" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "workerId" : {
+          "type" : "string"
+        }
+      }
+    },
+    "FunctionState" : {
+      "type" : "object",
+      "properties" : {
+        "key" : {
+          "type" : "string"
+        },
+        "stringValue" : {
+          "type" : "string"
+        },
+        "byteValue" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "numberValue" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "version" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "FunctionStats" : {
+      "type" : "object",
+      "properties" : {
+        "receivedTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "processedSuccessfullyTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "systemExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "userExceptionsTotal" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "avgProcessLatency" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "1min" : {
+          "$ref" : "#/definitions/FunctionInstanceStatsDataBase"
+        },
+        "lastInvocation" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "instances" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/FunctionInstanceStats"
+          }
+        }
+      }
+    },
+    "FunctionStatus" : {
+      "type" : "object",
+      "properties" : {
+        "numInstances" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numRunning" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "instances" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/FunctionInstanceStatus"
+          }
+        }
+      }
+    },
+    "InputStream" : {
+      "type" : "object"
+    },
+    "Message" : {
+      "type" : "object",
+      "properties" : {
+        "data" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "replicatedFrom" : {
+          "type" : "string"
+        },
+        "encryptionCtx" : {
+          "$ref" : "#/definitions/EncryptionContext"
+        },
+        "schemaVersion" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "sequenceId" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "orderingKey" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "keyBytes" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string",
+            "format" : "byte"
+          }
+        },
+        "messageId" : {
+          "$ref" : "#/definitions/MessageId"
+        },
+        "redeliveryCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "topicName" : {
+          "type" : "string"
+        },
+        "producerName" : {
+          "type" : "string"
+        },
+        "publishTime" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "eventTime" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "replicated" : {
+          "type" : "boolean"
+        },
+        "value" : {
+          "type" : "object"
+        },
+        "key" : {
+          "type" : "string"
+        },
+        "properties" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        }
+      }
+    },
+    "MessageId" : {
+      "type" : "object"
+    },
+    "Resources" : {
+      "type" : "object",
+      "properties" : {
+        "cpu" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "ram" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "disk" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "UpdateOptions" : {
+      "type" : "object",
+      "properties" : {
+        "update-auth-data" : {
+          "type" : "boolean",
+          "description" : "Whether or not to update the auth data"
+        }
+      },
+      "description" : "Options while updating the sink"
+    },
+    "WindowConfig" : {
+      "type" : "object",
+      "properties" : {
+        "windowLengthCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "windowLengthDurationMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "slidingIntervalCount" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "slidingIntervalDurationMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lateDataTopic" : {
+          "type" : "string"
+        },
+        "maxLagMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "watermarkEmitIntervalMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "timestampExtractorClassName" : {
+          "type" : "string"
+        },
+        "actualWindowFunctionClassName" : {
+          "type" : "string"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/site2/website/static/swagger/2.5.0/swaggersink.json b/site2/website/static/swagger/2.5.0/swaggersink.json
new file mode 100644
index 0000000000000..53f32b1663279
--- /dev/null
+++ b/site2/website/static/swagger/2.5.0/swaggersink.json
@@ -0,0 +1,955 @@
+{
+  "swagger" : "2.0",
+  "info" : {
+    "description" : "This provides the REST API for Pulsar Sink operations",
+    "version" : "v3",
+    "title" : "Pulsar Sink REST API",
+    "license" : {
+      "name" : "Apache 2.0",
+      "url" : "http://www.apache.org/licenses/LICENSE-2.0.html"
+    }
+  },
+  "basePath" : "/admin/v3",
+  "tags" : [ {
+    "name" : "sinks"
+  } ],
+  "schemes" : [ "http", "https" ],
+  "paths" : {
+    "/sinks/builtinsinks" : {
+      "get" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Fetches a list of supported Pulsar IO sink connectors currently running in cluster mode",
+        "description" : "",
+        "operationId" : "getSinkList",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "Get builtin sinks successfully.",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "object"
+              }
+            }
+          }
+        }
+      }
+    },
+    "/sinks/reloadBuiltInSinks" : {
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Reload the available built-in connectors, include Source and Sink",
+        "description" : "",
+        "operationId" : "reloadSinks",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "401" : {
+            "description" : "This operation requires super-user access"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}" : {
+      "get" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Lists all Pulsar Sinks currently deployed in a given namespace",
+        "description" : "",
+        "operationId" : "listSinks",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "string"
+            }
+          },
+          "400" : {
+            "description" : "Invalid list request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to authorize, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}" : {
+      "get" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Fetches information about a Pulsar Sink currently running in cluster mode",
+        "description" : "",
+        "operationId" : "getSinkInfo",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/SinkConfig"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Creates a new Pulsar Sink in cluster mode",
+        "description" : "",
+        "operationId" : "registerSink",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "A JSON value presenting config payload of a Pulsar Sink. All available configuration options are:  \n- **classname**  \n   The class name of a Pulsar Sink if archive is file-url-path (file://)  \n- **sourceSubscriptionName**  \n   Pulsar source subscription name if user wants a specific  \n   subscription-name for input-topic consumer  \n- **inputs**  \n   The input topic or topics of a Pulsar Sink (specified as a JSON array)  \n- **topicsPattern**  \n   TopicsPattern to consume from list of topics under a namespace that    match the pattern. [input] and [topicsPattern] are mutually    exclusive. Add SerDe class name for a pattern in customSerdeInputs    (supported for java fun only)- **topicToSerdeClassName**  \n   The map of input topics to SerDe class names (specified as a JSON object)  \n- **topicToSchemaType**  \n   The map of input topics to Schema types or class names (specified as a JSON object)  \n- **inputSpecs**  \n   The map of input topics to its consumer configuration, each configuration has schema of    {\"schemaType\": \"type-x\", \"serdeClassName\": \"name-x\", \"isRegexPattern\": true, \"receiverQueueSize\": 5}  \n- **configs**  \n   The map of configs (specified as a JSON object)  \n- **secrets**  \n   a map of secretName(aka how the secret is going to be \n   accessed in the function via context) to an object that \n   encapsulates how the secret is fetched by the underlying \n   secrets provider. The type of an value here can be found by the \n   SecretProviderConfigurator.getSecretObjectType() method. (specified as a JSON object)  \n- **parallelism**  \n   The parallelism factor of a Pulsar Sink (i.e. the number of a Pulsar Sink instances to run \n- **processingGuarantees**  \n   The processing guarantees (aka delivery semantics) applied to the Pulsar Sink. Possible Values: \"ATLEAST_ONCE\", \"ATMOST_ONCE\", \"EFFECTIVELY_ONCE\"  \n- **retainOrdering**  \n   Boolean denotes whether the Pulsar Sink consumes and processes messages in order  \n- **resources**  \n   {\"cpu\": 1, \"ram\": 2, \"disk\": 3} The CPU (in cores), RAM (in bytes) and disk (in bytes) that needs to be allocated per Pulsar Sink instance (applicable only to Docker runtime)  \n- **autoAck**  \n   Boolean denotes whether or not the framework will automatically acknowledge messages  \n- **timeoutMs**  \n   Long denotes the message timeout in milliseconds  \n- **cleanupSubscription**  \n   Boolean denotes whether the subscriptions the functions created/used should be deleted when the functions is deleted  \n- **runtimeFlags**  \n   Any flags that you want to pass to the runtime as a single string  \n",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/SinkConfig"
+          },
+          "x-examples" : {
+            "application/json" : "{  \n\t\"classname\": \"org.example.MySinkTest\",\n\t\"inputs\": [\"persistent://public/default/sink-input\"],\n\t\"processingGuarantees\": \"EFFECTIVELY_ONCE\",\n\t\"parallelism\": 10\n}"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Pulsar Sink successfully created"
+          },
+          "400" : {
+            "description" : "Invalid request (The Pulsar Sink already exists, etc.)"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to authorize, failed to get tenant data, failed to process package, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Updates a Pulsar Sink currently running in cluster mode",
+        "description" : "",
+        "operationId" : "updateSink",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "A JSON value presenting config payload of a Pulsar Sink. All available configuration options are:  \n- **classname**  \n   The class name of a Pulsar Sink if archive is file-url-path (file://)  \n- **sourceSubscriptionName**  \n   Pulsar source subscription name if user wants a specific  \n   subscription-name for input-topic consumer  \n- **inputs**  \n   The input topic or topics of a Pulsar Sink (specified as a JSON array)  \n- **topicsPattern**  \n   TopicsPattern to consume from list of topics under a namespace that    match the pattern. [input] and [topicsPattern] are mutually    exclusive. Add SerDe class name for a pattern in customSerdeInputs    (supported for java fun only)- **topicToSerdeClassName**  \n   The map of input topics to SerDe class names (specified as a JSON object)  \n- **topicToSchemaType**  \n   The map of input topics to Schema types or class names (specified as a JSON object)  \n- **inputSpecs**  \n   The map of input topics to its consumer configuration, each configuration has schema of    {\"schemaType\": \"type-x\", \"serdeClassName\": \"name-x\", \"isRegexPattern\": true, \"receiverQueueSize\": 5}  \n- **configs**  \n   The map of configs (specified as a JSON object)  \n- **secrets**  \n   a map of secretName(aka how the secret is going to be \n   accessed in the function via context) to an object that \n   encapsulates how the secret is fetched by the underlying \n   secrets provider. The type of an value here can be found by the \n   SecretProviderConfigurator.getSecretObjectType() method. (specified as a JSON object)  \n- **parallelism**  \n   The parallelism factor of a Pulsar Sink (i.e. the number of a Pulsar Sink instances to run \n- **processingGuarantees**  \n   The processing guarantees (aka delivery semantics) applied to the Pulsar Sink. Possible Values: \"ATLEAST_ONCE\", \"ATMOST_ONCE\", \"EFFECTIVELY_ONCE\"  \n- **retainOrdering**  \n   Boolean denotes whether the Pulsar Sink consumes and processes messages in order  \n- **resources**  \n   {\"cpu\": 1, \"ram\": 2, \"disk\": 3} The CPU (in cores), RAM (in bytes) and disk (in bytes) that needs to be allocated per Pulsar Sink instance (applicable only to Docker runtime)  \n- **autoAck**  \n   Boolean denotes whether or not the framework will automatically acknowledge messages  \n- **timeoutMs**  \n   Long denotes the message timeout in milliseconds  \n- **cleanupSubscription**  \n   Boolean denotes whether the subscriptions the functions created/used should be deleted when the functions is deleted  \n- **runtimeFlags**  \n   Any flags that you want to pass to the runtime as a single string  \n",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/SinkConfig"
+          },
+          "x-examples" : {
+            "application/json" : "{  \n\t\"classname\": \"org.example.SinkStressTest\",  \n\t\"inputs\": [\"persistent://public/default/sink-input\"],\n\t\"processingGuarantees\": \"EFFECTIVELY_ONCE\",\n\t\"parallelism\": 5\n}"
+          }
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Update options for the Pulsar Sink",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/UpdateOptions"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Pulsar Sink successfully updated"
+          },
+          "400" : {
+            "description" : "Invalid request (The Pulsar Sink doesn't exist, update contains no change, etc.)"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink doesn't exist"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to authorize, failed to process package, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Deletes a Pulsar Sink currently running in cluster mode",
+        "description" : "",
+        "operationId" : "deregisterSink",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "The Pulsar Sink was successfully deleted"
+          },
+          "400" : {
+            "description" : "Invalid deregister request"
+          },
+          "401" : {
+            "description" : "Client is not authorized to perform operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "408" : {
+            "description" : "Got InterruptedException while deregistering the Pulsar Sink"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to authorize, failed to deregister, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/restart" : {
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Restart all instances of a Pulsar Sink",
+        "description" : "",
+        "operationId" : "restartSink",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid restart request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to restart the Pulsar Sink, failed to authorize, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/start" : {
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Start all instances of a Pulsar Sink",
+        "description" : "",
+        "operationId" : "startSink",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid start request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to start the Pulsar Sink, failed to authorize, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/status" : {
+      "get" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Displays the status of a Pulsar Sink running in cluster mode",
+        "description" : "",
+        "operationId" : "getSinkStatus",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/SinkStatus"
+            }
+          },
+          "400" : {
+            "description" : "Invalid get status request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/stop" : {
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Stop all instances of a Pulsar Sink",
+        "description" : "",
+        "operationId" : "stopSink",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid stop request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to stop the Pulsar Sink, failed to authorize, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/{instanceId}/restart" : {
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Restart an instance of a Pulsar Sink",
+        "description" : "",
+        "operationId" : "restartSink",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid restart request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to restart the instance of a Pulsar Sink, failed to authorize, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/{instanceId}/start" : {
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Start an instance of a Pulsar Sink",
+        "description" : "",
+        "operationId" : "startSink",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid start request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to start the Pulsar Sink, failed to authorize, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/{instanceId}/status" : {
+      "get" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Displays the status of a Pulsar Sink instance",
+        "description" : "",
+        "operationId" : "getSinkInstanceStatus",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/SinkInstanceStatusData"
+            }
+          },
+          "400" : {
+            "description" : "The Pulsar Sink instance does not exist"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink does not exist"
+          },
+          "500" : {
+            "description" : "Internal Server Error (got exception while getting status, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sinks/{tenant}/{namespace}/{sinkName}/{instanceId}/stop" : {
+      "post" : {
+        "tags" : [ "sinks" ],
+        "summary" : "Stop an instance of a Pulsar Sink",
+        "description" : "",
+        "operationId" : "stopSink",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sinkName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Sink",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid stop request"
+          },
+          "401" : {
+            "description" : "The client is not authorized to perform this operation"
+          },
+          "404" : {
+            "description" : "The Pulsar Sink instance does not exist"
+          },
+          "500" : {
+            "description" : "Internal server error (failed to stop the Pulsar Sink, failed to authorize, etc.)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    }
+  },
+  "definitions" : {
+    "ConsumerConfig" : {
+      "type" : "object",
+      "properties" : {
+        "schemaType" : {
+          "type" : "string"
+        },
+        "serdeClassName" : {
+          "type" : "string"
+        },
+        "receiverQueueSize" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "regexPattern" : {
+          "type" : "boolean"
+        }
+      }
+    },
+    "ExceptionInformation" : {
+      "type" : "object",
+      "properties" : {
+        "exceptionString" : {
+          "type" : "string"
+        },
+        "timestampMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "Resources" : {
+      "type" : "object",
+      "properties" : {
+        "cpu" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "ram" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "disk" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "SinkConfig" : {
+      "type" : "object",
+      "properties" : {
+        "tenant" : {
+          "type" : "string"
+        },
+        "namespace" : {
+          "type" : "string"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "className" : {
+          "type" : "string"
+        },
+        "sourceSubscriptionName" : {
+          "type" : "string"
+        },
+        "sourceSubscriptionPosition" : {
+          "type" : "string",
+          "enum" : [ "Latest", "Earliest" ]
+        },
+        "inputs" : {
+          "type" : "array",
+          "items" : {
+            "type" : "string"
+          }
+        },
+        "topicToSerdeClassName" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "topicsPattern" : {
+          "type" : "string"
+        },
+        "topicToSchemaType" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "string"
+          }
+        },
+        "inputSpecs" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "$ref" : "#/definitions/ConsumerConfig"
+          }
+        },
+        "configs" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "secrets" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "parallelism" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "processingGuarantees" : {
+          "type" : "string",
+          "enum" : [ "ATLEAST_ONCE", "ATMOST_ONCE", "EFFECTIVELY_ONCE" ]
+        },
+        "retainOrdering" : {
+          "type" : "boolean"
+        },
+        "resources" : {
+          "$ref" : "#/definitions/Resources"
+        },
+        "autoAck" : {
+          "type" : "boolean"
+        },
+        "timeoutMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "archive" : {
+          "type" : "string"
+        },
+        "cleanupSubscription" : {
+          "type" : "boolean"
+        },
+        "runtimeFlags" : {
+          "type" : "string"
+        },
+        "customRuntimeOptions" : {
+          "type" : "string"
+        }
+      }
+    },
+    "SinkInstanceStatus" : {
+      "type" : "object",
+      "properties" : {
+        "instanceId" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "status" : {
+          "$ref" : "#/definitions/SinkInstanceStatusData"
+        }
+      }
+    },
+    "SinkInstanceStatusData" : {
+      "type" : "object",
+      "properties" : {
+        "running" : {
+          "type" : "boolean"
+        },
+        "error" : {
+          "type" : "string"
+        },
+        "numRestarts" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numReadFromPulsar" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numSystemExceptions" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "latestSystemExceptions" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ExceptionInformation"
+          }
+        },
+        "numSinkExceptions" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "latestSinkExceptions" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ExceptionInformation"
+          }
+        },
+        "numWrittenToSink" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastReceivedTime" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "workerId" : {
+          "type" : "string"
+        }
+      }
+    },
+    "SinkStatus" : {
+      "type" : "object",
+      "properties" : {
+        "numInstances" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numRunning" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "instances" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/SinkInstanceStatus"
+          }
+        }
+      }
+    },
+    "UpdateOptions" : {
+      "type" : "object",
+      "properties" : {
+        "update-auth-data" : {
+          "type" : "boolean",
+          "description" : "Whether or not to update the auth data"
+        }
+      },
+      "description" : "Options while updating the sink"
+    }
+  }
+}
\ No newline at end of file
diff --git a/site2/website/static/swagger/2.5.0/swaggersource.json b/site2/website/static/swagger/2.5.0/swaggersource.json
new file mode 100644
index 0000000000000..5725806a19f6f
--- /dev/null
+++ b/site2/website/static/swagger/2.5.0/swaggersource.json
@@ -0,0 +1,902 @@
+{
+  "swagger" : "2.0",
+  "info" : {
+    "description" : "This provides the REST API for Pulsar Source operations",
+    "version" : "v3",
+    "title" : "Pulsar Source REST API",
+    "license" : {
+      "name" : "Apache 2.0",
+      "url" : "http://www.apache.org/licenses/LICENSE-2.0.html"
+    }
+  },
+  "basePath" : "/admin/v3",
+  "tags" : [ {
+    "name" : "sources"
+  } ],
+  "schemes" : [ "http", "https" ],
+  "paths" : {
+    "/sources/builtinsources" : {
+      "get" : {
+        "tags" : [ "sources" ],
+        "summary" : "Fetches a list of supported Pulsar IO source connectors currently running in cluster mode",
+        "description" : "",
+        "operationId" : "getSourceList",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "array",
+              "items" : {
+                "type" : "object"
+              }
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/reloadBuiltInSources" : {
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Reload the available built-in connectors, include Source and Sink",
+        "description" : "",
+        "operationId" : "reloadSources",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "responses" : {
+          "401" : {
+            "description" : "This operation requires super-user access"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}" : {
+      "get" : {
+        "tags" : [ "sources" ],
+        "summary" : "Lists all Pulsar Sources currently deployed in a given namespace",
+        "description" : "",
+        "operationId" : "listSources",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "type" : "string"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorize to perform operation"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}" : {
+      "get" : {
+        "tags" : [ "sources" ],
+        "summary" : "Fetches information about a Pulsar Source currently running in cluster mode",
+        "description" : "",
+        "operationId" : "getSourceInfo",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/SourceConfig"
+            }
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      },
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Creates a new Pulsar Source in cluster mode",
+        "description" : "",
+        "operationId" : "registerSource",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "A JSON value presenting configuration payload of a Pulsar Source. An example of the expected functions can be found here.  \n- **classname**  \n  The class name of a Pulsar Source if archive is file-url-path (file://).  \n- **topicName**  \n  The Pulsar topic to which data is sent.  \n- **serdeClassName**  \n  The SerDe classname for the Pulsar Source.  \n- **schemaType**  \n  The schema type (either a builtin schema like 'avro', 'json', etc.. or    custom Schema class name to be used to encode messages emitted from the Pulsar Source  \n- **configs**  \n  Source config key/values  \n- **secrets**  \n  This is a map of secretName(that is how the secret is going to be accessed in the function via context) to an object that  encapsulates how the secret is fetched by the underlying secrets provider. The type of an value here can be found by the  SecretProviderConfigurator.getSecretObjectType() method. \n- **parallelism**  \n  The parallelism factor of a Pulsar Source (i.e. the number of a Pulsar Source instances to run).  \n- **processingGuarantees**  \n  The processing guarantees (aka delivery semantics) applied to the Pulsar Source.    Possible Values: [ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE]  \n- **resources**  \n  The size of the system resources allowed by the Pulsar Source runtime. The resources include: cpu, ram, disk.  \n- **archive**  \n  The path to the NAR archive for the Pulsar Source. It also supports url-path   [http/https/file (file protocol assumes that file already exists on worker host)]   from which worker can download the package.  \n- **runtimeFlags**  \n  Any flags that you want to pass to the runtime.  \n",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/SourceConfig"
+          },
+          "x-examples" : {
+            "application/json" : "{\n  \"tenant\": public\n  \"namespace\": default\n  \"name\": pulsar-io-mysql\n  \"className\": TestSourceMysql\n  \"topicName\": pulsar-io-mysql\n  \"parallelism\": 1\n  \"archive\": /connectors/pulsar-io-mysql-0.0.1.nar\n  \"schemaType\": avro\n}"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Pulsar Function successfully created"
+          },
+          "400" : {
+            "description" : "Invalid request (Function already exists or Tenant, Namespace or Name is not provided, etc.)"
+          },
+          "401" : {
+            "description" : "Client is not authorize to perform operation"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      },
+      "put" : {
+        "tags" : [ "sources" ],
+        "summary" : "Updates a Pulsar Source currently running in cluster mode",
+        "description" : "",
+        "operationId" : "updateSource",
+        "consumes" : [ "multipart/form-data" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "A JSON value presenting configuration payload of a Pulsar Source. An example of the expected functions can be found here.  \n- **classname**  \n  The class name of a Pulsar Source if archive is file-url-path (file://).  \n- **topicName**  \n  The Pulsar topic to which data is sent.  \n- **serdeClassName**  \n  The SerDe classname for the Pulsar Source.  \n- **schemaType**  \n  The schema type (either a builtin schema like 'avro', 'json', etc.. or    custom Schema class name to be used to encode messages emitted from the Pulsar Source  \n- **configs**  \n  Pulsar Source config key/values  \n- **secrets**  \n  This is a map of secretName(that is how the secret is going to be accessed in the function via context) to an object that  encapsulates how the secret is fetched by the underlying secrets provider. The type of an value here can be found by the  SecretProviderConfigurator.getSecretObjectType() method. \n- **parallelism**  \n  The parallelism factor of a Pulsar Source (i.e. the number of a Pulsar Source instances to run).  \n- **processingGuarantees**  \n  The processing guarantees (aka delivery semantics) applied to the Pulsar Source.    Possible Values: [ATLEAST_ONCE, ATMOST_ONCE, EFFECTIVELY_ONCE]  \n- **resources**  \n  The size of the system resources allowed by the Pulsar Source runtime. The resources include: cpu, ram, disk.  \n- **archive**  \n  The path to the NAR archive for the Pulsar Source. It also supports url-path   [http/https/file (file protocol assumes that file already exists on worker host)]   from which worker can download the package.  \n- **runtimeFlags**  \n  Any flags that you want to pass to the runtime.  \n",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/SourceConfig"
+          },
+          "x-examples" : {
+            "application/json" : "{\n  \"tenant\": public\n  \"namespace\": default\n  \"name\": pulsar-io-mysql\n  \"className\": TestSourceMysql\n  \"topicName\": pulsar-io-mysql\n  \"parallelism\": 1\n  \"archive\": /connectors/pulsar-io-mysql-0.0.1.nar\n  \"schemaType\": avro\n}"
+          }
+        }, {
+          "in" : "body",
+          "name" : "body",
+          "description" : "Update options for Pulsar Source",
+          "required" : false,
+          "schema" : {
+            "$ref" : "#/definitions/UpdateOptions"
+          }
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "Pulsar Function successfully updated"
+          },
+          "400" : {
+            "description" : "Invalid request (Function already exists or Tenant, Namespace or Name is not provided, etc.)"
+          },
+          "401" : {
+            "description" : "Client is not authorize to perform operation"
+          },
+          "403" : {
+            "description" : "The requester doesn't have admin permissions"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      },
+      "delete" : {
+        "tags" : [ "sources" ],
+        "summary" : "Deletes a Pulsar Source currently running in cluster mode",
+        "description" : "",
+        "operationId" : "deregisterSource",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "The function was successfully deleted"
+          },
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorize to perform operation"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "408" : {
+            "description" : "Request timeout"
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/restart" : {
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Restart all instances of a Pulsar Source",
+        "description" : "",
+        "operationId" : "restartSource",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorize to perform operation"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/start" : {
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Start all instances of a Pulsar Source",
+        "description" : "",
+        "operationId" : "startSource",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorize to perform operation"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/status" : {
+      "get" : {
+        "tags" : [ "sources" ],
+        "summary" : "Displays the status of a Pulsar Source running in cluster mode",
+        "description" : "",
+        "operationId" : "getSourceStatus",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/SourceStatus"
+            }
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/stop" : {
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Stop all instances of a Pulsar Source",
+        "description" : "",
+        "operationId" : "stopSource",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorize to perform operation"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/{instanceId}/restart" : {
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Restart an instance of a Pulsar Source",
+        "description" : "",
+        "operationId" : "restartSource",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Source (if instance-id is not provided, the stats of all instances is returned).",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorize to perform operation"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/{instanceId}/start" : {
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Start an instance of a Pulsar Source",
+        "description" : "",
+        "operationId" : "startSource",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Source (if instance-id is not provided, the stats of all instances is returned).",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorize to perform operation"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/{instanceId}/status" : {
+      "get" : {
+        "tags" : [ "sources" ],
+        "summary" : "Displays the status of a Pulsar Source instance",
+        "description" : "",
+        "operationId" : "getSourceInstanceStatus",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Source (if instance-id is not provided, the stats of all instances is returned).",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "schema" : {
+              "$ref" : "#/definitions/SourceInstanceStatusData"
+            }
+          },
+          "500" : {
+            "description" : "Internal Server Error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    },
+    "/sources/{tenant}/{namespace}/{sourceName}/{instanceId}/stop" : {
+      "post" : {
+        "tags" : [ "sources" ],
+        "summary" : "Stop instance of a Pulsar Source",
+        "description" : "",
+        "operationId" : "stopSource",
+        "consumes" : [ "application/json" ],
+        "produces" : [ "application/json" ],
+        "parameters" : [ {
+          "name" : "tenant",
+          "in" : "path",
+          "description" : "The tenant of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "namespace",
+          "in" : "path",
+          "description" : "The namespace of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "sourceName",
+          "in" : "path",
+          "description" : "The name of a Pulsar Source",
+          "required" : true,
+          "type" : "string"
+        }, {
+          "name" : "instanceId",
+          "in" : "path",
+          "description" : "The instanceId of a Pulsar Source (if instance-id is not provided, the stats of all instances is returned).",
+          "required" : true,
+          "type" : "string"
+        } ],
+        "responses" : {
+          "400" : {
+            "description" : "Invalid request"
+          },
+          "401" : {
+            "description" : "Client is not authorize to perform operation"
+          },
+          "404" : {
+            "description" : "Not Found(The Pulsar Source doesn't exist)"
+          },
+          "500" : {
+            "description" : "Internal server error"
+          },
+          "503" : {
+            "description" : "Function worker service is now initializing. Please try again later."
+          }
+        }
+      }
+    }
+  },
+  "definitions" : {
+    "ExceptionInformation" : {
+      "type" : "object",
+      "properties" : {
+        "exceptionString" : {
+          "type" : "string"
+        },
+        "timestampMs" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "Resources" : {
+      "type" : "object",
+      "properties" : {
+        "cpu" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "ram" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "disk" : {
+          "type" : "integer",
+          "format" : "int64"
+        }
+      }
+    },
+    "SourceConfig" : {
+      "type" : "object",
+      "properties" : {
+        "tenant" : {
+          "type" : "string"
+        },
+        "namespace" : {
+          "type" : "string"
+        },
+        "name" : {
+          "type" : "string"
+        },
+        "className" : {
+          "type" : "string"
+        },
+        "topicName" : {
+          "type" : "string"
+        },
+        "serdeClassName" : {
+          "type" : "string"
+        },
+        "schemaType" : {
+          "type" : "string"
+        },
+        "configs" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "secrets" : {
+          "type" : "object",
+          "additionalProperties" : {
+            "type" : "object"
+          }
+        },
+        "parallelism" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "processingGuarantees" : {
+          "type" : "string",
+          "enum" : [ "ATLEAST_ONCE", "ATMOST_ONCE", "EFFECTIVELY_ONCE" ]
+        },
+        "resources" : {
+          "$ref" : "#/definitions/Resources"
+        },
+        "archive" : {
+          "type" : "string"
+        },
+        "runtimeFlags" : {
+          "type" : "string"
+        },
+        "customRuntimeOptions" : {
+          "type" : "string"
+        }
+      }
+    },
+    "SourceInstanceStatus" : {
+      "type" : "object",
+      "properties" : {
+        "instanceId" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "status" : {
+          "$ref" : "#/definitions/SourceInstanceStatusData"
+        }
+      }
+    },
+    "SourceInstanceStatusData" : {
+      "type" : "object",
+      "properties" : {
+        "running" : {
+          "type" : "boolean"
+        },
+        "error" : {
+          "type" : "string"
+        },
+        "numRestarts" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numReceivedFromSource" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "numSystemExceptions" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "latestSystemExceptions" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ExceptionInformation"
+          }
+        },
+        "numSourceExceptions" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "latestSourceExceptions" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/ExceptionInformation"
+          }
+        },
+        "numWritten" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "lastReceivedTime" : {
+          "type" : "integer",
+          "format" : "int64"
+        },
+        "workerId" : {
+          "type" : "string"
+        }
+      }
+    },
+    "SourceStatus" : {
+      "type" : "object",
+      "properties" : {
+        "numInstances" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "numRunning" : {
+          "type" : "integer",
+          "format" : "int32"
+        },
+        "instances" : {
+          "type" : "array",
+          "items" : {
+            "$ref" : "#/definitions/SourceInstanceStatus"
+          }
+        }
+      }
+    },
+    "UpdateOptions" : {
+      "type" : "object",
+      "properties" : {
+        "update-auth-data" : {
+          "type" : "boolean",
+          "description" : "Whether or not to update the auth data"
+        }
+      },
+      "description" : "Options while updating the sink"
+    }
+  }
+}
\ No newline at end of file
diff --git a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-messaging.md b/site2/website/versioned_docs/version-2.1.0-incubating/concepts-messaging.md
index 9b0caf3ff5df6..1df8f92903a5f 100644
--- a/site2/website/versioned_docs/version-2.1.0-incubating/concepts-messaging.md
+++ b/site2/website/versioned_docs/version-2.1.0-incubating/concepts-messaging.md
@@ -150,8 +150,8 @@ When a consumer subscribes to a Pulsar topic, by default it subscribes to one sp
 
 When subscribing to multiple topics, the Pulsar client will automatically make a call to the Pulsar API to discover the topics that match the regex pattern/list and then subscribe to all of them. If any of the topics don't currently exist, the consumer will auto-subscribe to them once the topics are created.
 
-> #### No ordering guarantees
-> When a consumer subscribes to multiple topics, all ordering guarantees normally provided by Pulsar on single topics do not hold. If your use case for Pulsar involves any strict ordering requirements, we would strongly recommend against using this feature.
+> #### No ordering guarantees across multiple topics
+> When a producer sends messages to a single topic, all messages are guaranteed to be read from that topic in the same order. However, these guarantees do not hold across multiple topics. So when a producer sends message to multiple topics, the order in which messages are read from those topics is not guaranteed to be the same.
 
 Here are some multi-topic subscription examples for Java:
 
diff --git a/site2/website/versioned_docs/version-2.3.0/concepts-messaging.md b/site2/website/versioned_docs/version-2.3.0/concepts-messaging.md
index 015d00c18e2f0..2ecc6ef142e4a 100644
--- a/site2/website/versioned_docs/version-2.3.0/concepts-messaging.md
+++ b/site2/website/versioned_docs/version-2.3.0/concepts-messaging.md
@@ -151,8 +151,8 @@ When a consumer subscribes to a Pulsar topic, by default it subscribes to one sp
 
 When subscribing to multiple topics, the Pulsar client will automatically make a call to the Pulsar API to discover the topics that match the regex pattern/list and then subscribe to all of them. If any of the topics don't currently exist, the consumer will auto-subscribe to them once the topics are created.
 
-> #### No ordering guarantees
-> When a consumer subscribes to multiple topics, all ordering guarantees normally provided by Pulsar on single topics do not hold. If your use case for Pulsar involves any strict ordering requirements, we would strongly recommend against using this feature.
+> #### No ordering guarantees across multiple topics
+> When a producer sends messages to a single topic, all messages are guaranteed to be read from that topic in the same order. However, these guarantees do not hold across multiple topics. So when a producer sends message to multiple topics, the order in which messages are read from those topics is not guaranteed to be the same.
 
 Here are some multi-topic subscription examples for Java:
 
diff --git a/site2/website/versioned_docs/version-2.3.1/concepts-messaging.md b/site2/website/versioned_docs/version-2.3.1/concepts-messaging.md
index acf6a8afbd1ca..715ec199dd6b4 100644
--- a/site2/website/versioned_docs/version-2.3.1/concepts-messaging.md
+++ b/site2/website/versioned_docs/version-2.3.1/concepts-messaging.md
@@ -151,8 +151,8 @@ When a consumer subscribes to a Pulsar topic, by default it subscribes to one sp
 
 When subscribing to multiple topics, the Pulsar client will automatically make a call to the Pulsar API to discover the topics that match the regex pattern/list and then subscribe to all of them. If any of the topics don't currently exist, the consumer will auto-subscribe to them once the topics are created.
 
-> #### No ordering guarantees
-> When a consumer subscribes to multiple topics, all ordering guarantees normally provided by Pulsar on single topics do not hold. If your use case for Pulsar involves any strict ordering requirements, we would strongly recommend against using this feature.
+> #### No ordering guarantees across multiple topics
+> When a producer sends messages to a single topic, all messages are guaranteed to be read from that topic in the same order. However, these guarantees do not hold across multiple topics. So when a producer sends message to multiple topics, the order in which messages are read from those topics is not guaranteed to be the same.
 
 Here are some multi-topic subscription examples for Java:
 
diff --git a/site2/website/versioned_docs/version-2.3.2/concepts-messaging.md b/site2/website/versioned_docs/version-2.3.2/concepts-messaging.md
index 6e5d4ba2e8eaa..4bef883caa410 100644
--- a/site2/website/versioned_docs/version-2.3.2/concepts-messaging.md
+++ b/site2/website/versioned_docs/version-2.3.2/concepts-messaging.md
@@ -206,8 +206,8 @@ When a consumer subscribes to a Pulsar topic, by default it subscribes to one sp
 
 When subscribing to multiple topics, the Pulsar client will automatically make a call to the Pulsar API to discover the topics that match the regex pattern/list and then subscribe to all of them. If any of the topics don't currently exist, the consumer will auto-subscribe to them once the topics are created.
 
-> #### No ordering guarantees
-> When a consumer subscribes to multiple topics, all ordering guarantees normally provided by Pulsar on single topics do not hold. If your use case for Pulsar involves any strict ordering requirements, we would strongly recommend against using this feature.
+> #### No ordering guarantees across multiple topics
+> When a producer sends messages to a single topic, all messages are guaranteed to be read from that topic in the same order. However, these guarantees do not hold across multiple topics. So when a producer sends message to multiple topics, the order in which messages are read from those topics is not guaranteed to be the same.
 
 Here are some multi-topic subscription examples for Java:
 
diff --git a/site2/website/versioned_docs/version-2.4.0/concepts-messaging.md b/site2/website/versioned_docs/version-2.4.0/concepts-messaging.md
index 9b912351dd672..c110ccff686da 100644
--- a/site2/website/versioned_docs/version-2.4.0/concepts-messaging.md
+++ b/site2/website/versioned_docs/version-2.4.0/concepts-messaging.md
@@ -206,8 +206,8 @@ When a consumer subscribes to a Pulsar topic, by default it subscribes to one sp
 
 When subscribing to multiple topics, the Pulsar client will automatically make a call to the Pulsar API to discover the topics that match the regex pattern/list and then subscribe to all of them. If any of the topics don't currently exist, the consumer will auto-subscribe to them once the topics are created.
 
-> #### No ordering guarantees
-> When a consumer subscribes to multiple topics, all ordering guarantees normally provided by Pulsar on single topics do not hold. If your use case for Pulsar involves any strict ordering requirements, we would strongly recommend against using this feature.
+> #### No ordering guarantees across multiple topics
+> When a producer sends messages to a single topic, all messages are guaranteed to be read from that topic in the same order. However, these guarantees do not hold across multiple topics. So when a producer sends message to multiple topics, the order in which messages are read from those topics is not guaranteed to be the same.
 
 Here are some multi-topic subscription examples for Java:
 
diff --git a/site2/website/versioned_docs/version-2.4.0/io-quickstart.md b/site2/website/versioned_docs/version-2.4.0/io-quickstart.md
index 81e4b7cf2a3e1..9daa157018cac 100644
--- a/site2/website/versioned_docs/version-2.4.0/io-quickstart.md
+++ b/site2/website/versioned_docs/version-2.4.0/io-quickstart.md
@@ -26,7 +26,7 @@ At the end of this tutorial, you will be able to:
 
 Before connecting Pulsar to a database, we need to install Pulsar and the desired builtin connector.
 
-For more information about how to install a standalone Pulsar and builtin connectors, see [here](standalone/#installing-pulsar).
+For more information about how to install a standalone Pulsar and builtin connectors, see [here](getting-started-standalone.md/#installing-pulsar).
 
 ## Start a standalone Pulsar 
 
diff --git a/site2/website/versioned_docs/version-2.4.1/concepts-messaging.md b/site2/website/versioned_docs/version-2.4.1/concepts-messaging.md
index d76ade65f9bd4..b67ca931947fb 100644
--- a/site2/website/versioned_docs/version-2.4.1/concepts-messaging.md
+++ b/site2/website/versioned_docs/version-2.4.1/concepts-messaging.md
@@ -227,8 +227,8 @@ When a consumer subscribes to a Pulsar topic, by default it subscribes to one sp
 
 When subscribing to multiple topics, the Pulsar client will automatically make a call to the Pulsar API to discover the topics that match the regex pattern/list and then subscribe to all of them. If any of the topics don't currently exist, the consumer will auto-subscribe to them once the topics are created.
 
-> #### No ordering guarantees
-> When a consumer subscribes to multiple topics, all ordering guarantees normally provided by Pulsar on single topics do not hold. If your use case for Pulsar involves any strict ordering requirements, we would strongly recommend against using this feature.
+> #### No ordering guarantees across multiple topics
+> When a producer sends messages to a single topic, all messages are guaranteed to be read from that topic in the same order. However, these guarantees do not hold across multiple topics. So when a producer sends message to multiple topics, the order in which messages are read from those topics is not guaranteed to be the same.
 
 Here are some multi-topic subscription examples for Java:
 
diff --git a/site2/website/versioned_docs/version-2.4.1/functions-overview.md b/site2/website/versioned_docs/version-2.4.1/functions-overview.md
index 97b59c3f5d6db..bd97ce70ff0d3 100644
--- a/site2/website/versioned_docs/version-2.4.1/functions-overview.md
+++ b/site2/website/versioned_docs/version-2.4.1/functions-overview.md
@@ -54,7 +54,7 @@ If you implement the classic word count example using Pulsar Functions, it looks
 
 ![Pulsar Functions word count example](assets/pulsar-functions-word-count.png)
 
-To write the function in Java with [Pulsar Functions SDK for Java](functions-develop#available-apis), you can write the function as follows.
+To write the function in Java with [Pulsar Functions SDK for Java](functions-develop.md#available-apis), you can write the function as follows.
 
 ```java
 package org.example.functions;
diff --git a/site2/website/versioned_docs/version-2.4.2/concepts-messaging.md b/site2/website/versioned_docs/version-2.4.2/concepts-messaging.md
index 3d6f0f7f4d3db..4758e9cb664a4 100644
--- a/site2/website/versioned_docs/version-2.4.2/concepts-messaging.md
+++ b/site2/website/versioned_docs/version-2.4.2/concepts-messaging.md
@@ -227,8 +227,8 @@ When a consumer subscribes to a Pulsar topic, by default it subscribes to one sp
 
 When subscribing to multiple topics, the Pulsar client will automatically make a call to the Pulsar API to discover the topics that match the regex pattern/list and then subscribe to all of them. If any of the topics don't currently exist, the consumer will auto-subscribe to them once the topics are created.
 
-> #### No ordering guarantees
-> When a consumer subscribes to multiple topics, all ordering guarantees normally provided by Pulsar on single topics do not hold. If your use case for Pulsar involves any strict ordering requirements, we would strongly recommend against using this feature.
+> #### No ordering guarantees across multiple topics
+> When a producer sends messages to a single topic, all messages are guaranteed to be read from that topic in the same order. However, these guarantees do not hold across multiple topics. So when a producer sends message to multiple topics, the order in which messages are read from those topics is not guaranteed to be the same.
 
 Here are some multi-topic subscription examples for Java:
 
diff --git a/site2/website/versioned_docs/version-2.4.2/functions-overview.md b/site2/website/versioned_docs/version-2.4.2/functions-overview.md
index 0119b65c8eace..d2024cca14bcf 100644
--- a/site2/website/versioned_docs/version-2.4.2/functions-overview.md
+++ b/site2/website/versioned_docs/version-2.4.2/functions-overview.md
@@ -54,7 +54,7 @@ If you implement the classic word count example using Pulsar Functions, it looks
 
 ![Pulsar Functions word count example](assets/pulsar-functions-word-count.png)
 
-To write the function in Java with [Pulsar Functions SDK for Java](functions-develop#available-apis), you can write the function as follows.
+To write the function in Java with [Pulsar Functions SDK for Java](functions-develop.md#available-apis), you can write the function as follows.
 
 ```java
 package org.example.functions;
diff --git a/site2/website/versioned_docs/version-2.4.2/getting-started-standalone.md b/site2/website/versioned_docs/version-2.4.2/getting-started-standalone.md
index 33f72dc329f8b..3c58c88ec9e18 100644
--- a/site2/website/versioned_docs/version-2.4.2/getting-started-standalone.md
+++ b/site2/website/versioned_docs/version-2.4.2/getting-started-standalone.md
@@ -172,6 +172,8 @@ If you have started Pulsar successfully, you will see `INFO`-level log messages
 
 > #### Tip
 > 
+> * Before starting the Pulsar standalone, you may need to config the advertisedAddress to avoid startup errors. Actually, you can modify the default value of advertisedAddress in "conf/standalone.conf" or use command "bin/pulsar standalone -a 127.0.0.1" to assign the advertisedAddress.
+>
 > * The service is running on your terminal, which is under your direct control. If you need to run other commands, open a new terminal window.  
 You can also run the service as a background process using the `pulsar-daemon start standalone` command. For more information, see [pulsar-daemon](https://pulsar.apache.org/docs/en/reference-cli-tools/#pulsar-daemon).
 > 
diff --git a/site2/website/versioned_docs/version-2.5.0/administration-pulsar-manager.md b/site2/website/versioned_docs/version-2.5.0/administration-pulsar-manager.md
index 3a7bcc21468c1..aca601678d7f5 100644
--- a/site2/website/versioned_docs/version-2.5.0/administration-pulsar-manager.md
+++ b/site2/website/versioned_docs/version-2.5.0/administration-pulsar-manager.md
@@ -7,6 +7,9 @@ original_id: administration-pulsar-manager
 
 Pulsar Manager is a web-based GUI management and monitoring tool that helps administrators and users manage and monitor tenants, namespaces, topics, subscriptions, brokers, clusters, and so on, and supports dynamic configuration of multiple environments.
 
+> Note   
+> If you monitor your current stats with [Pulsar dashboard](administration-dashboard.md), you can try to use Pulsar Manager instead. Pulsar dashboard is deprecated.
+
 ## Install
 
 The easiest way to use the Pulsar Manager is to run it inside a [Docker](https://www.docker.com/products/docker) container.
diff --git a/site2/website/versioned_docs/version-2.5.0/concepts-messaging.md b/site2/website/versioned_docs/version-2.5.0/concepts-messaging.md
index 86fae65d1b82f..0bbe5ecc09831 100644
--- a/site2/website/versioned_docs/version-2.5.0/concepts-messaging.md
+++ b/site2/website/versioned_docs/version-2.5.0/concepts-messaging.md
@@ -227,8 +227,8 @@ When a consumer subscribes to a Pulsar topic, by default it subscribes to one sp
 
 When subscribing to multiple topics, the Pulsar client will automatically make a call to the Pulsar API to discover the topics that match the regex pattern/list and then subscribe to all of them. If any of the topics don't currently exist, the consumer will auto-subscribe to them once the topics are created.
 
-> #### No ordering guarantees
-> When a consumer subscribes to multiple topics, all ordering guarantees normally provided by Pulsar on single topics do not hold. If your use case for Pulsar involves any strict ordering requirements, we would strongly recommend against using this feature.
+> #### No ordering guarantees across multiple topics
+> When a producer sends messages to a single topic, all messages are guaranteed to be read from that topic in the same order. However, these guarantees do not hold across multiple topics. So when a producer sends message to multiple topics, the order in which messages are read from those topics is not guaranteed to be the same.
 
 Here are some multi-topic subscription examples for Java:
 
diff --git a/site2/website/versioned_docs/version-2.5.0/deploy-monitoring.md b/site2/website/versioned_docs/version-2.5.0/deploy-monitoring.md
index 96ea306f4e7fe..d7f80621667a1 100644
--- a/site2/website/versioned_docs/version-2.5.0/deploy-monitoring.md
+++ b/site2/website/versioned_docs/version-2.5.0/deploy-monitoring.md
@@ -32,7 +32,7 @@ All the message rates are updated every 1min.
 The aggregated broker metrics are also exposed in the [Prometheus](https://prometheus.io) format at:
 
 ```shell
-http://$BROKER_ADDRESS:8080/metrics
+http://$BROKER_ADDRESS:8080/metrics/
 ```
 
 ### ZooKeeper stats
diff --git a/site2/website/versioned_docs/version-2.5.0/io-kafka-sink.md b/site2/website/versioned_docs/version-2.5.0/io-kafka-sink.md
index 5988b6aa65d7c..e458e0d093ba8 100644
--- a/site2/website/versioned_docs/version-2.5.0/io-kafka-sink.md
+++ b/site2/website/versioned_docs/version-2.5.0/io-kafka-sink.md
@@ -19,7 +19,7 @@ The configuration of the Kafka sink connector has the following parameters.
 | Name | Type| Required | Default | Description 
 |------|----------|---------|-------------|-------------|
 |  `bootstrapServers` |String| true | " " (empty string) | A comma-separated list of host and port pairs for establishing the initial connection to the Kafka cluster. |
-|`ack`|String|true|" " (empty string) |The number of acknowledgments that the producer requires the leader to receive before a request completes. <br/>This controls the durability of the sent records.
+|`acks`|String|true|" " (empty string) |The number of acknowledgments that the producer requires the leader to receive before a request completes. <br/>This controls the durability of the sent records.
 |`batchsize`|long|false|16384L|The batch size that a Kafka producer attempts to batch records together before sending them to brokers.
 |`maxRequestSize`|long|false|1048576L|The maximum size of a Kafka request in bytes.
 |`topic`|String|true|" " (empty string) |The Kafka topic which receives messages from Pulsar.
diff --git a/site2/website/versioned_docs/version-2.5.0/io-quickstart.md b/site2/website/versioned_docs/version-2.5.0/io-quickstart.md
index 26a9df3f6113c..dba9845a41a68 100644
--- a/site2/website/versioned_docs/version-2.5.0/io-quickstart.md
+++ b/site2/website/versioned_docs/version-2.5.0/io-quickstart.md
@@ -26,7 +26,7 @@ At the end of this tutorial, you are able to:
 
 Before connecting Pulsar to a database, you need to install Pulsar and the desired built-in connector.
 
-For more information about **how to install a standalone Pulsar and built-in connectors**, see [here](standalone/#installing-pulsar).
+For more information about **how to install a standalone Pulsar and built-in connectors**, see [here](getting-started-standalone.md/#installing-pulsar).
 
 ## Start Pulsar standalone 
 
diff --git a/site2/website/versioned_docs/version-2.5.0/io-use.md b/site2/website/versioned_docs/version-2.5.0/io-use.md
new file mode 100644
index 0000000000000..4b19c2881ae04
--- /dev/null
+++ b/site2/website/versioned_docs/version-2.5.0/io-use.md
@@ -0,0 +1,1506 @@
+---
+id: version-2.5.0-io-use
+title: How to use Pulsar connectors
+sidebar_label: Use
+original_id: io-use
+---
+
+
+This guide describes how to use Pulsar connectors.
+
+## Install a connector
+
+Pulsar bundles several [builtin connectors](io-connectors.md) used to move data in and out of commonly used systems (such as database and messaging system). Optionally, you can create and use your desired non-builtin connectors.
+
+> #### Note
+> 
+> When using a non-builtin connector, you need to specify the path of a archive file for the connector.
+
+To set up a builtin connector, follow
+the instructions [here](getting-started-standalone.md#installing-builtin-connectors).
+
+After the setup, the builtin connector is automatically discovered by Pulsar brokers (or function-workers), so no additional installation steps are required.
+
+## Configure a connector
+
+You can configure the following information:
+
+* [Configure a default storage location for a connector](#configure-a-default-storage-location-for-a-connector)
+
+* [Configure a connector with a YAML file](#configure-a-connector-with-yaml-file)
+
+### Configure a default storage location for a connector
+
+To configure a default folder for builtin connectors, set the `connectorsDirectory` parameter in the `./conf/functions_worker.yml` configuration file.
+
+**Example**
+
+Set the `./connectors` folder as the default storage location for builtin connectors.
+
+```
+########################
+# Connectors
+########################
+
+connectorsDirectory: ./connectors
+```
+
+### Configure a connector with a YAML file
+
+To configure a connector, you need to provide a YAML configuration file when creating a connector.
+
+The YAML configuration file tells Pulsar where to locate connectors and how to connect connectors with Pulsar topics.
+
+**Example 1**
+
+Below is a YAML configuration file of a Cassandra sink, which tells Pulsar:
+
+* Which Cassandra cluster to connect
+  
+* What is the `keyspace` and `columnFamily` to be used in Cassandra for collecting data
+  
+* How to map Pulsar messages into Cassandra table key and columns
+
+```shell
+tenant: public
+namespace: default
+name: cassandra-test-sink
+...
+# cassandra specific config
+configs:
+    roots: "localhost:9042"
+    keyspace: "pulsar_test_keyspace"
+    columnFamily: "pulsar_test_table"
+    keyname: "key"
+    columnName: "col"
+```
+
+**Example 2**
+
+Below is a YAML configuration file of a Kafka source.
+
+```shell
+configs:
+   bootstrapServers: "pulsar-kafka:9092"
+   groupId: "test-pulsar-io"
+   topic: "my-topic"
+   sessionTimeoutMs: "10000"
+   autoCommitEnabled: "false"
+```
+
+**Example 3**
+
+Below is a YAML configuration file of a MySQL JDBC sink.
+
+```shell
+configs:
+   userName: "root"
+   password: "jdbc"
+   jdbcUrl: "jdbc:mysql://127.0.0.1:3306/test_jdbc"
+   tableName: "test_jdbc"
+```
+
+## Get available connectors
+
+Before starting using connectors, you can perform the following operations:
+
+* [Reload connectors](#reload)
+  
+* [Get a list of available connectors](#get-available-connectors)
+
+### `reload`
+
+If you add or delete a nar file in a connector folder, reload the available builtin connector before using it.
+
+#### Source
+
+Use the `reload` subcommand.
+
+```shell
+$ pulsar-admin sources reload
+```
+
+For more information, see [`here`](io-cli/#reload).
+
+#### Sink
+
+Use the `reload` subcommand.
+
+```shell
+$ pulsar-admin sinks reload
+```
+
+For more information, see [`here`](io-cli/#reload-1).
+
+### `available`
+
+After reloading connectors (optional), you can get a list of available connectors.
+
+#### Source
+
+Use the `available-sources` subcommand.
+
+```shell
+$ pulsar-admin sources available-sources
+```
+
+#### Sink
+
+Use the `available-sinks` subcommand.
+
+```shell
+$ pulsar-admin sinks available-sinks
+```
+
+## Run a connector
+
+To run a connector, you can perform the following operations:
+
+* [Create a connector](#create)
+  
+* [Start a connector](#start)
+
+* [Run a connector locally](#localrun)
+
+### `create`
+
+You can create a connector using **Admin CLI**, **REST API** or **JAVA admin API**.
+
+#### Source
+
+Create a source connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `create` subcommand.
+
+```
+$ pulsar-admin sources create options
+```
+
+For more information, see [here](io-cli.md#create).
+
+<!--REST API-->
+
+Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v3/sources/:tenant/:namespace/:sourceName|operation/registerSource}
+
+<!--Java Admin API-->
+
+* Create a source connector with a **local file**.
+
+    ```java
+    void createSource(SourceConfig sourceConfig,
+                      String fileName)
+               throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    |Name|Description
+    |---|---
+    `sourceConfig` | The source configuration object
+
+   **Exception**
+
+    |Name|Description|
+    |---|---
+    | `PulsarAdminException` | Unexpected error
+
+    For more information, see [`createSource`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Source.html#createSource-SourceConfig-java.lang.String-).
+
+* Create a source connector using a **remote file** with a URL from which fun-pkg can be downloaded. 
+
+    ```java
+    void createSourceWithUrl(SourceConfig sourceConfig,
+                             String pkgUrl)
+                      throws PulsarAdminException
+    ```
+
+    Supported URLs are `http` and `file`.
+
+    **Example**
+
+    * HTTP: http://www.repo.com/fileName.jar
+
+    * File: file:///dir/fileName.jar
+
+    **Parameter**
+
+    Parameter| Description
+    |---|---
+    `sourceConfig` | The source configuration object
+    `pkgUrl` | URL from which pkg can be downloaded
+
+    **Exception**
+
+    |Name|Description|
+    |---|---
+    | `PulsarAdminException` | Unexpected error
+  
+    For more information, see [`createSourceWithUrl`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Source.html#createSourceWithUrl-SourceConfig-java.lang.String-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+#### Sink
+
+Create a sink connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `create` subcommand.
+
+```
+$ pulsar-admin sinks create options
+```
+
+For more information, see [here](io-cli.md#create-1).
+
+<!--REST API-->
+
+Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v3/sinks/:tenant/:namespace/:sinkName|operation/registerSink}
+
+<!--Java Admin API-->
+
+* Create a sink connector with a **local file**.
+  
+    ```java
+    void createSink(SinkConfig sinkConfig,
+                    String fileName)
+             throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    |Name|Description
+    |---|---
+    `sinkConfig` | The sink configuration object
+
+    **Exception**
+
+    |Name|Description|
+    |---|---
+    | `PulsarAdminException` | Unexpected error
+
+    For more information, see [`createSink`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Sink.html#createSink-SinkConfig-java.lang.String-).
+
+* Create a sink connector using a **remote file** with a URL from which fun-pkg can be downloaded. 
+
+    ```java
+    void createSinkWithUrl(SinkConfig sinkConfig,
+                        String pkgUrl)
+                    throws PulsarAdminException
+    ```
+
+    Supported URLs are `http` and `file`.
+
+    **Example**
+
+    * HTTP: http://www.repo.com/fileName.jar
+
+    * File: file:///dir/fileName.jar
+
+    **Parameter**
+
+    Parameter| Description
+    |---|---
+    `sinkConfig` | The sink configuration object
+    `pkgUrl` | URL from which pkg can be downloaded
+
+    **Exception**
+
+    |Name|Description|
+    |---|---
+    | `PulsarAdminException` | Unexpected error
+  
+    For more information, see [`createSinkWithUrl`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Sink.html#createSinkWithUrl-SinkConfig-java.lang.String-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+### `start`
+
+You can start a connector using **Admin CLI** or **REST API**.
+
+#### Source
+
+Start a source connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `start` subcommand.
+
+```
+$ pulsar-admin sources start options
+```
+
+For more information, see [here](io-cli.md#start).
+
+<!--REST API-->
+
+* Start **all** source connectors.
+
+    Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v3/sources/:tenant/:namespace/:sourceName/start|operation/startSource}
+
+* Start a **specified** source connector.
+
+    Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v3/sources/:tenant/:namespace/:sourceName/:instanceId/start|operation/startSource}
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+#### Sink
+
+Start a sink connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `start` subcommand.
+
+```
+$ pulsar-admin sinks start options
+```
+
+For more information, see [here](io-cli.md#start-1).
+
+<!--REST API-->
+
+* Start **all** sink connectors.
+
+    Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v3/sources/:tenant/:namespace/:sinkName/start|operation/startSink}
+
+* Start a **specified** sink connector.
+
+    Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v3/sinks/:tenant/:namespace/:sourceName/:instanceId/start|operation/startSink}
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+### `localrun`
+
+You can run a connector locally rather than deploying it on a Pulsar cluster using **Admin CLI**.
+
+#### Source
+
+Run a source connector locally.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `localrun` subcommand.
+
+```
+$ pulsar-admin sources localrun options
+```
+
+For more information, see [here](io-cli.md#localrun).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+#### Sink
+
+Run a sink connector locally.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `localrun` subcommand.
+
+```
+$ pulsar-admin sinks localrun options
+```
+
+For more information, see [here](io-cli.md#localrun-1).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+## Monitor a connector
+
+To monitor a connector, you can perform the following operations:
+
+* [Get the information of a connector](#get)
+
+* [Get the list of all running connectors](#list)
+
+* [Get the current status of a connector](#status)
+
+### `get`
+
+You can get the information of a connector using **Admin CLI**, **REST API** or **JAVA admin API**.
+
+#### Source
+
+Get the information of a source connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `get` subcommand.
+
+```
+$ pulsar-admin sources get options
+```
+
+For more information, see [here](io-cli.md#get).
+
+<!--REST API-->
+
+Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v3/sources/:tenant/:namespace/:sourceName|operation/getSourceInfo}
+
+<!--Java Admin API-->
+
+```java
+SourceConfig getSource(String tenant,
+                       String namespace,
+                       String source)
+                throws PulsarAdminException
+```
+
+**Example**
+
+This is a sourceConfig.
+
+```java
+{
+ "tenant": "tenantName",
+ "namespace": "namespaceName",
+ "name": "sourceName",
+ "className": "className",
+ "topicName": "topicName",
+ "configs": {},
+ "parallelism": 1,
+ "processingGuarantees": "ATLEAST_ONCE",
+ "resources": {
+   "cpu": 1.0,
+   "ram": 1073741824,
+   "disk": 10737418240
+ }
+}
+```
+
+This is a sourceConfig example.
+
+```
+{
+ "tenant": "public",
+ "namespace": "default",
+ "name": "debezium-mysql-source",
+ "className": "org.apache.pulsar.io.debezium.mysql.DebeziumMysqlSource",
+ "topicName": "debezium-mysql-topic",
+ "configs": {
+   "database.user": "debezium",
+   "database.server.id": "184054",
+   "database.server.name": "dbserver1",
+   "database.port": "3306",
+   "database.hostname": "localhost",
+   "database.password": "dbz",
+   "database.history.pulsar.service.url": "pulsar://127.0.0.1:6650",
+   "value.converter": "org.apache.kafka.connect.json.JsonConverter",
+   "database.whitelist": "inventory",
+   "key.converter": "org.apache.kafka.connect.json.JsonConverter",
+   "database.history": "org.apache.pulsar.io.debezium.PulsarDatabaseHistory",
+   "pulsar.service.url": "pulsar://127.0.0.1:6650",
+   "database.history.pulsar.topic": "history-topic2"
+ },
+ "parallelism": 1,
+ "processingGuarantees": "ATLEAST_ONCE",
+ "resources": {
+   "cpu": 1.0,
+   "ram": 1073741824,
+   "disk": 10737418240
+ }
+}
+```
+
+**Exception**
+
+Exception name | Description
+|---|---
+`PulsarAdminException.NotAuthorizedException` | You don't have the admin permission 
+`PulsarAdminException.NotFoundException` | Cluster doesn't exist
+`PulsarAdminException` | Unexpected error
+
+For more information, see [`getSource`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Source.html#getSource-java.lang.String-java.lang.String-java.lang.String-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+#### Sink
+
+Get the information of a sink connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `get` subcommand.
+
+```
+$ pulsar-admin sinks get options
+```
+
+For more information, see [here](io-cli.md#get-1).
+
+<!--REST API-->
+
+Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v3/sinks/:tenant/:namespace/:sinkName|operation/getSinkInfo}
+
+<!--Java Admin API-->
+
+```java
+SinkConfig getSink(String tenant,
+                   String namespace,
+                   String sink)
+            throws PulsarAdminException
+```
+
+**Example**
+
+This is a sinkConfig.
+
+```
+{
+"tenant": "tenantName",
+"namespace": "namespaceName",
+"name": "sinkName",
+"className": "className",
+"inputSpecs": {
+"topicName": {
+    "isRegexPattern": false
+}
+},
+"configs": {},
+"parallelism": 1,
+"processingGuarantees": "ATLEAST_ONCE",
+"retainOrdering": false,
+"autoAck": true
+}
+```
+
+This is a sinkConfig example.
+
+```  
+{
+"tenant": "public",
+"namespace": "default",
+"name": "pulsar-mysql-jdbc-sink",
+"className": "org.apache.pulsar.io.jdbc.JdbcAutoSchemaSink",
+"inputSpecs": {
+"pulsar-mysql-jdbc-sink-topic": {
+    "isRegexPattern": false
+}
+},
+"configs": {
+"password": "jdbc",
+"jdbcUrl": "jdbc:mysql://127.0.0.1:3306/pulsar_mysql_jdbc_sink",
+"userName": "root",
+"tableName": "pulsar_mysql_jdbc_sink"
+},
+"parallelism": 1,
+"processingGuarantees": "ATLEAST_ONCE",
+"retainOrdering": false,
+"autoAck": true
+}
+```
+
+**Parameter description**
+
+Name| Description
+|---|---
+`tenant` | Tenant name
+`namespace` | Namespace name
+`sink` | Sink name
+
+For more information, see [`getSink`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Sink.html#getSink-java.lang.String-java.lang.String-java.lang.String-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+### `list`
+
+You can get the list of all running connectors using **Admin CLI**, **REST API** or **JAVA admin API**.
+
+#### Source
+
+Get the list of all running source connectors.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `list` subcommand.
+
+```
+$ pulsar-admin sources list options
+```
+
+For more information, see [here](io-cli.md#list).
+
+<!--REST API-->
+
+Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v3/sources/:tenant/:namespace/|operation/listSources}
+
+<!--Java Admin API-->
+
+```java
+List<String> listSources(String tenant,
+                         String namespace)
+                  throws PulsarAdminException
+```
+
+**Response example**
+
+```java
+["f1", "f2", "f3"]
+```
+
+**Exception**
+
+Exception name | Description
+|---|---
+`PulsarAdminException.NotAuthorizedException` | You don't have the admin permission
+`PulsarAdminException` | Unexpected error
+
+For more information, see [`listSource`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Source.html#listSources-java.lang.String-java.lang.String-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+#### Sink
+
+Get the list of all running sink connectors.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `list` subcommand.
+
+```
+$ pulsar-admin sinks list options
+```
+
+For more information, see [here](io-cli.md#list-1).
+
+<!--REST API-->
+
+Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v3/sinks/:tenant/:namespace/|operation/listSinks}
+
+<!--Java Admin API-->
+
+```java
+List<String> listSinks(String tenant,
+                       String namespace)
+                throws PulsarAdminException
+```
+
+**Response example**
+
+```java
+["f1", "f2", "f3"]
+```
+
+**Exception**
+
+Exception name | Description
+|---|---
+`PulsarAdminException.NotAuthorizedException` | You don't have the admin permission 
+`PulsarAdminException` | Unexpected error
+
+For more information, see [`listSource`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Sink.html#listSinks-java.lang.String-java.lang.String-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+### `status`
+
+You can get the current status of a connector using **Admin CLI**, **REST API** or **JAVA admin API**.
+
+#### Source
+
+Get the current status of a source connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `status` subcommand.
+
+```
+$ pulsar-admin sources status options
+```
+
+For more information, see [here](io-cli.md#status).
+
+<!--REST API-->
+
+* Get the current status of **all** source connectors.
+  
+  Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v3/sources/:tenant/:namespace/:sourceName/status|operation/getSourceStatus}
+
+* Gets the current status of a **specified** source connector.
+
+  Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v3/sources/:tenant/:namespace/:sourceName/:instanceId/status|operation/getSourceStatus}
+  
+<!--Java Admin API-->
+
+* Get the current status of **all** source connectors.
+
+    ```java
+    SourceStatus getSourceStatus(String tenant,
+                                String namespace,
+                                String source)
+                        throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    Parameter| Description
+    |---|---
+    `tenant` | Tenant name
+    `namespace` | Namespace name
+    `sink` | Source name
+
+    **Exception**
+
+    Name | Description
+    |---|---
+    `PulsarAdminException` | Unexpected error
+
+    For more information, see [`getSourceStatus`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Source.html#getSource-java.lang.String-java.lang.String-java.lang.String-).
+
+* Gets the current status of a **specified** source connector.
+
+    ```java
+    SourceStatus.SourceInstanceStatus.SourceInstanceStatusData getSourceStatus(String tenant,
+                                                                               String namespace,
+                                                                               String source,
+                                                                               int id)
+                                                                        throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    Parameter| Description
+    |---|---
+    `tenant` | Tenant name
+    `namespace` | Namespace name
+    `sink` | Source name
+    `id` | Source instanceID
+
+    **Exception**
+
+    Exception name | Description
+    |---|---
+    `PulsarAdminException` | Unexpected error
+
+    For more information, see [`getSourceStatus`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Source.html#getSourceStatus-java.lang.String-java.lang.String-java.lang.String-int-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+#### Sink
+
+Get the current status of a Pulsar sink connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `status` subcommand.
+
+```
+$ pulsar-admin sinks status options
+```
+
+For more information, see [here](io-cli.md#status-1).
+
+<!--REST API-->
+
+* Get the current status of **all** sink connectors.
+  
+  Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v3/sinks/:tenant/:namespace/:sinkName/status|operation/getSinkStatus}
+
+* Gets the current status of a **specified** sink connector.
+
+  Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v3/sinks/:tenant/:namespace/:sourceName/:instanceId/status|operation/getSinkInstanceStatus}
+
+<!--Java Admin API-->
+
+* Get the current status of **all** sink connectors.
+
+    ```java
+    SinkStatus getSinkStatus(String tenant,
+                             String namespace,
+                             String sink)
+                      throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    Parameter| Description
+    |---|---
+    `tenant` | Tenant name
+    `namespace` | Namespace name
+    `sink` | Source name
+
+    **Exception**
+
+    Exception name | Description
+    |---|---
+    `PulsarAdminException` | Unexpected error
+
+    For more information, see [`getSinkStatus`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Sink.html#getSinkStatus-java.lang.String-java.lang.String-java.lang.String-).
+
+* Gets the current status of a **specified** source connector.
+
+    ```java
+    SinkStatus.SinkInstanceStatus.SinkInstanceStatusData getSinkStatus(String tenant,
+                                                                       String namespace,
+                                                                       String sink,
+                                                                       int id)
+                                                                throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    Parameter| Description
+    |---|---
+    `tenant` | Tenant name
+    `namespace` | Namespace name
+    `sink` | Source name
+    `id` | Sink instanceID
+
+    **Exception**
+
+    Exception name | Description
+    |---|---
+    `PulsarAdminException` | Unexpected error
+
+    For more information, see [`getSinkStatusWithInstanceID`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Sink.html#getSinkStatus-java.lang.String-java.lang.String-java.lang.String-int-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+## Update a connector
+
+### `update`
+
+You can update a running connector using **Admin CLI**, **REST API** or **JAVA admin API**.
+
+#### Source
+
+Update a running Pulsar source connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `update` subcommand.
+
+```
+$ pulsar-admin sources update options
+```
+
+For more information, see [here](io-cli.md#update).
+
+<!--REST API-->
+
+Send a `PUT` request to this endpoint: {@inject: endpoint|PUT|/admin/v3/sources/:tenant/:namespace/:sourceName|operation/updateSource}
+  
+<!--Java Admin API-->
+
+* Update a running source connector with a **local file**.
+
+    ```java
+    void updateSource(SourceConfig sourceConfig,
+                    String fileName)
+            throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    | Name | Description
+    |---|---
+    |`sourceConfig` | The source configuration object
+
+    **Exception**
+
+    |Name|Description|
+    |---|---
+    |`PulsarAdminException.NotAuthorizedException`| You don't have the admin permission 
+    | `PulsarAdminException.NotFoundException` | Cluster doesn't exist
+    | `PulsarAdminException` | Unexpected error
+
+    For more information, see [`updateSource`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Source.html#updateSource-SourceConfig-java.lang.String-).
+
+* Update a source connector using a **remote file** with a URL from which fun-pkg can be downloaded. 
+
+    ```java
+    void updateSourceWithUrl(SourceConfig sourceConfig,
+                         String pkgUrl)
+                  throws PulsarAdminException
+    ```
+
+    Supported URLs are `http` and `file`.
+
+    **Example**
+
+    * HTTP: http://www.repo.com/fileName.jar
+
+    * File: file:///dir/fileName.jar
+  
+    **Parameter**
+
+    | Name | Description
+    |---|---
+    | `sourceConfig` | The source configuration object
+    | `pkgUrl` | URL from which pkg can be downloaded
+
+    **Exception**
+
+    |Name|Description|
+    |---|---
+    |`PulsarAdminException.NotAuthorizedException`| You don't have the admin permission 
+    | `PulsarAdminException.NotFoundException` | Cluster doesn't exist
+    | `PulsarAdminException` | Unexpected error
+
+For more information, see [`createSourceWithUrl`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Source.html#updateSourceWithUrl-SourceConfig-java.lang.String-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+#### Sink
+
+Update a running Pulsar sink connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `update` subcommand.
+
+```
+$ pulsar-admin sinks update options
+```
+
+For more information, see [here](io-cli.md#update-1).
+
+<!--REST API-->
+
+Send a `PUT` request to this endpoint: {@inject: endpoint|PUT|/admin/v3/sinks/:tenant/:namespace/:sinkName|operation/updateSink}
+  
+<!--Java Admin API-->
+
+* Update a running sink connector with a **local file**.
+
+    ```java
+    void updateSink(SinkConfig sinkConfig,
+                    String fileName)
+         throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    | Name | Description
+    |---|---
+    |`sinkConfig` | The sink configuration object
+
+    **Exception**
+
+    |Name|Description|
+    |---|---
+    |`PulsarAdminException.NotAuthorizedException`| You don't have the admin permission
+    | `PulsarAdminException.NotFoundException` | Cluster doesn't exist
+    | `PulsarAdminException` | Unexpected error
+
+    For more information, see [`updateSink`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Sink.html#updateSink-SinkConfig-java.lang.String-).
+
+* Update a sink connector using a **remote file** with a URL from which fun-pkg can be downloaded. 
+
+    ```java
+    void updateSinkWithUrl(SinkConfig sinkConfig,
+                           String pkgUrl)
+                    throws PulsarAdminException
+    ```
+
+    Supported URLs are `http` and `file`.
+
+    **Example**
+
+    * HTTP: http://www.repo.com/fileName.jar
+
+    * File: file:///dir/fileName.jar
+  
+    **Parameter**
+
+    | Name | Description
+    |---|---
+    | `sinkConfig` | The sink configuration object
+    | `pkgUrl` | URL from which pkg can be downloaded
+
+    **Exception**
+
+    |Name|Description|
+    |---|---
+    |`PulsarAdminException.NotAuthorizedException`| You don't have the admin permission 
+    |`PulsarAdminException.NotFoundException` | Cluster doesn't exist
+    |`PulsarAdminException` | Unexpected error
+
+For more information, see [`updateSinkWithUrl`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Sink.html#updateSinkWithUrl-SinkConfig-java.lang.String-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+## Stop a connector
+
+### `stop`
+
+You can stop a connector using **Admin CLI**, **REST API** or **JAVA admin API**.
+
+#### Source
+
+Stop a source connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `stop` subcommand.
+
+```
+$ pulsar-admin sources stop options
+```
+
+For more information, see [here](io-cli.md#stop).
+
+<!--REST API-->
+
+* Stop **all** source connectors.
+  
+  Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v3/sources/:tenant/:namespace/:sourceName|operation/stopSource}
+
+* Stop a **specified** source connector.
+  
+  Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v3/sources/:tenant/:namespace/:sourceName/:instanceId|operation/stopSource}
+
+<!--Java Admin API-->
+
+* Stop **all** source connectors.
+
+    ```java
+    void stopSource(String tenant,
+                    String namespace,
+                    String source)
+            throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    | Name | Description
+    |---|---
+    `tenant` | Tenant name
+    `namespace` | Namespace name
+    `source` | Source name
+
+    **Exception**
+
+    |Name|Description|
+    |---|---
+    | `PulsarAdminException` | Unexpected error
+
+    For more information, see [`stopSource`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Source.html#stopSource-java.lang.String-java.lang.String-java.lang.String-).
+
+* Stop a **specified** source connector. 
+
+    ```java
+    void stopSource(String tenant,
+                    String namespace,
+                    String source,
+                    int instanceId)
+             throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    | Name | Description
+    |---|---
+    `tenant` | Tenant name
+    `namespace` | Namespace name
+    `source` | Source name
+     `instanceId` | Source instanceID
+
+    **Exception**
+
+    |Name|Description|
+    |---|---
+    | `PulsarAdminException` | Unexpected error
+
+    For more information, see [`stopSource`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Source.html#stopSource-java.lang.String-java.lang.String-java.lang.String-int-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+#### Sink
+
+Stop a sink connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `stop` subcommand.
+
+```
+$ pulsar-admin sinks stop options
+```
+
+For more information, see [here](io-cli.md#stop-1).
+
+<!--REST API-->
+
+* Stop **all** sink connectors.
+  
+  Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v3/sinks/:tenant/:namespace/:sinkName/stop|operation/stopSink}
+
+* Stop a **specified** sink connector.
+  
+  Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v3/sources/:tenant/:namespace/:sinkeName/:instanceId/stop|operation/stopSink}
+
+<!--Java Admin API-->
+
+* Stop **all** sink connectors.
+
+    ```java
+    void stopSink(String tenant,
+                String namespace,
+                String sink)
+        throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    | Name | Description
+    |---|---
+    `tenant` | Tenant name
+    `namespace` | Namespace name
+    `source` | Source name
+
+    **Exception**
+
+    |Name|Description|
+    |---|---
+    | `PulsarAdminException` | Unexpected error
+
+    For more information, see [`stopSink`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Sink.html#stopSink-java.lang.String-java.lang.String-java.lang.String-).
+
+* Stop a **specified** sink connector. 
+
+    ```java
+    void stopSink(String tenant,
+                  String namespace,
+                  String sink,
+                  int instanceId)
+           throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    | Name | Description
+    |---|---
+    `tenant` | Tenant name
+    `namespace` | Namespace name
+    `source` | Source name
+    `instanceId` | Source instanceID
+
+    **Exception**
+
+    |Name|Description|
+    |---|---
+    | `PulsarAdminException` | Unexpected error
+
+    For more information, see [`stopSink`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Sink.html#stopSink-java.lang.String-java.lang.String-java.lang.String-int-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+## Restart a connector
+
+### `restart`
+
+You can restart a connector using **Admin CLI**, **REST API** or **JAVA admin API**.
+
+#### Source
+
+Restart a source connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `restart` subcommand.
+
+```
+$ pulsar-admin sources restart options
+```
+
+For more information, see [here](io-cli.md#restart).
+
+<!--REST API-->
+
+* Restart **all** source connectors.
+  
+  Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v3/sources/:tenant/:namespace/:sourceName/restart|operation/restartSource}
+
+* Restart a **specified** source connector.
+  
+  Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v3/sources/:tenant/:namespace/:sourceName/:instanceId/restart|operation/restartSource}
+
+<!--Java Admin API-->
+
+* Restart **all** source connectors.
+
+    ```java
+    void restartSource(String tenant,
+                       String namespace,
+                       String source)
+                throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    | Name | Description
+    |---|---
+    `tenant` | Tenant name
+    `namespace` | Namespace name
+    `source` | Source name
+
+    **Exception**
+
+    |Name|Description|
+    |---|---
+    | `PulsarAdminException` | Unexpected error
+
+    For more information, see [`restartSource`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Source.html#restartSource-java.lang.String-java.lang.String-java.lang.String-).
+
+* Restart a **specified** source connector. 
+
+    ```java
+    void restartSource(String tenant,
+                       String namespace,
+                       String source,
+                       int instanceId)
+                throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    | Name | Description
+    |---|---
+    `tenant` | Tenant name
+    `namespace` | Namespace name
+    `source` | Source name
+     `instanceId` | Source instanceID
+
+    **Exception**
+
+    |Name|Description|
+    |---|---
+    | `PulsarAdminException` | Unexpected error
+
+    For more information, see [`restartSource`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Source.html#restartSource-java.lang.String-java.lang.String-java.lang.String-int-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+#### Sink
+
+Restart a sink connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `restart` subcommand.
+
+```
+$ pulsar-admin sinks restart options
+```
+
+For more information, see [here](io-cli.md#restart-1).
+
+<!--REST API-->
+
+* Restart **all** sink connectors.
+  
+  Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v3/sources/:tenant/:namespace/:sinkName/restart|operation/restartSource}
+
+* Restart a **specified** sink connector.
+  
+  Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v3/sources/:tenant/:namespace/:sinkName/:instanceId/restart|operation/restartSource}
+
+<!--Java Admin API-->
+
+* Restart all Pulsar sink connectors.
+
+    ```java
+    void restartSink(String tenant,
+                     String namespace,
+                     String sink)
+              throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    | Name | Description
+    |---|---
+    `tenant` | Tenant name
+    `namespace` | Namespace name
+    `sink` | Sink name
+
+    **Exception**
+
+    |Name|Description|
+    |---|---
+    | `PulsarAdminException` | Unexpected error
+
+    For more information, see [`restartSink`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Sink.html#restartSink-java.lang.String-java.lang.String-java.lang.String-).
+
+* Restart a **specified** sink connector. 
+
+    ```java
+    void restartSink(String tenant,
+                     String namespace,
+                     String sink,
+                     int instanceId)
+              throws PulsarAdminException
+    ```
+
+    **Parameter**
+
+    | Name | Description
+    |---|---
+    `tenant` | Tenant name
+    `namespace` | Namespace name
+    `source` | Source name
+     `instanceId` | Sink instanceID
+
+    **Exception**
+
+    |Name|Description|
+    |---|---
+    | `PulsarAdminException` | Unexpected error
+
+    For more information, see [`restartSink`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Sink.html#restartSink-java.lang.String-java.lang.String-java.lang.String-int-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+## Delete a connector
+
+### `delete`
+
+You can delete a connector using **Admin CLI**, **REST API** or **JAVA admin API**.
+
+#### Source
+
+Delete a source connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `delete` subcommand.
+
+```
+$ pulsar-admin sources delete options
+```
+
+For more information, see [here](io-cli.md#delete).
+
+<!--REST API-->
+
+Delete al Pulsar source connector.
+  
+Send a `DELETE` request to this endpoint: {@inject: endpoint|DELETE|/admin/v3/sources/:tenant/:namespace/:sourceName|operation/deregisterSource}
+
+<!--Java Admin API-->
+
+Delete a source connector.
+
+```java
+void deleteSource(String tenant,
+                  String namespace,
+                  String source)
+           throws PulsarAdminException
+```
+
+**Parameter**
+
+| Name | Description
+|---|---
+`tenant` | Tenant name
+`namespace` | Namespace name
+`source` | Source name
+
+**Exception**
+
+|Name|Description|
+|---|---
+|`PulsarAdminException.NotAuthorizedException`| You don't have the admin permission
+| `PulsarAdminException.NotFoundException` | Cluster doesn't exist
+| `PulsarAdminException.PreconditionFailedException` | Cluster is not empty
+| `PulsarAdminException` | Unexpected error
+
+For more information, see [`deleteSource`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Source.html#deleteSource-java.lang.String-java.lang.String-java.lang.String-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
+
+#### Sink
+
+Delete a sink connector.
+
+<!--DOCUSAURUS_CODE_TABS-->
+
+<!--Admin CLI-->
+
+Use the `delete` subcommand.
+
+```
+$ pulsar-admin sinks delete options
+```
+
+For more information, see [here](io-cli.md#delete-1).
+
+<!--REST API-->
+
+Delete a sink connector.
+  
+Send a `DELETE` request to this endpoint: {@inject: endpoint|DELETE|/admin/v3/sinks/:tenant/:namespace/:sinkName|operation/deregisterSink}
+
+<!--Java Admin API-->
+
+Delete a Pulsar sink connector.
+
+```java
+void deleteSink(String tenant,
+                String namespace,
+                String source)
+         throws PulsarAdminException
+```
+
+**Parameter**
+
+| Name | Description
+|---|---
+`tenant` | Tenant name
+`namespace` | Namespace name
+`sink` | Sink name
+
+**Exception**
+
+|Name|Description|
+|---|---
+|`PulsarAdminException.NotAuthorizedException`| You don't have the admin permission
+| `PulsarAdminException.NotFoundException` | Cluster doesn't exist
+| `PulsarAdminException.PreconditionFailedException` | Cluster is not empty
+| `PulsarAdminException` | Unexpected error
+
+For more information, see [`deleteSource`](https://pulsar.apache.org/api/admin/org/apache/pulsar/client/admin/Sink.html#deleteSink-java.lang.String-java.lang.String-java.lang.String-).
+
+<!--END_DOCUSAURUS_CODE_TABS-->
diff --git a/site2/website/versioned_sidebars/version-2.5.0-sidebars.json b/site2/website/versioned_sidebars/version-2.5.0-sidebars.json
index f61588847baf4..c9850988bef59 100644
--- a/site2/website/versioned_sidebars/version-2.5.0-sidebars.json
+++ b/site2/website/versioned_sidebars/version-2.5.0-sidebars.json
@@ -64,7 +64,6 @@
     "Administration": [
       "version-2.5.0-administration-zk-bk",
       "version-2.5.0-administration-geo",
-      "version-2.5.0-administration-dashboard",
       "version-2.5.0-administration-pulsar-manager",
       "version-2.5.0-administration-stats",
       "version-2.5.0-administration-load-balance",
@@ -131,7 +130,6 @@
       "version-2.5.0-reference-terminology",
       "version-2.5.0-reference-cli-tools",
       "version-2.5.0-pulsar-admin",
-      "version-2.5.0-reference-connector-admin",
       "version-2.5.0-reference-configuration",
       "version-2.5.0-reference-metrics"
     ]
diff --git a/tests/docker-images/latest-version-image/Dockerfile b/tests/docker-images/latest-version-image/Dockerfile
index 35b757d7789a1..eaa279a42cd11 100644
--- a/tests/docker-images/latest-version-image/Dockerfile
+++ b/tests/docker-images/latest-version-image/Dockerfile
@@ -19,7 +19,9 @@
 
 FROM apachepulsar/pulsar-all:latest
 
-RUN apt-get update && apt-get install -y supervisor vim procps
+RUN rm -rf /var/lib/apt/lists/* && apt update
+
+RUN apt-get clean && apt-get update && apt-get install -y supervisor vim procps curl git
 
 RUN mkdir -p /var/log/pulsar && mkdir -p /var/run/supervisor/ && mkdir -p /pulsar/ssl
 
@@ -43,10 +45,33 @@ COPY scripts/init-cluster.sh scripts/run-global-zk.sh scripts/run-local-zk.sh \
 
 RUN mkdir -p /pulsar/instances/deps
 
+ENV GOLANG_VERSION 1.13.3
+
+RUN curl -sSL https://storage.googleapis.com/golang/go$GOLANG_VERSION.linux-amd64.tar.gz \
+		| tar -v -C /usr/local -xz
+
+# RUN wget https://dl.google.com/go/go1.13.3.linux-amd64.tar.gz && tar -xvf go1.13.3.linux-amd64.tar.gz && mv go /usr/local
+# RUN export GOROOT=/usr/local/go && export GOPATH=$HOME/go && export PATH=$GOPATH/bin:$GOROOT/bin:$PATH
+# RUN echo "export GOROOT=/usr/local/go" >> ~/.profile && echo "export GOPATH=$HOME/go" >> ~/.profile && echo "export PATH=$GOPATH/bin:$GOROOT/bin:$PATH" >> ~/.profile
+
+ENV PATH /usr/local/go/bin:$PATH
+
+RUN mkdir -p /go/src /go/bin && chmod -R 777 /go
+ENV GOROOT /usr/local/go
+ENV GOPATH /go
+ENV PATH /go/bin:$PATH
+
 COPY python-examples/exclamation_lib.py /pulsar/instances/deps/
 COPY python-examples/exclamation_with_extra_deps.py /pulsar/examples/python-examples/
 COPY python-examples/exclamation.zip /pulsar/examples/python-examples/
 COPY python-examples/producer_schema.py /pulsar/examples/python-examples/
 COPY python-examples/consumer_schema.py /pulsar/examples/python-examples/
 COPY python-examples/exception_function.py /pulsar/examples/python-examples/
+
+COPY target/pulsar-function-go/ /go/src/github.com/apache/pulsar/pulsar-function-go
+RUN cd /go/src/github.com/apache/pulsar/pulsar-function-go && go install ./...
+RUN cd /go/src/github.com/apache/pulsar/pulsar-function-go/pf && go install
+RUN cd /go/src/github.com/apache/pulsar/pulsar-function-go/examples && go install ./...
+
 COPY target/java-test-functions.jar /pulsar/examples/
+RUN cp -a /go/bin/. /pulsar/examples/go-examples/
diff --git a/tests/docker-images/latest-version-image/pom.xml b/tests/docker-images/latest-version-image/pom.xml
index b0c3f76a94306..5a961b016f2f7 100644
--- a/tests/docker-images/latest-version-image/pom.xml
+++ b/tests/docker-images/latest-version-image/pom.xml
@@ -79,6 +79,28 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <artifactId>maven-resources-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-pulsar-function-go</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>${project.build.directory}/pulsar-function-go/</outputDirectory>
+                  <overwrite>true</overwrite>
+                  <resources>
+                    <resource>
+                      <directory>../../../pulsar-function-go/</directory>
+                      <filtering>false</filtering>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>com.spotify</groupId>
             <artifactId>dockerfile-maven-plugin</artifactId>
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/PulsarTokenAuthenticationBaseSuite.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/PulsarTokenAuthenticationBaseSuite.java
index 118cb3ba252a2..ad0fa83ce6c68 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/PulsarTokenAuthenticationBaseSuite.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/PulsarTokenAuthenticationBaseSuite.java
@@ -24,11 +24,9 @@
 
 import java.util.Collections;
 import java.util.EnumSet;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Stream;
 
-import lombok.Cleanup;
-import lombok.extern.slf4j.Slf4j;
-
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.api.AuthenticationFactory;
 import org.apache.pulsar.client.api.Consumer;
@@ -51,8 +49,12 @@
 import org.testng.ITest;
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
+import lombok.Cleanup;
+import lombok.extern.slf4j.Slf4j;
+
 @Slf4j
 public abstract class PulsarTokenAuthenticationBaseSuite extends PulsarClusterTestBase implements ITest {
 
@@ -64,24 +66,27 @@ public abstract class PulsarTokenAuthenticationBaseSuite extends PulsarClusterTe
     protected abstract void configureBroker(BrokerContainer brokerContainer) throws Exception;
     protected abstract void configureProxy(ProxyContainer proxyContainer) throws Exception;
 
+    protected abstract String createClientTokenWithExpiry(long expiryTime, TimeUnit unit) throws Exception;
+
     protected static final String SUPER_USER_ROLE = "super-user";
     protected static final String PROXY_ROLE = "proxy";
     protected static final String REGULAR_USER_ROLE = "client";
 
+    protected ZKContainer<?> cmdContainer;
+
     @BeforeSuite
     @Override
     public void setupCluster() throws Exception {
         // Before starting the cluster, generate the secret key and the token
         // Use Zk container to have 1 container available before starting the cluster
-        try (ZKContainer<?> zkContainer = new ZKContainer<>("cli-setup")) {
-            zkContainer
+        this.cmdContainer = new ZKContainer<>("cli-setup");
+        cmdContainer
                 .withNetwork(Network.newNetwork())
                 .withNetworkAliases(ZKContainer.NAME)
                 .withEnv("zkServers", ZKContainer.NAME);
-            zkContainer.start();
+        cmdContainer.start();
 
-            createKeysAndTokens(zkContainer);
-        }
+        createKeysAndTokens(cmdContainer);
 
         final String clusterName = Stream.of(this.getClass().getSimpleName(), randomName(5))
                 .filter(s -> s != null && !s.isEmpty())
@@ -108,6 +113,8 @@ public void setupCluster() throws Exception {
             brokerContainer.withEnv("superUserRoles", SUPER_USER_ROLE + "," + PROXY_ROLE);
             brokerContainer.withEnv("brokerClientAuthenticationPlugin", AuthenticationToken.class.getName());
             brokerContainer.withEnv("brokerClientAuthenticationParameters", "token:" + superUserAuthToken);
+            brokerContainer.withEnv("authenticationRefreshCheckSeconds", "1");
+            brokerContainer.withEnv("authenticateOriginalAuthData", "true");
         }
 
         ProxyContainer proxyContainer = pulsarCluster.getProxy();
@@ -118,6 +125,7 @@ public void setupCluster() throws Exception {
         proxyContainer.withEnv("authorizationEnabled", "true");
         proxyContainer.withEnv("brokerClientAuthenticationPlugin", AuthenticationToken.class.getName());
         proxyContainer.withEnv("brokerClientAuthenticationParameters", "token:" + proxyAuthToken);
+        proxyContainer.withEnv("forwardAuthorizationCredentials", "true");
 
         pulsarCluster.start();
 
@@ -128,6 +136,7 @@ public void setupCluster() throws Exception {
     @Override
     public void tearDownCluster() {
         super.tearDownCluster();
+        cmdContainer.close();
     }
 
     @Override
@@ -253,4 +262,71 @@ public void testProxyRedirectWithTokenAuth() throws Exception {
             admin.topics().getStats(topic);
         }
     }
+
+    @DataProvider(name = "shouldRefreshToken")
+    public static Object[][] shouldRefreshToken() {
+        return new Object[][] { { Boolean.TRUE }, { Boolean.FALSE } };
+    }
+
+    @Test(dataProvider = "shouldRefreshToken")
+    public void testExpiringToken(boolean shouldRefreshToken) throws Exception {
+        final String tenant = "token-test-tenant" + randomName(4);
+        final String namespace = tenant + "/ns-1";
+        final String topic = "persistent://" + namespace + "/topic-1";
+
+        @Cleanup
+        PulsarAdmin admin = PulsarAdmin.builder()
+                .serviceHttpUrl(pulsarCluster.getHttpServiceUrl())
+                .authentication(AuthenticationFactory.token(superUserAuthToken))
+                .build();
+
+        admin.tenants().createTenant(tenant,
+                new TenantInfo(Collections.singleton(REGULAR_USER_ROLE),
+                        Collections.singleton(pulsarCluster.getClusterName())));
+
+        admin.namespaces().createNamespace(namespace, Collections.singleton(pulsarCluster.getClusterName()));
+        admin.namespaces().grantPermissionOnNamespace(namespace, REGULAR_USER_ROLE, EnumSet.allOf(AuthAction.class));
+
+        String initialToken = this.createClientTokenWithExpiry(5, TimeUnit.SECONDS);
+
+        @Cleanup
+        PulsarClient client = PulsarClient.builder()
+                .serviceUrl(pulsarCluster.getPlainTextServiceUrl())
+                .authentication(AuthenticationFactory.token(() -> {
+                    if (shouldRefreshToken) {
+                        try {
+                            return createClientTokenWithExpiry(5, TimeUnit.SECONDS);
+                        } catch (Exception e) {
+                            return null;
+                        }
+                    } else {
+                        return initialToken;
+                    }
+                }))
+                .build();
+
+        @Cleanup
+        Producer<String> producer = client.newProducer(Schema.STRING)
+                .topic(topic)
+                .sendTimeout(1, TimeUnit.SECONDS)
+                .create();
+
+        // Initially the token is valid and producer will be able to publish
+        producer.send("hello-1");
+
+        Thread.sleep(TimeUnit.SECONDS.toMillis(10));
+
+        if (shouldRefreshToken) {
+            // The token will have been refreshed, so the app won't see any error
+            producer.send("hello-2");
+        } else {
+            // The token has expired, so this next message will be rejected
+            try {
+                producer.send("hello-2");
+                fail("Publish should have failed");
+            } catch (PulsarClientException e) {
+                // Expected
+            }
+        }
+    }
 }
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithPublicPrivateKeys.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithPublicPrivateKeys.java
index 7f1a03aa9cd8b..f252e29f140d5 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithPublicPrivateKeys.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithPublicPrivateKeys.java
@@ -21,6 +21,7 @@
 import com.google.common.io.Files;
 
 import java.io.File;
+import java.util.concurrent.TimeUnit;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -87,4 +88,14 @@ protected void configureProxy(ProxyContainer proxyContainer) throws Exception {
         proxyContainer.withFileSystemBind(publicKeyFile.toString(), PUBLIC_KEY_PATH_INSIDE_CONTAINER);
         proxyContainer.withEnv("tokenPublicKey", "file://" + PUBLIC_KEY_PATH_INSIDE_CONTAINER);
     }
+
+    @Override
+    protected String createClientTokenWithExpiry(long expiryTime, TimeUnit unit) throws Exception {
+        return cmdContainer
+                .execCmd(PulsarCluster.PULSAR_COMMAND_SCRIPT, "tokens", "create",
+                        "--private-key", "file://" + PRIVATE_KEY_PATH_INSIDE_CONTAINER,
+                        "--subject", REGULAR_USER_ROLE,
+                        "--expiry-time", unit.toSeconds(expiryTime) + "s")
+                .getStdout().trim();
+    }
 }
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithSymmetricKeys.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithSymmetricKeys.java
index 96efa6c2ec13f..8a4a19da12fd6 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithSymmetricKeys.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/auth/token/TokenAuthWithSymmetricKeys.java
@@ -18,13 +18,15 @@
  */
 package org.apache.pulsar.tests.integration.auth.token;
 
-import lombok.extern.slf4j.Slf4j;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.pulsar.tests.integration.containers.BrokerContainer;
 import org.apache.pulsar.tests.integration.containers.ProxyContainer;
 import org.apache.pulsar.tests.integration.containers.PulsarContainer;
 import org.apache.pulsar.tests.integration.topologies.PulsarCluster;
 
+import lombok.extern.slf4j.Slf4j;
+
 @Slf4j
 public class TokenAuthWithSymmetricKeys extends PulsarTokenAuthenticationBaseSuite {
 
@@ -70,4 +72,13 @@ protected void configureProxy(ProxyContainer proxyContainer) throws Exception {
         proxyContainer.withEnv("tokenSecretKey", "data:base64," + secretKey);
     }
 
+    @Override
+    protected String createClientTokenWithExpiry(long expiryTime, TimeUnit unit) throws Exception {
+        return cmdContainer
+                .execCmd(PulsarCluster.PULSAR_COMMAND_SCRIPT, "tokens", "create",
+                        "--secret-key", "data:base64," + secretKey,
+                        "--subject", REGULAR_USER_ROLE,
+                        "--expiry-time", unit.toSeconds(expiryTime) + "s")
+                .getStdout().trim();
+    }
 }
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FunctionsCLITest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FunctionsCLITest.java
index 181876911974a..74503b5306519 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FunctionsCLITest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/cli/FunctionsCLITest.java
@@ -58,7 +58,8 @@ public String uploadFunction() throws Exception {
         return bkPkgPath;
     }
 
-    @Test
+    // Flaky Test: https://github.com/apache/pulsar/issues/6179
+    // @Test
     public void testUploadDownload() throws Exception {
         String bkPkgPath = uploadFunction();
         String localPkgFile = "/tmp/checkdownload-" + randomName(16);
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTest.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTest.java
index e112474f73593..e18a2ee320efe 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTest.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTest.java
@@ -61,6 +61,8 @@
 import org.testng.annotations.Test;
 import org.testng.collections.Maps;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
 import java.time.Duration;
 import java.util.Collections;
 import java.util.HashSet;
@@ -842,6 +844,10 @@ protected void getSourceInfoNotFound(String tenant, String namespace, String sou
     public void testPythonFunctionLocalRun() throws Exception {
         testFunctionLocalRun(Runtime.PYTHON);
     }
+    @Test(groups = "function")
+    public void testGoFunctionLocalRun() throws Exception {
+        testFunctionLocalRun(Runtime.GO);
+    }
 
     @Test(groups = "function")
     public void testJavaFunctionLocalRun() throws Exception {
@@ -862,19 +868,26 @@ public void testFunctionLocalRun(Runtime runtime) throws  Exception {
         String outputTopicName = "test-function-local-run-" + runtime + "-output-" + randomName(8);
 
         final int numMessages = 10;
-        String cmd;
+        String cmd = "";
         CommandGenerator commandGenerator = new CommandGenerator();
         commandGenerator.setAdminUrl("pulsar://pulsar-broker-0:6650");
         commandGenerator.setSourceTopic(inputTopicName);
         commandGenerator.setSinkTopic(outputTopicName);
         commandGenerator.setFunctionName("localRunTest");
         commandGenerator.setRuntime(runtime);
-        if (runtime == Runtime.JAVA) {
-            commandGenerator.setFunctionClassName(EXCLAMATION_JAVA_CLASS);
-            cmd = commandGenerator.generateLocalRunCommand(null);
-        } else {
-            commandGenerator.setFunctionClassName(EXCLAMATION_PYTHON_CLASS);
-            cmd = commandGenerator.generateLocalRunCommand(EXCLAMATION_PYTHON_FILE);
+        switch (runtime) {
+            case JAVA:
+                commandGenerator.setFunctionClassName(EXCLAMATION_JAVA_CLASS);
+                cmd = commandGenerator.generateLocalRunCommand(null);
+                break;
+            case PYTHON:
+                commandGenerator.setFunctionClassName(EXCLAMATION_PYTHON_CLASS);
+                cmd = commandGenerator.generateLocalRunCommand(EXCLAMATION_PYTHON_FILE);
+                break;
+            case GO:
+                commandGenerator.setFunctionClassName(null);
+                cmd = commandGenerator.generateLocalRunCommand(EXCLAMATION_GO_FILE);
+                break;
         }
 
         log.info("cmd: {}", cmd);
@@ -1316,6 +1329,11 @@ public void testJavaPublishFunction() throws Exception {
         testPublishFunction(Runtime.JAVA);
     }
 
+    @Test
+    public void testGoPublishFunction() throws Exception {
+        testPublishFunction(Runtime.GO);
+    }
+
     private void testPublishFunction(Runtime runtime) throws Exception {
         if (functionRuntimeType == FunctionRuntimeType.THREAD) {
             return;
@@ -1344,27 +1362,39 @@ private void testPublishFunction(Runtime runtime) throws Exception {
         final int numMessages = 10;
 
         // submit the exclamation function
-
-        if (runtime == Runtime.PYTHON) {
-            submitFunction(
-                    runtime,
-                    inputTopicName,
-                    outputTopicName,
-                    functionName,
-                    PUBLISH_FUNCTION_PYTHON_FILE,
-                    PUBLISH_PYTHON_CLASS,
-                    schema,
-                    Collections.singletonMap("publish-topic", outputTopicName));
-        } else {
-            submitFunction(
-                    runtime,
-                    inputTopicName,
-                    outputTopicName,
-                    functionName,
-                    null,
-                    PUBLISH_JAVA_CLASS,
-                    schema,
-                    Collections.singletonMap("publish-topic", outputTopicName));
+        switch (runtime){
+            case JAVA:
+                submitFunction(
+                        runtime,
+                        inputTopicName,
+                        outputTopicName,
+                        functionName,
+                        null,
+                        PUBLISH_JAVA_CLASS,
+                        schema,
+                        Collections.singletonMap("publish-topic", outputTopicName));
+                break;
+            case PYTHON:
+                submitFunction(
+                        runtime,
+                        inputTopicName,
+                        outputTopicName,
+                        functionName,
+                        PUBLISH_FUNCTION_PYTHON_FILE,
+                        PUBLISH_PYTHON_CLASS,
+                        schema,
+                        Collections.singletonMap("publish-topic", outputTopicName));
+                break;
+            case GO:
+                submitFunction(
+                        runtime,
+                        inputTopicName,
+                        outputTopicName,
+                        functionName,
+                        PUBLISH_FUNCTION_GO_FILE,
+                        null,
+                        schema,
+                        Collections.singletonMap("publish-topic", outputTopicName));
         }
 
         // get function info
@@ -1374,11 +1404,12 @@ private void testPublishFunction(Runtime runtime) throws Exception {
         getFunctionStatsEmpty(functionName);
 
         // publish and consume result
+
         if (Runtime.JAVA == runtime) {
             // java supports schema
             publishAndConsumeMessages(inputTopicName, outputTopicName, numMessages);
         } else {
-            // python doesn't support schema
+            // python doesn't support schema. Does Go? Maybe we need a switch instead for the Go case.
 
             @Cleanup PulsarClient client = PulsarClient.builder()
                     .serviceUrl(pulsarCluster.getPlainTextServiceUrl())
@@ -1673,14 +1704,19 @@ private static <T> void submitFunction(Runtime runtime,
         if (userConfigs != null) {
             generator.setUserConfig(userConfigs);
         }
-        String command;
-        if (Runtime.JAVA == runtime) {
-            command = generator.generateCreateFunctionCommand();
-        } else if (Runtime.PYTHON == runtime) {
-            generator.setRuntime(runtime);
-            command = generator.generateCreateFunctionCommand(functionFile);
-        } else {
-            throw new IllegalArgumentException("Unsupported runtime : " + runtime);
+        String command = "";
+
+        switch (runtime){
+            case JAVA:
+                command = generator.generateCreateFunctionCommand();
+                break;
+            case PYTHON:
+            case GO:
+                generator.setRuntime(runtime);
+                command = generator.generateCreateFunctionCommand(functionFile);
+                break;
+            default:
+                throw new IllegalArgumentException("Unsupported runtime : " + runtime);
         }
 
         log.info("---------- Function command: {}", command);
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTestBase.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTestBase.java
index cb5291bed7bc3..94bffb3316c64 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTestBase.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/PulsarFunctionsTestBase.java
@@ -103,6 +103,9 @@ public void teardownFunctionWorkers() {
     public static final String PUBLISH_FUNCTION_PYTHON_FILE = "typed_message_builder_publish.py";
     public static final String EXCEPTION_FUNCTION_PYTHON_FILE = "exception_function.py";
 
+    public static final String EXCLAMATION_GO_FILE = "exclamationFunc";
+    public static final String PUBLISH_FUNCTION_GO_FILE = "exclamationFunc";
+
     protected static String getExclamationClass(Runtime runtime,
                                                 boolean pyZip,
                                                 boolean extraDeps) {
@@ -125,7 +128,8 @@ protected static String getExclamationClass(Runtime runtime,
     public static Object[][] functionRuntimes() {
         return new Object[][] {
             new Object[] { Runtime.JAVA },
-            new Object[] { Runtime.PYTHON }
+            new Object[] { Runtime.PYTHON },
+            new Object[] { Runtime.GO }
         };
     }
 
diff --git a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/utils/CommandGenerator.java b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/utils/CommandGenerator.java
index f18e0c8720c98..40458d59aecf2 100644
--- a/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/utils/CommandGenerator.java
+++ b/tests/integration/src/test/java/org/apache/pulsar/tests/integration/functions/utils/CommandGenerator.java
@@ -33,6 +33,7 @@ public class CommandGenerator {
     public enum Runtime {
         JAVA,
         PYTHON,
+        GO,
     };
     private String functionName;
     private String tenant = "public";
@@ -56,6 +57,7 @@ public enum Runtime {
     private Map<String, String> userConfig = new HashMap<>();
     public static final String JAVAJAR = "/pulsar/examples/java-test-functions.jar";
     public static final String PYTHONBASE = "/pulsar/examples/python-examples/";
+    public static final String GOBASE = "/pulsar/examples/go-examples/";
 
     public static CommandGenerator createDefaultGenerator(String sourceTopic, String functionClassName) {
         CommandGenerator generator = new CommandGenerator();
@@ -88,22 +90,33 @@ public String generateLocalRunCommand(String codeFile) {
         if (functionName != null) {
             commandBuilder.append(" --name " + functionName);
         }
-        commandBuilder.append(" --className " + functionClassName);
+        if(runtime != Runtime.GO){
+            commandBuilder.append(" --className " + functionClassName);
+        }
         if (sourceTopic != null) {
             commandBuilder.append(" --inputs " + sourceTopic);
         }
         if (sinkTopic != null) {
             commandBuilder.append(" --output " + sinkTopic);
         }
-
-        if (runtime == Runtime.JAVA) {
-            commandBuilder.append(" --jar " + JAVAJAR);
-        } else {
-            if (codeFile != null) {
-                commandBuilder.append(" --py " + PYTHONBASE + codeFile);
-            } else {
-                commandBuilder.append(" --py " + PYTHONBASE);
-            }
+        switch (runtime){
+            case JAVA:
+                commandBuilder.append(" --jar " + JAVAJAR);
+                break;
+            case PYTHON:
+                if (codeFile != null) {
+                    commandBuilder.append(" --py " + PYTHONBASE + codeFile);
+                } else {
+                    commandBuilder.append(" --py " + PYTHONBASE);
+                }
+                break;
+            case GO:
+                if (codeFile != null) {
+                    commandBuilder.append(" --go " + GOBASE + codeFile);
+                } else {
+                    commandBuilder.append(" --go " + GOBASE);
+                }
+                break;
         }
 
         return commandBuilder.toString();
@@ -129,7 +142,9 @@ public String generateCreateFunctionCommand(String codeFile) {
         if (functionName != null) {
             commandBuilder.append(" --name " + functionName);
         }
-        commandBuilder.append(" --className " + functionClassName);
+        if (runtime != Runtime.GO){
+            commandBuilder.append(" --className " + functionClassName);
+        }
         if (sourceTopic != null) {
             commandBuilder.append(" --inputs " + sourceTopic);
         }
@@ -170,14 +185,24 @@ public String generateCreateFunctionCommand(String codeFile) {
             commandBuilder.append(" --slidingIntervalDurationMs " + slidingIntervalDurationMs);
         }
 
-        if (runtime == Runtime.JAVA) {
-            commandBuilder.append(" --jar " + JAVAJAR);
-        } else {
-            if (codeFile != null) {
-                commandBuilder.append(" --py " + PYTHONBASE + codeFile);
-            } else {
-                commandBuilder.append(" --py " + PYTHONBASE);
-            }
+        switch (runtime){
+            case JAVA:
+                commandBuilder.append(" --jar " + JAVAJAR);
+                break;
+            case PYTHON:
+                if (codeFile != null) {
+                    commandBuilder.append(" --py " + PYTHONBASE + codeFile);
+                } else {
+                    commandBuilder.append(" --py " + PYTHONBASE);
+                }
+                break;
+            case GO:
+                if (codeFile != null) {
+                    commandBuilder.append(" --go " + GOBASE + codeFile);
+                } else {
+                    commandBuilder.append(" --go " + GOBASE);
+                }
+                break;
         }
         return commandBuilder.toString();
     }
@@ -243,14 +268,24 @@ public String generateUpdateFunctionCommand(String codeFile) {
             commandBuilder.append(" --slidingIntervalDurationMs " + slidingIntervalDurationMs);
         }
 
-        if (runtime == Runtime.JAVA) {
-            commandBuilder.append(" --jar " + JAVAJAR);
-        } else {
-            if (codeFile != null) {
-                commandBuilder.append(" --py " + PYTHONBASE + codeFile);
-            } else {
-                commandBuilder.append(" --py " + PYTHONBASE);
-            }
+        switch (runtime){
+            case JAVA:
+                commandBuilder.append(" --jar " + JAVAJAR);
+                break;
+            case PYTHON:
+                if (codeFile != null) {
+                    commandBuilder.append(" --py " + PYTHONBASE + codeFile);
+                } else {
+                    commandBuilder.append(" --py " + PYTHONBASE);
+                }
+                break;
+            case GO:
+                if (codeFile != null) {
+                    commandBuilder.append(" --go " + GOBASE + codeFile);
+                } else {
+                    commandBuilder.append(" --go " + GOBASE);
+                }
+                break;
         }
         return commandBuilder.toString();
     }
diff --git a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/FileSystemConfigurationData.java b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/FileSystemConfigurationData.java
deleted file mode 100644
index 899887b6f8fbf..0000000000000
--- a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/FileSystemConfigurationData.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.bookkeeper.mledger.offload.filesystem;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.Properties;
-
-import static org.apache.pulsar.common.util.FieldParser.value;
-
-/**
- * Configuration for file system.
- */
-@Data
-public class FileSystemConfigurationData implements Serializable, Cloneable {
-
-    /**** --- Ledger Offloading --- ****/
-    // Driver to use to offload old data to long term storage
-    private String managedLedgerOffloadDriver = null;
-
-    private String fileSystemProfilePath = null;
-
-    private String fileSystemURI = null;
-
-    private int managedLedgerOffloadMaxThreads = 2;
-
-    /**
-     * Create a tiered storage configuration from the provided <tt>properties</tt>.
-     *
-     * @param properties the configuration properties
-     * @return tiered storage configuration
-     */
-    public static FileSystemConfigurationData create(Properties properties) {
-        FileSystemConfigurationData data = new FileSystemConfigurationData();
-        Field[] fields = FileSystemConfigurationData.class.getDeclaredFields();
-        Arrays.stream(fields).forEach(f -> {
-            if (properties.containsKey(f.getName())) {
-                try {
-                    f.setAccessible(true);
-                    f.set(data, value((String) properties.get(f.getName()), f));
-                } catch (Exception e) {
-                    throw new IllegalArgumentException(String.format("failed to initialize %s field while setting value %s",
-                            f.getName(), properties.get(f.getName())), e);
-                }
-            }
-        });
-        return data;
-    }
-}
diff --git a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/FileSystemLedgerOffloaderFactory.java b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/FileSystemLedgerOffloaderFactory.java
index cd52197a59bb5..cf86f38e1bedb 100644
--- a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/FileSystemLedgerOffloaderFactory.java
+++ b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/FileSystemLedgerOffloaderFactory.java
@@ -21,6 +21,7 @@
 import org.apache.bookkeeper.common.util.OrderedScheduler;
 import org.apache.bookkeeper.mledger.LedgerOffloaderFactory;
 import org.apache.bookkeeper.mledger.offload.filesystem.impl.FileSystemManagedLedgerOffloader;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 
 import java.io.IOException;
 import java.util.Map;
@@ -33,8 +34,8 @@ public boolean isDriverSupported(String driverName) {
     }
 
     @Override
-    public FileSystemManagedLedgerOffloader create(Properties properties, Map<String, String> userMetadata, OrderedScheduler scheduler) throws IOException {
-        FileSystemConfigurationData data = FileSystemConfigurationData.create(properties);
-        return FileSystemManagedLedgerOffloader.create(data, scheduler);
+    public FileSystemManagedLedgerOffloader create(OffloadPolicies offloadPolicies,
+               Map<String, String> userMetadata, OrderedScheduler scheduler) throws IOException {
+        return FileSystemManagedLedgerOffloader.create(offloadPolicies, scheduler);
     }
 }
diff --git a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloader.java b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloader.java
index 309076c4c3605..eda747ded8712 100644
--- a/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloader.java
+++ b/tiered-storage/file-system/src/main/java/org/apache/bookkeeper/mledger/offload/filesystem/impl/FileSystemManagedLedgerOffloader.java
@@ -29,7 +29,6 @@
 import org.apache.bookkeeper.common.util.OrderedScheduler;
 import org.apache.bookkeeper.mledger.LedgerOffloader;
 import org.apache.bookkeeper.mledger.offload.filesystem.FileSystemLedgerOffloaderFactory;
-import org.apache.bookkeeper.mledger.offload.filesystem.FileSystemConfigurationData;
 import org.apache.bookkeeper.net.BookieSocketAddress;
 import org.apache.bookkeeper.proto.DataFormats;
 import org.apache.hadoop.conf.Configuration;
@@ -39,6 +38,7 @@
 import org.apache.hadoop.io.IOUtils;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.MapFile;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -69,6 +69,8 @@ public class FileSystemManagedLedgerOffloader implements LedgerOffloader {
     private OrderedScheduler scheduler;
     private static final long ENTRIES_PER_READ = 100;
     private OrderedScheduler assignmentScheduler;
+    private OffloadPolicies offloadPolicies;
+
     public static boolean driverSupported(String driver) {
         return DRIVER_NAMES.equals(driver);
     }
@@ -77,11 +79,12 @@ public String getOffloadDriverName() {
         return driverName;
     }
 
-    public static FileSystemManagedLedgerOffloader create(FileSystemConfigurationData conf, OrderedScheduler scheduler) throws IOException {
+    public static FileSystemManagedLedgerOffloader create(OffloadPolicies conf, OrderedScheduler scheduler) throws IOException {
         return new FileSystemManagedLedgerOffloader(conf, scheduler);
     }
 
-    private FileSystemManagedLedgerOffloader(FileSystemConfigurationData conf, OrderedScheduler scheduler) throws IOException {
+    private FileSystemManagedLedgerOffloader(OffloadPolicies conf, OrderedScheduler scheduler) throws IOException {
+        this.offloadPolicies = conf;
         this.configuration = new Configuration();
         if (conf.getFileSystemProfilePath() != null) {
             String[] paths = conf.getFileSystemProfilePath().split(",");
@@ -110,7 +113,8 @@ private FileSystemManagedLedgerOffloader(FileSystemConfigurationData conf, Order
                 .name("offload-assignment").build();
     }
     @VisibleForTesting
-    public FileSystemManagedLedgerOffloader(FileSystemConfigurationData conf, OrderedScheduler scheduler, String testHDFSPath, String baseDir) throws IOException {
+    public FileSystemManagedLedgerOffloader(OffloadPolicies conf, OrderedScheduler scheduler, String testHDFSPath, String baseDir) throws IOException {
+        this.offloadPolicies = conf;
         this.configuration = new Configuration();
         this.configuration.set("fs.hdfs.impl", "org.apache.hadoop.hdfs.DistributedFileSystem");
         this.configuration.set("fs.defaultFS", testHDFSPath);
@@ -328,4 +332,20 @@ private static byte[] buildLedgerMetadataFormat(LedgerMetadata metadata) {
 
         return builder.build().toByteArray();
     }
+
+    @Override
+    public OffloadPolicies getOffloadPolicies() {
+        return offloadPolicies;
+    }
+
+    @Override
+    public void close() {
+        if (fileSystem != null) {
+            try {
+                fileSystem.close();
+            } catch (Exception e) {
+                log.error("FileSystemManagedLedgerOffloader close failed!", e);
+            }
+        }
+    }
 }
diff --git a/tiered-storage/file-system/src/test/java/org/apache/bookkeeper/mledger/offload/filesystem/FileStoreTestBase.java b/tiered-storage/file-system/src/test/java/org/apache/bookkeeper/mledger/offload/filesystem/FileStoreTestBase.java
index 4abff16443090..b014fd23860b6 100644
--- a/tiered-storage/file-system/src/test/java/org/apache/bookkeeper/mledger/offload/filesystem/FileStoreTestBase.java
+++ b/tiered-storage/file-system/src/test/java/org/apache/bookkeeper/mledger/offload/filesystem/FileStoreTestBase.java
@@ -23,6 +23,7 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
 
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 
@@ -48,7 +49,7 @@ public void start() throws Exception {
         hdfsURI = "hdfs://localhost:"+ hdfsCluster.getNameNodePort() + "/";
         Properties properties = new Properties();
         fileSystemManagedLedgerOffloader = new FileSystemManagedLedgerOffloader(
-                FileSystemConfigurationData.create(properties),
+                OffloadPolicies.create(properties),
                 scheduler, hdfsURI, basePath);
     }
 
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/CredentialsUtil.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/CredentialsUtil.java
new file mode 100644
index 0000000000000..4971a6d0e1b70
--- /dev/null
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/CredentialsUtil.java
@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.bookkeeper.mledger.offload.jcloud;
+
+import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
+import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider;
+import com.google.common.base.Strings;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
+
+public class CredentialsUtil {
+
+    /**
+     * Builds an AWS credential provider based on the offload options
+     * @return aws credential provider
+     */
+    public static AWSCredentialsProvider getAWSCredentialProvider(OffloadPolicies offloadPolicies) {
+        if (Strings.isNullOrEmpty(offloadPolicies.getS3ManagedLedgerOffloadRole())) {
+            return DefaultAWSCredentialsProviderChain.getInstance();
+        } else {
+            String roleName = offloadPolicies.getS3ManagedLedgerOffloadRole();
+            String roleSessionName = offloadPolicies.getS3ManagedLedgerOffloadRoleSessionName();
+            return new STSAssumeRoleSessionCredentialsProvider.Builder(roleName, roleSessionName).build();
+        }
+    }
+
+}
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/JCloudLedgerOffloaderFactory.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/JCloudLedgerOffloaderFactory.java
index dffe253f94a98..20fac68f1f822 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/JCloudLedgerOffloaderFactory.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/JCloudLedgerOffloaderFactory.java
@@ -20,10 +20,10 @@
 
 import java.io.IOException;
 import java.util.Map;
-import java.util.Properties;
 import org.apache.bookkeeper.common.util.OrderedScheduler;
 import org.apache.bookkeeper.mledger.LedgerOffloaderFactory;
 import org.apache.bookkeeper.mledger.offload.jcloud.impl.BlobStoreManagedLedgerOffloader;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 
 /**
  * A jcloud based offloader factory.
@@ -42,10 +42,9 @@ public boolean isDriverSupported(String driverName) {
     }
 
     @Override
-    public BlobStoreManagedLedgerOffloader create(Properties properties,
+    public BlobStoreManagedLedgerOffloader create(OffloadPolicies offloadPolicies,
                                                   Map<String, String> userMetadata,
                                                   OrderedScheduler scheduler) throws IOException  {
-        TieredStorageConfigurationData data = TieredStorageConfigurationData.create(properties);
-        return BlobStoreManagedLedgerOffloader.create(data, userMetadata, scheduler);
+        return BlobStoreManagedLedgerOffloader.create(offloadPolicies, userMetadata, scheduler);
     }
 }
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/TieredStorageConfigurationData.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/TieredStorageConfigurationData.java
deleted file mode 100644
index a4c5cf4fa8b2e..0000000000000
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/TieredStorageConfigurationData.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.bookkeeper.mledger.offload.jcloud;
-
-import static org.apache.pulsar.common.util.FieldParser.value;
-
-import com.amazonaws.auth.AWSCredentialsProvider;
-import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
-import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider;
-import com.google.common.base.Strings;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.Properties;
-import lombok.Data;
-
-/**
- * Configuration for tiered storage.
- */
-@Data
-public class TieredStorageConfigurationData implements Serializable, Cloneable {
-
-    /**** --- Ledger Offloading --- ****/
-    // Driver to use to offload old data to long term storage
-    private String managedLedgerOffloadDriver = null;
-
-    // Maximum number of thread pool threads for ledger offloading
-    private int managedLedgerOffloadMaxThreads = 2;
-
-    // For Amazon S3 ledger offload, AWS region
-    private String s3ManagedLedgerOffloadRegion = null;
-
-    // For Amazon S3 ledger offload, Bucket to place offloaded ledger into
-    private String s3ManagedLedgerOffloadBucket = null;
-
-    // For Amazon S3 ledger offload, Alternative endpoint to connect to (useful for testing)
-    private String s3ManagedLedgerOffloadServiceEndpoint = null;
-
-    // For Amazon S3 ledger offload, Max block size in bytes.
-    private int s3ManagedLedgerOffloadMaxBlockSizeInBytes = 64 * 1024 * 1024; // 64MB
-
-    // For Amazon S3 ledger offload, Read buffer size in bytes.
-    private int s3ManagedLedgerOffloadReadBufferSizeInBytes = 1024 * 1024; // 1MB
-
-    // For Amazon S3 ledger offload, provide a role to assume before writing to s3
-    private String s3ManagedLedgerOffloadRole = null;
-
-    // For Amazon S3 ledger offload, provide a role session name when using a role
-    private String s3ManagedLedgerOffloadRoleSessionName = "pulsar-s3-offload";
-
-    // For Google Cloud Storage ledger offload, region where offload bucket is located.
-    // reference this page for more details: https://cloud.google.com/storage/docs/bucket-locations
-    private String gcsManagedLedgerOffloadRegion = null;
-
-    // For Google Cloud Storage ledger offload, Bucket to place offloaded ledger into
-    private String gcsManagedLedgerOffloadBucket = null;
-
-    // For Google Cloud Storage ledger offload, Max block size in bytes.
-    private int gcsManagedLedgerOffloadMaxBlockSizeInBytes = 64 * 1024 * 1024; // 64MB
-
-    // For Google Cloud Storage ledger offload, Read buffer size in bytes.
-    private int gcsManagedLedgerOffloadReadBufferSizeInBytes = 1024 * 1024; // 1MB
-
-    // For Google Cloud Storage, path to json file containing service account credentials.
-    // For more details, see the "Service Accounts" section of https://support.google.com/googleapi/answer/6158849
-    private String gcsManagedLedgerOffloadServiceAccountKeyFile = null;
-
-    /**
-     * Builds an AWS credential provider based on the offload options
-     * @return aws credential provider
-     */
-    public AWSCredentialsProvider getAWSCredentialProvider() {
-        if (Strings.isNullOrEmpty(this.getS3ManagedLedgerOffloadRole())) {
-            return DefaultAWSCredentialsProviderChain.getInstance();
-        } else {
-            String roleName = this.getS3ManagedLedgerOffloadRole();
-            String roleSessionName = this.getS3ManagedLedgerOffloadRoleSessionName();
-            return new STSAssumeRoleSessionCredentialsProvider.Builder(roleName, roleSessionName).build();
-        }
-    }
-
-    /**
-     * Create a tiered storage configuration from the provided <tt>properties</tt>.
-     *
-     * @param properties the configuration properties
-     * @return tiered storage configuration
-     */
-    public static TieredStorageConfigurationData create(Properties properties) {
-        TieredStorageConfigurationData data = new TieredStorageConfigurationData();
-        Field[] fields = TieredStorageConfigurationData.class.getDeclaredFields();
-        Arrays.stream(fields).forEach(f -> {
-            if (properties.containsKey(f.getName())) {
-                try {
-                    f.setAccessible(true);
-                    f.set(data, value((String) properties.get(f.getName()), f));
-                } catch (Exception e) {
-                    throw new IllegalArgumentException(String.format("failed to initialize %s field while setting value %s",
-                            f.getName(), properties.get(f.getName())), e);
-                }
-            }
-        });
-        return data;
-    }
-
-}
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloader.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloader.java
index 7f7acaf25ccd6..0c92b96695e72 100644
--- a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloader.java
+++ b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloader.java
@@ -44,10 +44,11 @@
 import org.apache.bookkeeper.common.util.OrderedScheduler;
 import org.apache.bookkeeper.mledger.LedgerOffloader;
 import org.apache.bookkeeper.mledger.offload.jcloud.BlockAwareSegmentInputStream;
+import org.apache.bookkeeper.mledger.offload.jcloud.CredentialsUtil;
 import org.apache.bookkeeper.mledger.offload.jcloud.OffloadIndexBlock;
-import org.apache.bookkeeper.mledger.offload.jcloud.TieredStorageConfigurationData;
 import org.apache.bookkeeper.mledger.offload.jcloud.OffloadIndexBlockBuilder;
 import org.apache.commons.lang3.tuple.Pair;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.apache.pulsar.jcloud.shade.com.google.common.base.Supplier;
 import org.jclouds.Constants;
 import org.jclouds.ContextBuilder;
@@ -181,16 +182,19 @@ private static Pair<BlobStoreLocation, BlobStore> createBlobStore(String driver,
     // offload driver metadata to be stored as part of the original ledger metadata
     private final String offloadDriverName;
 
+    private static OffloadPolicies offloadPolicies;
+
     @VisibleForTesting
-    static BlobStoreManagedLedgerOffloader create(TieredStorageConfigurationData conf,
+    static BlobStoreManagedLedgerOffloader create(OffloadPolicies conf,
                                                   OrderedScheduler scheduler) throws IOException {
         return create(conf, Maps.newHashMap(), scheduler);
     }
 
-    public static BlobStoreManagedLedgerOffloader create(TieredStorageConfigurationData conf,
+    public static BlobStoreManagedLedgerOffloader create(OffloadPolicies conf,
                                                          Map<String, String> userMetadata,
                                                          OrderedScheduler scheduler)
             throws IOException {
+        offloadPolicies = conf;
         String driver = conf.getManagedLedgerOffloadDriver();
         if (!driverSupported(driver)) {
             throw new IOException(
@@ -232,7 +236,8 @@ public static BlobStoreManagedLedgerOffloader create(TieredStorageConfigurationD
             maxBlockSize, readBufferSize, endpoint, region, credentials, userMetadata);
     }
 
-    public static Supplier<Credentials> getCredentials(String driver, TieredStorageConfigurationData conf) throws IOException {
+    public static Supplier<Credentials> getCredentials(String driver,
+               OffloadPolicies conf) throws IOException {
         // credentials:
         //   for s3, get by DefaultAWSCredentialsProviderChain.
         //   for gcs, use downloaded file 'google_creds.json', which contains service account key by
@@ -252,7 +257,7 @@ public static Supplier<Credentials> getCredentials(String driver, TieredStorageC
                 throw new IOException(ioe);
             }
         } else if (isS3Driver(driver)) {
-            AWSCredentialsProvider credsChain = conf.getAWSCredentialProvider();
+            AWSCredentialsProvider credsChain = CredentialsUtil.getAWSCredentialProvider(conf);
             // try and get creds before starting... if we can't fetch
             // creds on boot, we want to fail
             try {
@@ -587,6 +592,23 @@ public CompletableFuture<Void> deleteOffloaded(long ledgerId, UUID uid,
     public interface VersionCheck {
         void check(String key, Blob blob) throws IOException;
     }
+
+    @Override
+    public OffloadPolicies getOffloadPolicies() {
+        return offloadPolicies;
+    }
+
+    @Override
+    public void close() {
+        if (writeBlobStore != null) {
+            writeBlobStore.getContext().close();
+        }
+        for (BlobStore readBlobStore : readBlobStores.values()) {
+            if (readBlobStore != null) {
+                readBlobStore.getContext().close();
+            }
+        }
+    }
 }
 
 
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreBackedInputStreamTest.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreBackedInputStreamTest.java
index 16784a553be9e..baefb95a13b00 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreBackedInputStreamTest.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreBackedInputStreamTest.java
@@ -44,7 +44,7 @@
 import org.testng.annotations.Test;
 
 @Slf4j
-class BlobStoreBackedInputStreamTest extends BlobStoreTestBase {
+public class BlobStoreBackedInputStreamTest extends BlobStoreTestBase {
     private static final Logger log = LoggerFactory.getLogger(BlobStoreBackedInputStreamTest.class);
 
     class RandomInputStream extends InputStream {
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreTestBase.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreTestBase.java
index 183424177e9b7..2725c051d1269 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreTestBase.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/BlobStoreTestBase.java
@@ -21,11 +21,21 @@
 import org.jclouds.ContextBuilder;
 import org.jclouds.blobstore.BlobStore;
 import org.jclouds.blobstore.BlobStoreContext;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testng.IObjectFactory;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.ObjectFactory;
 
+
+@PrepareForTest({CredentialsUtil.class})
+@PowerMockIgnore({
+        "org.apache.logging.log4j.*",
+        "org.apache.pulsar.jcloud.shade.com.google.common.*",
+        "org.jclouds.*"})
 public class BlobStoreTestBase {
     private static final Logger log = LoggerFactory.getLogger(BlobStoreTestBase.class);
 
@@ -79,4 +89,10 @@ public void tearDown() {
         }
     }
 
+    @ObjectFactory
+    // Necessary to make PowerMockito.mockStatic work with TestNG.
+    public IObjectFactory getObjectFactory() {
+        return new org.powermock.modules.testng.PowerMockObjectFactory();
+    }
+
 }
diff --git a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderTest.java b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderTest.java
index a3c4972365007..8aa977a0e8366 100644
--- a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderTest.java
+++ b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloaderTest.java
@@ -31,7 +31,6 @@
 import com.google.common.util.concurrent.MoreExecutors;
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -53,8 +52,9 @@
 import org.apache.bookkeeper.common.util.OrderedScheduler;
 import org.apache.bookkeeper.mledger.LedgerOffloader;
 import org.apache.bookkeeper.mledger.offload.jcloud.BlobStoreTestBase;
-import org.apache.bookkeeper.mledger.offload.jcloud.TieredStorageConfigurationData;
+import org.apache.bookkeeper.mledger.offload.jcloud.CredentialsUtil;
 import org.apache.bookkeeper.util.ZkUtils;
+import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.apache.pulsar.jcloud.shade.com.google.common.base.Supplier;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.MockZooKeeper;
@@ -64,13 +64,14 @@
 import org.jclouds.blobstore.options.CopyOptions;
 import org.jclouds.domain.Credentials;
 import org.mockito.Mockito;
+import org.powermock.api.mockito.PowerMockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.testng.collections.Maps;
 
-class BlobStoreManagedLedgerOffloaderTest extends BlobStoreTestBase {
+public class BlobStoreManagedLedgerOffloaderTest extends BlobStoreTestBase {
     private static final Logger log = LoggerFactory.getLogger(BlobStoreManagedLedgerOffloaderTest.class);
 
     private static MockZooKeeper createMockZooKeeper() throws Exception {
@@ -90,7 +91,7 @@ private static MockZooKeeper createMockZooKeeper() throws Exception {
     final OrderedScheduler scheduler;
     final PulsarMockBookKeeper bk;
 
-    BlobStoreManagedLedgerOffloaderTest() throws Exception {
+    public BlobStoreManagedLedgerOffloaderTest() throws Exception {
         scheduler = OrderedScheduler.newSchedulerBuilder().numThreads(1).name("offloader").build();
         bk = new PulsarMockBookKeeper(createMockZooKeeper(), scheduler.chooseThread(this));
     }
@@ -154,7 +155,7 @@ public void testBucketDoesNotExist() throws Exception {
 
     @Test
     public void testNoRegionConfigured() throws Exception {
-        TieredStorageConfigurationData conf = new TieredStorageConfigurationData();
+        OffloadPolicies conf = new OffloadPolicies();
         conf.setManagedLedgerOffloadDriver("s3");
         conf.setS3ManagedLedgerOffloadBucket(BUCKET);
 
@@ -168,7 +169,7 @@ public void testNoRegionConfigured() throws Exception {
 
     @Test
     public void testNoBucketConfigured() throws Exception {
-        TieredStorageConfigurationData conf = new TieredStorageConfigurationData();
+        OffloadPolicies conf = new OffloadPolicies();
         conf.setManagedLedgerOffloadDriver("s3");
         conf.setS3ManagedLedgerOffloadRegion("eu-west-1");
 
@@ -182,7 +183,7 @@ public void testNoBucketConfigured() throws Exception {
 
     @Test
     public void testSmallBlockSizeConfigured() throws Exception {
-        TieredStorageConfigurationData conf = new TieredStorageConfigurationData();
+        OffloadPolicies conf = new OffloadPolicies();
         conf.setManagedLedgerOffloadDriver("s3");
         conf.setS3ManagedLedgerOffloadRegion("eu-west-1");
         conf.setS3ManagedLedgerOffloadBucket(BUCKET);
@@ -198,7 +199,7 @@ public void testSmallBlockSizeConfigured() throws Exception {
 
     @Test
     public void testGcsNoKeyPath() throws Exception {
-        TieredStorageConfigurationData conf = new TieredStorageConfigurationData();
+        OffloadPolicies conf = new OffloadPolicies();
         conf.setManagedLedgerOffloadDriver("google-cloud-storage");
         conf.setGcsManagedLedgerOffloadBucket(BUCKET);
 
@@ -213,7 +214,7 @@ public void testGcsNoKeyPath() throws Exception {
 
     @Test
     public void testGcsNoBucketConfigured() throws Exception {
-        TieredStorageConfigurationData conf = new TieredStorageConfigurationData();
+        OffloadPolicies conf = new OffloadPolicies();
         conf.setManagedLedgerOffloadDriver("google-cloud-storage");
         File tmpKeyFile = File.createTempFile("gcsOffload", "json");
         conf.setGcsManagedLedgerOffloadServiceAccountKeyFile(tmpKeyFile.getAbsolutePath());
@@ -229,7 +230,7 @@ public void testGcsNoBucketConfigured() throws Exception {
 
     @Test
     public void testGcsSmallBlockSizeConfigured() throws Exception {
-        TieredStorageConfigurationData conf = new TieredStorageConfigurationData();
+        OffloadPolicies conf = new OffloadPolicies();
         conf.setManagedLedgerOffloadDriver("google-cloud-storage");
         File tmpKeyFile = File.createTempFile("gcsOffload", "json");
         conf.setGcsManagedLedgerOffloadServiceAccountKeyFile(tmpKeyFile.getAbsolutePath());
@@ -247,37 +248,35 @@ public void testGcsSmallBlockSizeConfigured() throws Exception {
 
     @Test
     public void testS3DriverConfiguredWell() throws Exception {
-        TieredStorageConfigurationData conf = new TieredStorageConfigurationData() {
+        PowerMockito.mockStatic(CredentialsUtil.class);
+        PowerMockito.when(CredentialsUtil.getAWSCredentialProvider(any())).thenReturn(new AWSCredentialsProvider() {
             @Override
-            public AWSCredentialsProvider getAWSCredentialProvider() {
-                return new AWSCredentialsProvider() {
+            public AWSCredentials getCredentials() {
+                return new AWSSessionCredentials() {
                     @Override
-                    public AWSCredentials getCredentials() {
-                        return new AWSSessionCredentials() {
-                            @Override
-                            public String getSessionToken() {
-                                return "token";
-                            }
-
-                            @Override
-                            public String getAWSAccessKeyId() {
-                                return "access";
-                            }
-
-                            @Override
-                            public String getAWSSecretKey() {
-                                return "secret";
-                            }
-                        };
+                    public String getSessionToken() {
+                        return "token";
                     }
 
                     @Override
-                    public void refresh() {
+                    public String getAWSAccessKeyId() {
+                        return "access";
+                    }
 
+                    @Override
+                    public String getAWSSecretKey() {
+                        return "secret";
                     }
                 };
             }
-        };
+
+            @Override
+            public void refresh() {
+
+            }
+        });
+
+        OffloadPolicies conf = new OffloadPolicies();
         conf.setManagedLedgerOffloadDriver("s3");
         conf.setS3ManagedLedgerOffloadBucket(BUCKET);
         conf.setS3ManagedLedgerOffloadServiceEndpoint("http://fake.s3.end.point");
@@ -644,8 +643,8 @@ public void testReadUnknownIndexVersion() throws Exception {
 
     @Test
     public void testSessionCredentialSupplier() throws Exception {
-        TieredStorageConfigurationData mock = mock(TieredStorageConfigurationData.class);
-        Mockito.when(mock.getAWSCredentialProvider()).thenReturn(new AWSCredentialsProvider() {
+        PowerMockito.mockStatic(CredentialsUtil.class);
+        PowerMockito.when(CredentialsUtil.getAWSCredentialProvider(any())).thenReturn(new AWSCredentialsProvider() {
             @Override
             public AWSCredentials getCredentials() {
                 return new AWSSessionCredentials() {
@@ -672,7 +671,7 @@ public void refresh() {
             }
         });
 
-        Supplier<Credentials> creds = BlobStoreManagedLedgerOffloader.getCredentials("aws-s3", mock);
+        Supplier<Credentials> creds = BlobStoreManagedLedgerOffloader.getCredentials("aws-s3", any());
 
         Assert.assertTrue(creds.get() instanceof SessionCredentials);
         SessionCredentials sessCreds = (SessionCredentials) creds.get();